From 69b6fe26c0ceb795cb2df1cd75ef1d8f74e4c6b9 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Mon, 21 Oct 2024 16:47:36 -0700 Subject: [PATCH] [DH-273] update vscode...and lots of other things --- environment.yml | 85 ++++++++++++++++++++++-------------------- infra-requirements.txt | 29 -------------- 2 files changed, 44 insertions(+), 70 deletions(-) delete mode 100644 infra-requirements.txt diff --git a/environment.yml b/environment.yml index 97d1aa9..41b4c86 100644 --- a/environment.yml +++ b/environment.yml @@ -1,63 +1,62 @@ 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.* -- nbclassic==1.0.0 - -- jupyter-server-proxy==4.2.0 -# Visual Studio Code! -- jupyter-vscode-proxy=0.1 -- code-server=4.5.2 - -- syncthing=1.18.6 - -# A linux desktop environment -- websockify # from manics channel +# Items required for basic level functionality +- gh-scoped-creds==4.1 +- git==2.47.0 +- jupyter-resource-usage==1.1.0 +- jupyter_server==2.14.2 +- jupyterhub==4.1.6 +- jupyterlab==4.2.5 +- jupyterlab-git==0.50.1 +- jupytext==1.16.4 +- nbgitpuller==1.2.1 +- notebook==7.2.2 +- python==3.11.* +# Other items +- ipywidgets==8.1.2 +- nbclassic==1.1.0 +- jupyter-server-proxy==4.4.0 +- jupyter-vscode-proxy==0.6 +- code-server==4.23.1 +- syncthing==1.27.12 +- websockify==0.12.0 +- appmode=1.0.0 +- jupyter-syncthing-proxy==1.0.3 # https://github.com/berkeley-dsep-infra/datahub/issues/2535 # gcc, gdb, etc are newer in conda-forge than in apt, esp with Ubuntu focal -- c-compiler=1.4.2 -- cxx-compiler=1.4.2 -- fortran-compiler=1.4.2 -- gdb=11.2 -- libopenblas=0.3.27 +- c-compiler==1.8.0 +- cxx-compiler==1.8.0 +- fortran-compiler==1.8.0 +- gdb==15.1 +- libopenblas=0.3.28 - liblapack=3.9.0 -- armadillo=9.900.5 -- gperf=3.1 +- armadillo==14.0.3 +- gperf==3.1 # CS 16A # From https://github.com/berkeley-dsep-infra/datahub/issues/1363#issuecomment-598916469 -- numpy=1.26.* -- matplotlib=3.8.* -- sympy=1.12 - +- numpy==1.26.* +- matplotlib==3.8.* +- sympy==1.12 # For EECS127/227a # See https://github.com/berkeley-dsep-infra/datahub/issues/1631 -- cvxpy=1.4.3 +- cvxpy==1.4.3 # See https://github.com/berkeley-dsep-infra/datahub/issues/1936 - scikit-learn=1.4.* - -# For CHEM279 -# See https://github.com/berkeley-dsep-infra/datahub/issues/2717 -- git=2.33.0 - # From https://github.com/berkeley-dsep-infra/datahub/issues/1505 -- Pillow=10.4.0 - +- Pillow==10.4.0 # For ELENG 120 https://github.com/berkeley-dsep-infra/datahub/issues/3566 -- scipy=1.14.1 -- gcc=10.4.0 - +- scipy==1.14.1 +- gcc==13.3.0 # https://github.com/berkeley-dsep-infra/datahub/issues/4460 -- sk-video=1.1.10 -- ffmpeg=5.1.2 - +- sk-video==1.1.10 +- ffmpeg==5.1.2 # https://github.com/berkeley-dsep-infra/datahub/issues/4708 - datascience==0.17.6 -- pip +- pip==24.2 - pip: # From https://github.com/berkeley-dsep-infra/datahub/issues/1639 - opencv-python==4.9.0.80 @@ -68,5 +67,9 @@ dependencies: - nbconvert[webpdf]==7.16.4 # For desktop environment - jupyter-desktop-server==0.1.3 - - -r infra-requirements.txt - otter-grader==3.1.4 + - jupyter-archive==3.4.0 + - rise==5.7.1 + - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling + - git-credential-helpers==0.2 + - jupyter-tree-download==1.0.1 diff --git a/infra-requirements.txt b/infra-requirements.txt deleted file mode 100644 index 0fb0bd9..0000000 --- a/infra-requirements.txt +++ /dev/null @@ -1,29 +0,0 @@ -# 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