Skip to content

Commit

Permalink
Use an environment.yml file for python packages
Browse files Browse the repository at this point in the history
  • Loading branch information
yuvipanda committed Aug 15, 2024
1 parent d76118e commit 538bc84
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ COPY qgis.desktop ${DESKTOP_FILES_DIR}/qgis.desktop

COPY qgis.xml ${MIME_FILES_DIR}/qgis.xml

# Pin jupyterhub and pydantic to older version
# because of https://github.com/NASA-IMPACT/veda-jupyterhub/issues/52#issuecomment-2277453902
RUN python -m pip install --no-cache "jupyterhub<5.0.0" "pydantic<2.0"
RUN python -m pip install --no-cache jupyter-remote-desktop-proxy
RUN python -m pip install --no-cache git+https://github.com/sunu/jupyter-remote-qgis-proxy@baf0d373c2f965a60bc6fe038bb04cacc8df8cf5
COPY environment.yml /tmp/environment.yml
RUN mamba env update -f /tmp/environment.yml && \
mamba clean -a
13 changes: 13 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
channels:
- conda-forge

dependencies:
- pip
- nbgitpuller
- pip:
- jupyter-remote-desktop-proxy
# Pin jupyterhub and pydantic to older version
# because of https://github.com/NASA-IMPACT/veda-jupyterhub/issues/52#issuecomment-2277453902
- jupyterhub<5.0.0
- pydantic<2
- git+https://github.com/sunu/jupyter-remote-qgis-proxy@baf0d373c2f965a60bc6fe038bb04cacc8df8cf5
9 changes: 0 additions & 9 deletions setup-scripts/setup-linux-desktop.bash
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,5 @@ apt-get install -qq --yes -t 'o=LP-PPA-mozillateam' --yes firefox
# Cleanup apt-get update side effects
rm -rf /var/lib/apt/lists/*

# Install packages required for linux desktop VPN setup to work
# websockify and jupyter-server-proxy available from conda-forge, but
# jupyter-remote-desktop-proxy is not.
# Temporarily install nbgitpuller too, while we work on getting it upstream
mamba install -c conda-forge --yes \
websockify \
jupyter-server-proxy \
nbgitpuller

fix-permissions "${CONDA_DIR}"
fix-permissions "/home/${NB_USER}"

0 comments on commit 538bc84

Please sign in to comment.