Skip to content

Commit

Permalink
Merge pull request #777 from MetaCell/feature/NETPYNE-184
Browse files Browse the repository at this point in the history
NETPYNE-184 fix dev deployment
  • Loading branch information
enicolasgomez authored Nov 14, 2023
2 parents 6937f1b + a152c69 commit 87b3167
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions jupyter_hub/Dockerfile_spawner
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ RUN /bin/bash -c "INCUBATOR_VER=${INCUBATOR_VER} source activate snakes && pip i
# Clone NetPyNE-UI and install the development version
RUN wget https://github.com/MetaCell/NetPyNE-UI/archive/$netpyneuiBranch.zip -q
RUN unzip $netpyneuiBranch.zip
WORKDIR /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/utilities
WORKDIR /opt/workspace-$netpyneuiBranch/utilities
RUN /bin/bash -c "source activate snakes && python --version"
RUN /bin/bash -c "source activate snakes && exec python install.py branch $netpyneuiBranch"
WORKDIR /home/jovyan
RUN git clone https://github.com/Neurosim-lab/netpyne_workspace
WORKDIR /home/jovyan/workspace
RUN ln -sfn /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/netpyne_ui/tests tests
RUN ln -sfn /opt/workspace-$netpyneuiBranch/netpyne_ui/tests tests

# Copy jupyterhub_config
# RUN cp /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/jupyterhub_config.py .
# RUN cp /opt/workspace-$netpyneuiBranch/jupyterhub_config.py .

CMD /bin/bash -c "source activate snakes && exec jupyterhub-singleuser --debug --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui"
2 changes: 1 addition & 1 deletion k8s/cf_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ hub:
shutdownOnLogout: true
extraConfig:
timing: |
c.Spawner.notebook_dir = '/home/jovyan/work/NetPyNE-UI'
c.Spawner.notebook_dir = '/opt/workspace'
c.Spawner.default_url = '/geppetto'
spawner: >-
c.Spawner.args = ["--library=netpyne_ui"]
Expand Down
2 changes: 1 addition & 1 deletion k8s/minikube_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ hub:
c.Spawner.port = 8000
c.Spawner.http_timeout = 300
c.Spawner.start_timeout = 300
c.Spawner.notebook_dir = '/home/jovyan/work/NetPyNE-UI'
c.Spawner.notebook_dir = '/opt/workspace'
c.Spawner.default_url = '/geppetto'
c.Spawner.debug = True
c.Spawner.disable_check_xsrf=True
Expand Down
4 changes: 2 additions & 2 deletions tests/frontend/e2e/tests/SaveOpenFile.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ describe('Save / Open File testing', () => {
return pwd_code_outputs.map(pwd_code_output => pwd_code_output.innerText)
})

expect(first_code_output[0]).toBe("'/home/jovyan/work/NetPyNE-UI/workspace'")
expect(first_code_output[0]).toBe("'/opt/workspace/workspace'")

const code_lines = await python_frame.$$(selectors.PYTHON_CELL_SELECTOR)

Expand All @@ -398,7 +398,7 @@ describe('Save / Open File testing', () => {
return cd_code_outputs.map(cd_code_output => cd_code_output.innerText)
})

expect(second_code_output[0]).toBe("/home/jovyan/work/NetPyNE-UI/workspace/saved_models/aut_test/src\n")
expect(second_code_output[0]).toBe("/opt/workspace/workspace/saved_models/aut_test/src\n")

const ls_code_lines = await python_frame.$$(selectors.PYTHON_CELL_SELECTOR)

Expand Down

0 comments on commit 87b3167

Please sign in to comment.