Merge pull request #181 from scidash/dev

Dev

.gitignore

@@ -60,9 +60,9 @@ neuronunit/tests/NeuroML2/*.xml*
 unit_test/get_tau.py
 .eggs
 htmlcov
-
-neuronunit/models/NeuroML2/*.py
 *.mod
+*_nrn.py
+neuronunit/models/NeuroML2/*.py
 neuronunit/unit_test/bbp.py
 neuronunit/unit_test/get_tau.py
-scratch
+scratch

.travis.yml

@@ -22,14 +22,13 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - pip install --no-cache-dir --process-dependency-links . 
+  - pip install --no-cache-dir -r requirements.txt . 
   - pip install coveralls
 ######################################################
 
 script: 
   - export NC_HOME='.' # NeuroConstruct isn't used but tests need this
                        # variable set to pass.  
-  - coverage run --source=. --omit=*unit_test*,setup.py,*.eggs* setup.py test  
+  - sh test.sh  
 after_success:
   - coveralls
-

Dockerfile

@@ -1,17 +1,18 @@
-# neuronunit
-# author Rick Gerkin [email protected]
+FROM russelljarvis/neuronunit
+USER jovyan
+RUN sudo /opt/conda/bin/pip install psutil
+ENV QT_QPA_PLATFORM offscreen
+RUN sudo rm -rf /opt/conda/lib/python3.5/site-packages/neuronunit-0.1.8.8-py3.5.egg/neuronunit
+RUN sudo rm -rf $HOME/neuronunit
+COPY . $HOME/neuronunit
 
-FROM scidash/neuron-mpi-neuroml
+RUN pip install dask
+RUN pip install distributed
+RUN sudo pip uninstall -y sciunit
+RUN sudo pip install git+https://github.com/scidash/sciunit@dev
+#COPY BluePyOpt ~/HOME/BluePyOpt
+#RUN pip install -e $HOME/BluePyOpt
+WORKDIR $HOME
 
-USER root
-ARG MOD_DATE=0
-RUN echo $MOD_DATE
-ADD . $HOME/neuronunit
-RUN chown -R $NB_USER $HOME 
-WORKDIR $HOME/neuronunit 
 
-# Install neuronunit and dependencies.
-RUN python setup.py install
 
-# Run all unit tests.
-ENTRYPOINT python -m unittest unit_test/core_tests.py

README.md

@@ -1,8 +1,9 @@
 | Master  | Dev |
 | ------------- | ------------- |
 | [![Travis](https://travis-ci.org/scidash/neuronunit.svg?branch=master)](https://travis-ci.org/scidash/neuronunit) | [![Travis](https://travis-ci.org/scidash/neuronunit.svg?branch=dev)](https://travis-ci.org/scidash/neuronunit)  |
-| N/A | [![RTFD](https://readthedocs.org/projects/neuronunit/badge/?version=latest)](http://neuronunit.readthedocs.io/en/latest/?badge=latest) |
-| N/A | [![Coveralls](https://coveralls.io/repos/github/scidash/neuronunit/badge.svg?branch=dev)](https://coveralls.io/github/scidash/neuronunit) |
+| [![RTFD](https://readthedocs.org/projects/neuronunit/badge/?version=master)](http://neuronunit.readthedocs.io/en/latest/?badge=master) | [![RTFD](https://readthedocs.org/projects/neuronunit/badge/?version=dev)](http://neuronunit.readthedocs.io/en/latest/?badge=dev) |
+| [![Coveralls](https://coveralls.io/repos/github/scidash/neuronunit/badge.svg?branch=master)](https://coveralls.io/github/scidash/neuronunit?branch=master) | [![Coveralls](https://coveralls.io/repos/github/scidash/neuronunit/badge.svg?branch=dev)](https://coveralls.io/github/scidash/neuronunit?branch=dev) |
+| [![Requirements](https://requires.io/github/scidash/neuronunit/requirements.svg?branch=master)](https://requires.io/github/scidash/neuronunit/requirements/?branch=master) |  [![Requirements](https://requires.io/github/scidash/neuronunit/requirements.svg?branch=dev)](https://requires.io/github/scidash/neuronunit/requirements/?branch=dev) |