Test with owmeta

Author: pgleeson

Dockerfile

@@ -65,7 +65,7 @@ RUN  sudo update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10
 RUN pip3 install neuron==8.0.1
 
 ################################################################################
-########     Install pyNeuroML for handling NeuroML network model
+########     Install c302 for building neuronal network models
 
 # Pin version of pymongo required for py3.6... TODO remove...
 RUN sudo pip install pymongo==4.1.1
@@ -75,28 +75,16 @@ RUN git clone https://github.com/NeuroML/pyNeuroML.git && \
   git checkout master  && \
   sudo python3 setup.py install
 
-# TODO remove this line after we have better dependency management.  The
-# current version of gitpython requires python >= 3.7, which is newer than the
-# python included in the base image. Therefore, we manually install an older
-# gitpython to be used with OpenWormData.
-# See https://github.com/openworm/OpenWorm/pull/316
-RUN sudo pip install 'gitpython==2.1.15' markupsafe
+RUN git clone https://github.com/openworm/c302.git && \
+  cd c302 && \
+  git checkout master && \
+  sudo pip install .
 
-RUN git clone https://github.com/openworm/PyOpenWorm.git && \
-  cd PyOpenWorm && \
-  git checkout ow-0.9 && \
-  sudo apt-get install -y python3-cffi && \
-  sudo python3 setup.py install && \
-  pow clone https://github.com/openworm/OpenWormData.git
+# Note: owmeta, owmeta-core and pyNeuroML installed with the above library
 
+RUN pip3 install owmeta-core==0.13.5
+RUN owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/owmeta-bundles/master/index.json'
 
-################################################################################
-########     Install c302 for building neuronal network models
-
-RUN git clone https://github.com/openworm/c302.git && \
-  cd c302 && \
-  git checkout ow-0.9.1 && \
-  sudo python3 setup.py install
 
 
 ################################################################################

VERSION

@@ -1 +1 @@
-0.9.3
+0.9.3_owm