Skip to content

Commit

Permalink
Merge pull request #1359 from consideRatio/pr/bump-node-jupyterhub
Browse files Browse the repository at this point in the history
Major version bump node (18->20) and jupyterhub-singleuser (3->5)
  • Loading branch information
yuvipanda authored Jul 12, 2024
2 parents d302389 + 38afb16 commit 82713f3
Show file tree
Hide file tree
Showing 17 changed files with 766 additions and 746 deletions.
158 changes: 80 additions & 78 deletions repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock

Large diffs are not rendered by default.

158 changes: 80 additions & 78 deletions repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions repo2docker/buildpacks/conda/environment.py-3.10.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2024-03-28 14:24:47 UTC
# Generated on 2024-07-08 09:47:05 UTC
channels:
- conda-forge
dependencies:
- python=3.10.*
- nodejs=18
- nodejs=20
- pip
- ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets
- jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.0.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter-offlinenotebook==0.3.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter_server==2.* # https://github.com/jupyter-server/jupyter_server
- jupyterhub-singleuser==3.* # https://github.com/jupyterhub/jupyterhub
- jupyterhub-singleuser==5.* # https://github.com/jupyterhub/jupyterhub
- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab
- notebook==6.* # https://github.com/jupyter/notebook
160 changes: 81 additions & 79 deletions repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock

Large diffs are not rendered by default.

160 changes: 81 additions & 79 deletions repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions repo2docker/buildpacks/conda/environment.py-3.11.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2024-03-28 14:25:30 UTC
# Generated on 2024-07-08 09:47:29 UTC
channels:
- conda-forge
dependencies:
- python=3.11.*
- nodejs=18
- nodejs=20
- pip
- ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets
- jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.0.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter-offlinenotebook==0.3.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter_server==2.* # https://github.com/jupyter-server/jupyter_server
- jupyterhub-singleuser==3.* # https://github.com/jupyterhub/jupyterhub
- jupyterhub-singleuser==5.* # https://github.com/jupyterhub/jupyterhub
- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab
- notebook==6.* # https://github.com/jupyter/notebook
94 changes: 48 additions & 46 deletions repo2docker/buildpacks/conda/environment.py-3.12-linux-64.lock

Large diffs are not rendered by default.

94 changes: 48 additions & 46 deletions repo2docker/buildpacks/conda/environment.py-3.12-linux-aarch64.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions repo2docker/buildpacks/conda/environment.py-3.12.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2024-05-29 18:21:59 UTC
# Generated on 2024-07-08 09:47:52 UTC
channels:
- conda-forge
dependencies:
- python=3.12.*
- nodejs=18
- nodejs=20
- pip
- ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets
- jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.0.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter-offlinenotebook==0.3.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter_server==2.* # https://github.com/jupyter-server/jupyter_server
- jupyterhub-singleuser==3.* # https://github.com/jupyterhub/jupyterhub
- jupyterhub-singleuser==5.* # https://github.com/jupyterhub/jupyterhub
- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab
- notebook==6.* # https://github.com/jupyter/notebook
158 changes: 80 additions & 78 deletions repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock

Large diffs are not rendered by default.

158 changes: 80 additions & 78 deletions repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions repo2docker/buildpacks/conda/environment.py-3.8.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2024-03-28 14:23:15 UTC
# Generated on 2024-07-08 09:46:18 UTC
channels:
- conda-forge
dependencies:
- python=3.8.*
- nodejs=18
- nodejs=20
- pip
- ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets
- jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.0.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter-offlinenotebook==0.3.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter_server==2.* # https://github.com/jupyter-server/jupyter_server
- jupyterhub-singleuser==3.* # https://github.com/jupyterhub/jupyterhub
- jupyterhub-singleuser==5.* # https://github.com/jupyterhub/jupyterhub
- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab
- notebook==6.* # https://github.com/jupyter/notebook
156 changes: 79 additions & 77 deletions repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock

Large diffs are not rendered by default.

156 changes: 79 additions & 77 deletions repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions repo2docker/buildpacks/conda/environment.py-3.9.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2024-03-28 14:24:01 UTC
# Generated on 2024-07-08 09:46:42 UTC
channels:
- conda-forge
dependencies:
- python=3.9.*
- nodejs=18
- nodejs=20
- pip
- ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets
- jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.0.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter-offlinenotebook==0.3.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter_server==2.* # https://github.com/jupyter-server/jupyter_server
- jupyterhub-singleuser==3.* # https://github.com/jupyterhub/jupyterhub
- jupyterhub-singleuser==5.* # https://github.com/jupyterhub/jupyterhub
- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab
- notebook==6.* # https://github.com/jupyter/notebook
8 changes: 4 additions & 4 deletions repo2docker/buildpacks/conda/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ channels:
- conda-forge
dependencies:
- python=3.10
- nodejs=18
- nodejs=20
- pip
- ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets
- jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.0.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter-offlinenotebook==0.3.* # https://github.com/manics/jupyter-offlinenotebook
- jupyter-resource-usage==1.* # https://github.com/jupyter-server/jupyter-resource-usage
- jupyter_server==2.* # https://github.com/jupyter-server/jupyter_server
- jupyterhub-singleuser==3.* # https://github.com/jupyterhub/jupyterhub
- jupyterhub-singleuser==5.* # https://github.com/jupyterhub/jupyterhub
- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab
- notebook==6.* # https://github.com/jupyter/notebook
2 changes: 1 addition & 1 deletion tests/base/node/verify
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -ex
# check node system package and its version
which node
node --version
node --version | grep v18
node --version | grep v20

# npm comes with the nodejs conda-forge package that we have pinned, but we
# don't have npm pinned. For example nodejs 18.13.0 brought npm 8.19.3, but
Expand Down

0 comments on commit 82713f3

Please sign in to comment.