From 74fbe58b0dccc4054f169b215e6834eb8a584674 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Mon, 24 Jul 2023 07:46:24 +0000 Subject: [PATCH] Update to JupyterLab 4 and Notebook 7 --- .../buildpacks/conda/environment.py-3.10-linux-64.lock | 3 +++ .../conda/environment.py-3.10-linux-aarch64.lock | 3 +++ repo2docker/buildpacks/conda/environment.py-3.10.yml | 9 +++++---- .../buildpacks/conda/environment.py-3.11-linux-64.lock | 3 +++ .../conda/environment.py-3.11-linux-aarch64.lock | 3 +++ repo2docker/buildpacks/conda/environment.py-3.11.yml | 9 +++++---- .../buildpacks/conda/environment.py-3.8-linux-64.lock | 3 +++ .../conda/environment.py-3.8-linux-aarch64.lock | 3 +++ repo2docker/buildpacks/conda/environment.py-3.8.yml | 9 +++++---- .../buildpacks/conda/environment.py-3.9-linux-64.lock | 3 +++ .../conda/environment.py-3.9-linux-aarch64.lock | 3 +++ repo2docker/buildpacks/conda/environment.py-3.9.yml | 9 +++++---- repo2docker/buildpacks/conda/environment.yml | 9 +++++---- repo2docker/buildpacks/conda/freeze.py | 2 +- tests/conda/py-r-postbuild-file/verify | 4 ++-- tests/conda/r3.6-target-repo-dir-flag/verify | 4 ++-- .../py2-with-server-and-kernel-req/requirements3.txt | 2 +- 17 files changed, 55 insertions(+), 26 deletions(-) diff --git a/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock index 6aa423749..3645d412f 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock @@ -114,6 +114,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -173,3 +174,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock index 4a5639c34..91278f31d 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock @@ -112,6 +112,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -171,3 +172,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.10.yml b/repo2docker/buildpacks/conda/environment.py-3.10.yml index 24c6f9a20..48f01f727 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.10.yml +++ b/repo2docker/buildpacks/conda/environment.py-3.10.yml @@ -8,8 +8,9 @@ dependencies: - pip - ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets - jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook -- jupyter-resource-usage==0.7.* # https://github.com/jupyter-server/jupyter-resource-usage -- jupyter_server==1.* # https://github.com/jupyter-server/jupyter_server +- jupyter-resource-usage==1.0.* # 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 -- jupyterlab==3.* # https://github.com/jupyterlab/jupyterlab -- notebook==6.* # https://github.com/jupyter/notebook +- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab +- nbclassic==1.* # https://github.com/jupyter/nbclassic +- notebook==7.* # https://github.com/jupyter/notebook diff --git a/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock index 2b3c788d9..f166bfede 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock @@ -115,6 +115,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -174,3 +175,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock index 654df5a61..1ad982800 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock @@ -113,6 +113,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -172,3 +173,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.11.yml b/repo2docker/buildpacks/conda/environment.py-3.11.yml index 772ef4cc7..2efacc8c2 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.11.yml +++ b/repo2docker/buildpacks/conda/environment.py-3.11.yml @@ -8,8 +8,9 @@ dependencies: - pip - ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets - jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook -- jupyter-resource-usage==0.7.* # https://github.com/jupyter-server/jupyter-resource-usage -- jupyter_server==1.* # https://github.com/jupyter-server/jupyter_server +- jupyter-resource-usage==1.0.* # 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 -- jupyterlab==3.* # https://github.com/jupyterlab/jupyterlab -- notebook==6.* # https://github.com/jupyter/notebook +- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab +- nbclassic==1.* # https://github.com/jupyter/nbclassic +- notebook==7.* # https://github.com/jupyter/notebook diff --git a/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock index cd35fc854..e6587b33a 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock @@ -113,6 +113,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -172,3 +173,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock index 0ed15108b..341816f4c 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock @@ -111,6 +111,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -170,3 +171,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.8.yml b/repo2docker/buildpacks/conda/environment.py-3.8.yml index ac1570d73..48bd1deb4 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.8.yml +++ b/repo2docker/buildpacks/conda/environment.py-3.8.yml @@ -8,8 +8,9 @@ dependencies: - pip - ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets - jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook -- jupyter-resource-usage==0.7.* # https://github.com/jupyter-server/jupyter-resource-usage -- jupyter_server==1.* # https://github.com/jupyter-server/jupyter_server +- jupyter-resource-usage==1.0.* # 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 -- jupyterlab==3.* # https://github.com/jupyterlab/jupyterlab -- notebook==6.* # https://github.com/jupyter/notebook +- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab +- nbclassic==1.* # https://github.com/jupyter/nbclassic +- notebook==7.* # https://github.com/jupyter/notebook diff --git a/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock index 56ae10664..41fde8689 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock @@ -114,6 +114,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -173,3 +174,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock index 070029985..f49832480 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock +++ b/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock @@ -112,6 +112,7 @@ https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de +https://conda.anaconda.org/conda-forge/noarch/overrides-7.4.0-pyhd8ed1ab_0.conda#4625b7b01d7f4ac9c96300a5515acfaa https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1 https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 @@ -171,3 +172,5 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.6-pyha770c72_0.conda# https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.6.6-pyhd8ed1ab_0.conda#05def61d4c64b0f3161eaeb3b00cc790 https://conda.anaconda.org/conda-forge/noarch/jupyterhub-singleuser-3.1.1-pyh2a2186d_0.conda#6d0a3394efe9ff7c0ad1ed03a6ca3720 +https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#b97fc9e73cb1372834f4e7e257120d14 +https://conda.anaconda.org/conda-forge/noarch/jupyter-offlinenotebook-0.2.2-pyh1d7be83_0.tar.bz2#fe55056ce4bc4bd4953ba440270735fb diff --git a/repo2docker/buildpacks/conda/environment.py-3.9.yml b/repo2docker/buildpacks/conda/environment.py-3.9.yml index 551ece944..298ab938f 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.9.yml +++ b/repo2docker/buildpacks/conda/environment.py-3.9.yml @@ -8,8 +8,9 @@ dependencies: - pip - ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets - jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook -- jupyter-resource-usage==0.7.* # https://github.com/jupyter-server/jupyter-resource-usage -- jupyter_server==1.* # https://github.com/jupyter-server/jupyter_server +- jupyter-resource-usage==1.0.* # 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 -- jupyterlab==3.* # https://github.com/jupyterlab/jupyterlab -- notebook==6.* # https://github.com/jupyter/notebook +- jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab +- nbclassic==1.* # https://github.com/jupyter/nbclassic +- notebook==7.* # https://github.com/jupyter/notebook diff --git a/repo2docker/buildpacks/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml index 156129bd1..4936f06d0 100644 --- a/repo2docker/buildpacks/conda/environment.yml +++ b/repo2docker/buildpacks/conda/environment.yml @@ -6,8 +6,9 @@ dependencies: - pip - ipywidgets==8.* # https://github.com/jupyter-widgets/ipywidgets - jupyter-offlinenotebook==0.2.* # https://github.com/manics/jupyter-offlinenotebook - - jupyter-resource-usage==0.7.* # https://github.com/jupyter-server/jupyter-resource-usage - - jupyter_server==1.* # https://github.com/jupyter-server/jupyter_server + - jupyter-resource-usage==1.0.* # 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 - - jupyterlab==3.* # https://github.com/jupyterlab/jupyterlab - - notebook==6.* # https://github.com/jupyter/notebook + - jupyterlab==4.* # https://github.com/jupyterlab/jupyterlab + - nbclassic==1.* # https://github.com/jupyter/nbclassic + - notebook==7.* # https://github.com/jupyter/notebook diff --git a/repo2docker/buildpacks/conda/freeze.py b/repo2docker/buildpacks/conda/freeze.py index a3a18b2b0..ea8fa2180 100755 --- a/repo2docker/buildpacks/conda/freeze.py +++ b/repo2docker/buildpacks/conda/freeze.py @@ -113,7 +113,7 @@ def set_python(py_env_file, py): "py", nargs="*", help="Python version(s) to update and freeze", - default=("3.7", "3.8", "3.9", "3.10", "3.11"), + default=("3.8", "3.9", "3.10", "3.11"), ) parser.add_argument( "platform", diff --git a/tests/conda/py-r-postbuild-file/verify b/tests/conda/py-r-postbuild-file/verify index 552036ea1..695905f78 100755 --- a/tests/conda/py-r-postbuild-file/verify +++ b/tests/conda/py-r-postbuild-file/verify @@ -1,7 +1,7 @@ #!/bin/sh -jupyter serverextension list 2>&1 | grep jupyter_server_proxy -jupyter nbextension list 2>&1 | grep jupyter_server_proxy +jupyter server extension list 2>&1 | grep jupyter_server_proxy +jupyter nbclassic-nbextension list 2>&1 | grep jupyter_server_proxy R -e "library('digest')" diff --git a/tests/conda/r3.6-target-repo-dir-flag/verify b/tests/conda/r3.6-target-repo-dir-flag/verify index bff7d8b03..836e26808 100755 --- a/tests/conda/r3.6-target-repo-dir-flag/verify +++ b/tests/conda/r3.6-target-repo-dir-flag/verify @@ -1,7 +1,7 @@ #!/bin/sh -jupyter serverextension list 2>&1 | grep jupyter_server_proxy -jupyter nbextension list 2>&1 | grep jupyter_server_proxy +jupyter server extension list 2>&1 | grep jupyter_server_proxy +jupyter nbclassic-nbextension list 2>&1 | grep jupyter_server_proxy R -e "library('digest')" diff --git a/tests/pipfile/py2-with-server-and-kernel-req/requirements3.txt b/tests/pipfile/py2-with-server-and-kernel-req/requirements3.txt index 87e197c3a..16d7c6d92 100644 --- a/tests/pipfile/py2-with-server-and-kernel-req/requirements3.txt +++ b/tests/pipfile/py2-with-server-and-kernel-req/requirements3.txt @@ -1,3 +1,3 @@ # install this in the environment in which the notebook server # is running nbgitpuller does not work with Python 2 -nbgitpuller==0.6.1 +nbgitpuller==1.2.0