diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c32c7f..04e58e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: TUTOR_EXTRA_ENABLED_PLUGINS: mfe TUTOR_IMAGES: jupyterhub jupyterlab TUTOR_PYPI_PACKAGE: tutor-jupyter - OPENEDX_RELEASE: olive + OPENEDX_RELEASE: quince GITHUB_REPO: overhangio/tutor-jupyter include: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c48991..9845125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes: + +## v17.0.0 (2023-12-06) + +- 💥[Feature] Upgrade to Quince. (by @mhsiddiqui) + ## v16.0.1 (2023-06-29) diff --git a/setup.py b/setup.py index dac60ad..0d84fe1 100644 --- a/setup.py +++ b/setup.py @@ -41,8 +41,8 @@ def load_about(): packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.8", - install_requires=["tutor>=16.0.0,<17.0.0", "tutor-mfe>=16.0.0,<17.0.0"], - extras_require={"dev": "tutor[dev]>=16.0.0,<17.0.0"}, + install_requires=["tutor>=17.0.0,<18.0.0", "tutor-mfe>=17.0.0,<18.0.0"], + extras_require={"dev": "tutor[dev]>=17.0.0,<18.0.0"}, entry_points={ "tutor.plugin.v1": [ "jupyter = tutorjupyter.plugin" diff --git a/tutorjupyter/__about__.py b/tutorjupyter/__about__.py index 610c111..a08b09c 100644 --- a/tutorjupyter/__about__.py +++ b/tutorjupyter/__about__.py @@ -1 +1 @@ -__version__ = "16.0.1" +__version__ = "17.0.0" diff --git a/tutorjupyter/patches/openedx-dockerfile-post-python-requirements b/tutorjupyter/patches/openedx-dockerfile-post-python-requirements index 8cf748d..5bf3f15 100644 --- a/tutorjupyter/patches/openedx-dockerfile-post-python-requirements +++ b/tutorjupyter/patches/openedx-dockerfile-post-python-requirements @@ -1,4 +1,4 @@ # Install Jupyter XBlock -# Remember to bump the version when we upgrade from Palm. +# Remember to bump the version when we upgrade from Quince. # https://pypi.org/project/jupyter-xblock/ -RUN pip install "jupyter-xblock>=16.0.0,<17.0.0" +RUN pip install "jupyter-xblock>=17.0.0,<18.0.0" diff --git a/tutorjupyter/templates/jupyter/build/hub/Dockerfile b/tutorjupyter/templates/jupyter/build/hub/Dockerfile index f0cdd5f..20c4380 100644 --- a/tutorjupyter/templates/jupyter/build/hub/Dockerfile +++ b/tutorjupyter/templates/jupyter/build/hub/Dockerfile @@ -1,15 +1,15 @@ # https://hub.docker.com/r/jupyterhub/jupyterhub/tags # Base: https://github.com/jupyterhub/jupyterhub/blob/main/Dockerfile -FROM docker.io/jupyterhub/jupyterhub:4.0.0 +FROM docker.io/jupyterhub/jupyterhub:4 # https://pypi.org/project/dockerspawner/ # https://pypi.org/project/jupyterhub-kubespawner/ # https://pypi.org/project/jupyterhub-ltiauthenticator/ # https://pypi.org/project/pymysql/ RUN pip install \ - dockerspawner==12.1.0 \ - jupyterhub-kubespawner==6.0.0 \ - jupyterhub-ltiauthenticator==1.5.1 \ - pymysql==1.0.3 + dockerspawner==13.0.0 \ + jupyterhub-kubespawner==6.2.0 \ + jupyterhub-ltiauthenticator==1.6.1 \ + pymysql==1.1.0 CMD ["jupyterhub"] diff --git a/tutorjupyter/templates/jupyter/build/lab/Dockerfile b/tutorjupyter/templates/jupyter/build/lab/Dockerfile index 8a7d066..b2e771b 100644 --- a/tutorjupyter/templates/jupyter/build/lab/Dockerfile +++ b/tutorjupyter/templates/jupyter/build/lab/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/r/jupyterhub/singleuser/tags -FROM docker.io/jupyterhub/singleuser:4.0.0 +FROM docker.io/jupyterhub/singleuser:4 # Install git for nbgitpuller USER root @@ -11,10 +11,10 @@ USER jovyan # https://github.com/jupyterhub/nbgitpuller # https://hub.jupyter.org/nbgitpuller/ # https://pypi.org/project/nbgitpuller/ -RUN pip install nbgitpuller==1.1.1 +RUN pip install nbgitpuller==1.2.0 # https://pypi.org/project/jupyterlab/ -RUN pip install jupyterlab==3.6.3 +RUN pip install jupyterlab==4.0.9 {{ patch("jupyter-lab-dockerfile") }}