Adds new submodule ion-functions

ooici · Mar 8, 2013 · 025d6c5 · 025d6c5
1 parent d2bda00
commit 025d6c5
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -17,3 +17,6 @@
 [submodule "extern/eeagent"]
 	path = extern/eeagent
 	url = https://github.com/ooici/eeagent.git
+[submodule "extern/ion-functions"]
+	path = extern/ion-functions
+	url = https://github.com/ooici/ion-functions.git
diff --git a/build.xml b/build.xml
@@ -41,6 +41,7 @@
             <fileset dir="extern/pyon" includes="**/*.pyc"/>
             <fileset dir="extern/marine-integrations" includes="**/*.pyc"/>
             <fileset dir="extern/coverage-model" includes="**/*.pyc"/>
+            <fileset dir="extern/ion-functions" includes="**/*.pyc"/>
             <fileset dir="extern/parameter-definitions" includes="**/*.pyc"/>
         </delete>
         <delete dir="interface" failonerror="false"/>

diff --git a/buildout.cfg b/buildout.cfg
@@ -5,6 +5,7 @@ develop =
     extern/pyon
     extern/epu
     extern/eeagent
+    extern/ion-functions
 parts =
     project-directories
     numpy-install

diff --git a/extern/ion-functions b/extern/ion-functions
diff --git a/ion/services/coi/service_gateway_service.py b/ion/services/coi/service_gateway_service.py
@@ -702,6 +702,7 @@ def get_version_info():
     pkg_list = ["coi-services",
                 "pyon",
                 "coverage-model",
+                "ion-functions",
                 "eeagent",
                 "epu",
                 "utilities",

diff --git a/pyon_buildout.cfg b/pyon_buildout.cfg
@@ -5,3 +5,4 @@ develop =
     ../pyon
     extern/coverage-model
     extern/marine-integrations
+    extern/ion-functions
diff --git a/pyon_mi_buildout.cfg b/pyon_mi_buildout.cfg
@@ -4,4 +4,5 @@ develop =
     .
     ../pyon
     ../marine-integrations
-    extern/coverage-model
+    extern/coverage-model
+    extern/ion-functions
diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@
         install_requires = [
             'pyzmq==2.2.0',
             'coverage-model',
+            'ion-functions',
             'pyon',
             'Flask==0.9',
             'python-dateutil==1.5',