Merge pull request #91 from MetaCell/release

Fixes for prod environments

Author: adrianq

Dockerfile

@@ -1,7 +1,10 @@
 FROM metacell/jupyter-neuron:latest
-# Switch to non sudo, create a Python 3 virtual environment 
 USER $NB_USER
 
+ARG netpyneuiBranch=development 
+ENV netpyneuiBranch=${netpyneuiBranch}  
+RUN echo "$netpyneuiBranch";
+
 ARG INCUBATOR_VER=unknown
 RUN /bin/bash -c "INCUBATOR_VER=${INCUBATOR_VER} source activate snakes && pip install netpyne_ui"
 RUN /bin/bash -c "source activate snakes && jupyter nbextension enable --py jupyter_geppetto"
@@ -11,4 +14,13 @@ RUN /bin/bash -c "source activate snakes && jupyter nbextension enable --py widg
 WORKDIR /home/jovyan
 RUN git clone --branch CNS18 https://github.com/Neurosim-lab/netpyne_workspace
 WORKDIR /home/jovyan/netpyne_workspace
-CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token=''"
+
+# Uncomment to run travis using this Dockerfile
+# Clone the source code and creates a symlink to the test folder
+WORKDIR /home/jovyan/work
+RUN wget https://github.com/MetaCell/NetPyNE-UI/archive/$netpyneuiBranch.zip -q
+RUN unzip $netpyneuiBranch.zip 
+WORKDIR /home/jovyan/netpyne_workspace
+RUN ln -sfn /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/netpyne_ui/tests tests
+
+CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui"

MANIFEST.in

@@ -0,0 +1,11 @@
+# Include everything inside this folder
+graft netpyne_ui/geppetto/src/main/webapp/build
+
+# Include any of these resources at any level
+recursive-include netpyne_ui/geppetto *.png *.css *.woff *.woff2
+
+# Include any of these resources at any level
+recursive-include netpyne_ui/tests *.hoc
+
+# Include also root files (basically the extension)
+include netpyne_ui/*

setup.py

@@ -24,9 +24,7 @@
     long_description=open('README.rst').read(),
     data_files=data_files,
     packages=setuptools.find_packages(),
-    package_data={
-        '': ['*.hoc']
-    },
+    include_package_data=True,
     scripts=['NetPyNE-UI'],
     classifiers=[
         'Development Status :: 3 - Alpha',