Merge pull request #5189 from shaneknapp/revert-dh66-publichealth

[DH66] revert popcon, move conda install to env.yml
berkeley-dsep-infra · Nov 2, 2023 · 434b532 · 434b532
2 parents 9bc75d0 + 54bfdc4
commit 434b532
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/deployments/publichealth/image/Dockerfile b/deployments/publichealth/image/Dockerfile
@@ -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}')"

diff --git a/deployments/publichealth/image/environment.yml b/deployments/publichealth/image/environment.yml
@@ -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

diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt
@@ -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