diff --git a/CHANGELOG.md b/CHANGELOG.md index f058fda..404bb7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes: + +## v20.0.0 (2025-06-05) + +- 💥[Feature] Upgrade to Teak. (by @jfavellar90) + ## v19.0.2 (2025-03-12) diff --git a/README.rst b/README.rst index 6519bc1..dcb0db0 100644 --- a/README.rst +++ b/README.rst @@ -19,7 +19,7 @@ You should then run the initialisation scripts. The easiest way to do this is to Usage ----- -In the Open edX studio, edit a course and add a new "Advanced blank problem" ("Problem" → "Advanced" → "Blank Advanced Problem"). Then, click "Edit" and copy-paste the following in the editor:: +In the Open edX studio, edit a course and add a new "Advanced blank problem" ("Problem" → "Advanced problem types" → "Blank problem"). Then, copy-paste the following in the Blank problem editor:: diff --git a/pyproject.toml b/pyproject.toml index f64d6c8..73e3d44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "tutor>=19.0.0,<20.0.0", + "tutor>=20.0.0,<21.0.0", ] # These fields will be set by hatch_build.py @@ -35,7 +35,7 @@ dynamic = ["version"] [project.optional-dependencies] dev = [ - "tutor[dev]>=19.0.0,<20.0.0", + "tutor[dev]>=20.0.0,<21.0.0", "black", "pylint" ] diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py index 14d428a..9c9eb91 100644 --- a/tutorxqueue/__about__.py +++ b/tutorxqueue/__about__.py @@ -1 +1 @@ -__version__ = "19.0.2" +__version__ = "20.0.0" diff --git a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile index ccffa5f..c5d77e9 100644 --- a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile +++ b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.4 +# syntax=docker/dockerfile:1 FROM docker.io/ubuntu:24.04 ARG DEBIAN_FRONTEND=noninteractive @@ -34,18 +34,18 @@ ENV PATH=/openedx/venv/bin:${PATH} # https://pypi.org/project/setuptools/ # https://pypi.org/project/pip/ # https://pypi.org/project/wheel/ -RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install setuptools==75.2.0 pip==24.2 wheel==0.44.0 +RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install setuptools==78.1.0 pip==25.0.1 wheel==0.46.0 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install -r requirements.txt -RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install uwsgi==2.0.25.1 +RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install uwsgi==2.0.28 RUN mkdir /openedx/data /openedx/data/media EXPOSE 8000 -CMD uwsgi \ - --static-map /media=/openedx/data/media/ \ - --http 0.0.0.0:8000 \ - --thunder-lock \ - --single-interpreter \ - --enable-threads \ - --processes=2 \ - --wsgi-file xqueue/wsgi.py +CMD ["uwsgi", \ + "--static-map", "/media=/openedx/data/media/", \ + "--http", "0.0.0.0:8000", \ + "--thunder-lock", \ + "--single-interpreter", \ + "--enable-threads", \ + "--processes=2", \ + "--wsgi-file", "xqueue/wsgi.py"]