Skip to content

Commit 9efd344

Browse files
authored
Merge pull request #95 from MetaCell/revert-release-versions
revert changes to dockerfile, versions
2 parents fe86200 + ba4b663 commit 9efd344

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ before_script:
4444
- export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/
4545

4646
script:
47-
- travis_retry docker build -t="netpyne-ui" --build-arg netpyneuiBranch=$TRAVIS_BRANCH -f="./Dockerfile" .
47+
- travis_retry docker build -t="netpyne-ui" --build-arg netpyneuiBranch=$TRAVIS_BRANCH -f="./Dockerfile_dev" .
4848
- travis_retry docker run -t -dit --name=netpyne-ui_container -h localhost -p 8888:8888 netpyne-ui:latest
4949
- cd $TRAVIS_BUILD_DIR/ && ls
5050
- cd geppetto-netpyne && ls

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
FROM metacell/jupyter-neuron:latest
2-
# Switch to non sudo, create a Python 3 virtual environment
32
USER $NB_USER
43

54
ARG netpyneuiBranch=development
65
ENV netpyneuiBranch=${netpyneuiBranch}
76
RUN echo "$netpyneuiBranch";
87

98
ARG INCUBATOR_VER=unknown
10-
RUN /bin/bash -c "INCUBATOR_VER=${INCUBATOR_VER} source activate snakes && pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple netpyne_ui"
9+
RUN /bin/bash -c "INCUBATOR_VER=${INCUBATOR_VER} source activate snakes && pip install netpyne_ui"
1110
RUN /bin/bash -c "source activate snakes && jupyter nbextension enable --py jupyter_geppetto"
1211
RUN /bin/bash -c "source activate snakes && jupyter serverextension enable --py jupyter_geppetto"
1312
RUN /bin/bash -c "source activate snakes && jupyter nbextension enable --py widgetsnbextension"

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
setuptools.setup(
1717
name="netpyne_ui",
18-
version="0.4.3",
18+
version="0.4",
1919
url="https://github.com/MetaCell/NetPyNE-UI",
2020
author="MetaCell",
2121
author_email="info@metacell.us",
@@ -37,7 +37,7 @@
3737
'Programming Language :: Python :: 3.7'
3838
],
3939
install_requires=[
40-
'jupyter_geppetto==0.4.1.5',
40+
'jupyter_geppetto==0.4.1.2',
4141
'netpyne==0.9.0'
4242
],
4343
)

0 commit comments

Comments
 (0)