Skip to content

Commit 7de36ad

Browse files
regisbOverhang.IODawoudSheraz
authored
feat: upgrade to sumac
--------- Co-authored-by: Régis Behmo <[email protected]> Co-authored-by: Overhang.IO <[email protected]> Co-authored-by: Syed Muhammad Dawoud Sheraz Ali <[email protected]>
2 parents a42b22d + 93ad17b commit 7de36ad

File tree

8 files changed

+32
-20
lines changed

8 files changed

+32
-20
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@ instructions, because git commits are used to generate release notes:
1919

2020
<!-- scriv-insert-here -->
2121

22+
<a id='changelog-19.0.0'></a>
23+
## v19.0.0 (2024-10-24)
24+
25+
- 💥 [Deprecation] Drop support for python 3.8 and set Python 3.9 as the minimum supported python version. (by @DawoudSheraz)
26+
27+
- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz):
28+
* Rename **master** to **release**, as this branch runs the latest official Open edX release tag.
29+
* Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.
30+
31+
- [Bugfix] Fix legacy warnings during Docker build. (by @regisb)
32+
33+
- 💥[Feature] Update Xqueue Image to use Ubuntu 24.04 as base OS. (by @jfavellar90)
34+
35+
- 💥[Feature] Upgrade to Sumac. (by @jfavellar90)
36+
2237
<a id='changelog-18.0.0'></a>
2338
## v18.0.0 (2024-05-09)
2439

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For a problem that includes a file submission, write instead::
5656

5757
Note that in all cases, the queue name must be "openedx".
5858

59-
Save and publish the created unit. Then, access the unit from the LMS and attempt to answer the problem. The answer is sent to the Xqueue service. If you know how to use the Xqueue API, you can access it at http(s)://xqueue.LMS_HOST (in production) or http://xqueue.local.edly.io (in development). However, the Xqueue API is a bit awkward to use. Tutor provides a simple command-line interface to interact with the Xqueue service.
59+
Save and publish the created unit. Then, access the unit from the LMS and attempt to answer the problem. The answer is sent to the Xqueue service. If you know how to use the Xqueue API, you can access it at http(s)://xqueue.LMS_HOST (in production) or http://xqueue.local.openedx.io (in development). However, the Xqueue API is a bit awkward to use. Tutor provides a simple command-line interface to interact with the Xqueue service.
6060

6161
Count the number of submissions that need to be graded::
6262

changelog.d/20240621_170044_regis.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/20241111_170333_dawoud.sheraz_remove_py38_references.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/20241119_165848_dawoud.sheraz_branch_rename.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
packages=find_packages(exclude=["tests*"]),
3434
include_package_data=True,
3535
python_requires=">=3.9",
36-
install_requires=["tutor>=18.0.0,<19.0.0", "requests"],
36+
install_requires=["tutor>=19.0.0,<20.0.0", "requests"],
3737
extras_require={
38-
"dev": ["tutor[dev]>=18.0.0,<19.0.0"],
38+
"dev": ["tutor[dev]>=19.0.0,<20.0.0"],
3939
},
4040
entry_points={"tutor.plugin.v1": ["xqueue = tutorxqueue.plugin"]},
4141
classifiers=[

tutorxqueue/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "18.0.0"
1+
__version__ = "19.0.0"

tutorxqueue/templates/xqueue/build/xqueue/Dockerfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
# syntax=docker/dockerfile:1.4
2-
###### Minimal image with base system requirements for most stages ######
3-
FROM docker.io/python:3.12-slim-bookworm
2+
FROM docker.io/ubuntu:24.04
43

54
ARG DEBIAN_FRONTEND=noninteractive
5+
6+
# Delete default UID=1000 `ubuntu` user to ensure we can use id 1000 for app user
7+
RUN userdel -r ubuntu
8+
69
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
710
--mount=type=cache,target=/var/lib/apt,sharing=locked \
811
apt update && \
912
apt upgrade -y && \
1013
apt install -y \
11-
locales \
14+
language-pack-en \
1215
git \
13-
python3-dev \
14-
build-essential \
15-
default-libmysqlclient-dev \
16-
pkg-config && \
17-
sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
18-
locale-gen
19-
ENV LC_ALL=en_US.UTF-8
16+
python3 \
17+
python3-pip \
18+
python3-venv \
19+
libmysqlclient-dev \
20+
pkg-config
21+
RUN ln -s /usr/bin/python3 /usr/bin/python
2022

2123
###### Git-clone xqueue repo ######
2224
ARG APP_USER_ID=1000
@@ -32,7 +34,7 @@ ENV PATH=/openedx/venv/bin:${PATH}
3234
# https://pypi.org/project/setuptools/
3335
# https://pypi.org/project/pip/
3436
# https://pypi.org/project/wheel/
35-
RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install setuptools==69.2.0 pip==24.0 wheel==0.43.0
37+
RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install setuptools==75.2.0 pip==24.2 wheel==0.44.0
3638
RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install -r requirements.txt
3739
RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install uwsgi==2.0.25.1
3840

0 commit comments

Comments
 (0)