Skip to content

Commit

Permalink
Bringing in image directory from deployment repo
Browse files Browse the repository at this point in the history
  • Loading branch information
shaneknapp committed Sep 6, 2024
2 parents c00dbbe + f5ca212 commit 5e393b8
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 0 deletions.
36 changes: 36 additions & 0 deletions apt.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# installing less as more just isn't enough
less

# For desktop environment
dbus-x11
xfce4
xfce4-panel
xfce4-session
xfce4-settings
xubuntu-icon-theme
xauth
# You definitely need a browser
firefox
# And a text editor
gedit
# And a terminal
xfce4-terminal

# https://github.com/berkeley-dsep-infra/datahub/issues/2535
emacs

# vim4ever!
vim

# https://github.com/berkeley-dsep-infra/datahub/issues/3679
texlive-xetex
# https://github.com/berkeley-dsep-infra/datahub/issues/3721
texlive-fonts-recommended
texlive-plain-generic
texlive-lang-chinese

# Needed for qgis maybe? https://github.com/conda-forge/pygridgen-feedstock/issues/10
libgl1-mesa-glx

# For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979
zip
31 changes: 31 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
channels:
- conda-forge

# Almost all libraries should be added in requirements.txt
# Only libraries *not* available in PyPI should be here
dependencies:
- python=3.11.*
- jupyter-server-proxy==4.2.0
#adding math functionality
- matplotlib=3.7.*
- scipy=1.10.*
- mpld3=0.5.*

# Needed for linux desktop environment
- websockify=0.11.0

- qgis=3.22.*

# Maybe needed for qgis? https://github.com/conda-forge/qgis-feedstock/issues/263
- pyopencl=2023.1

- pip
- pip:
# For desktop environment
- jupyter-desktop-server==0.1.3
- -r infra-requirements.txt
- otter-grader==3.1.4
# for notebook exporting
- nbconvert==7.6.0
- nb2pdf==0.6.2
- nbpdfexport==0.2.1
29 changes: 29 additions & 0 deletions infra-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# WARNING: Original source at scripts/infra-packages/requirements.txt
# PLEASE DO NOT EDIT ELSEWHERE
# After editing scripts/infra-packages/requirements.txt, please run
# scripts/infra-packages/sync.bash.

# This file pins versions of notebook related python packages we want
# across all hubs. This makes sure we don't need to upgrade them
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==7.0.7
jupyterlab==4.0.11
nbgitpuller==1.2.1
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.1.6
appmode==0.8.0
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# 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/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
8 changes: 8 additions & 0 deletions postBuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -eou pipefail

# HORRIBLE HACK to get qgis working. conda-forge brings in libgsl 2.7, but this seems
# to require libgsl 2.5? And I can't force conda to install that. This might break something
# deep somewhere. See https://github.com/conda-forge/qgis-feedstock/issues/263
# for upstream discussion
#ln -s /srv/conda/envs/notebook/lib/libgsl.so.27 /srv/conda/envs/notebook/lib/libgsl.so.25
6 changes: 6 additions & 0 deletions qgis.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=qgis
Exec=qgis
Icon=/srv/conda/envs/notebook/share/qgis/images/icons/qgis-icon-512x512.png
8 changes: 8 additions & 0 deletions start
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euo pipefail

mkdir -p $HOME/Desktop

cp $REPO_DIR/*.desktop $HOME/Desktop/

exec "$@"

0 comments on commit 5e393b8

Please sign in to comment.