Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DH66] revert popcon, move conda install to env.yml #5189

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions deployments/publichealth/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ USER ${NB_USER}
COPY infra-requirements.txt /tmp/infra-requirements.txt
RUN pip install --no-cache-dir -r /tmp/infra-requirements.txt

RUN mamba install -c conda-forge syncthing==1.18.6

# Install IRKernel
RUN R --quiet -e "install.packages('IRkernel', quiet = TRUE)" && \
R --quiet -e "IRkernel::installspec(prefix='${CONDA_DIR}')"
Expand Down
1 change: 1 addition & 0 deletions deployments/publichealth/image/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dependencies:
- syncthing==1.18.6
- pip:
# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048
- traitlets==5.9.0
Expand Down
2 changes: 1 addition & 1 deletion deployments/publichealth/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
popularity-contest==0.4.1
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
Expand Down