feat: upgrade to Quince

overhangio · Dec 9, 2023 · 8703186 · 8703186
1 parent 241283e
commit 8703186
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
     TUTOR_PLUGIN: xqueue
     TUTOR_IMAGES: xqueue
     TUTOR_PYPI_PACKAGE: tutor-xqueue
-    OPENEDX_RELEASE: palm
+    OPENEDX_RELEASE: quince
     GITHUB_REPO: overhangio/tutor-xqueue
 
 include:

diff --git a/setup.py b/setup.py
@@ -33,9 +33,9 @@
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.8",
-    install_requires=["tutor>=16.0.0,<17.0.0", "requests"],
+    install_requires=["tutor>=17.0.0,<18.0.0", "requests"],
     extras_require={
-        "dev": ["tutor[dev]>=16.0.0,<17.0.0"],
+        "dev": ["tutor[dev]>=17.0.0,<18.0.0"],
     },
     entry_points={"tutor.plugin.v1": ["xqueue = tutorxqueue.plugin"]},
     classifiers=[

diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py
@@ -1 +1 @@
-__version__ = "16.0.2"
+__version__ = "17.0.0"
diff --git a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile
@@ -28,9 +28,9 @@ WORKDIR /openedx/xqueue
 RUN python -m venv /openedx/venv
 ENV PATH /openedx/venv/bin:${PATH}
 
-RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install --upgrade pip setuptools
+RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install setuptools==68.2.2 pip==23.2.1. wheel==0.41.2
 RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install -r requirements.txt
-RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install uwsgi==2.0.21
+RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install uwsgi==2.0.22
 
 RUN mkdir /openedx/data /openedx/data/media