diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fda9f24..794fe20 100644 --- 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: nutmeg + OPENEDX_RELEASE: olive GITHUB_REPO: overhangio/tutor-xqueue include: diff --git a/setup.py b/setup.py index e117881..c1de879 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setup( packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.7", - install_requires=["tutor>=14.0.0,<15.0.0", "requests"], + install_requires=["tutor>=15.0.0,<16.0.0", "requests"], entry_points={"tutor.plugin.v1": ["xqueue = tutorxqueue.plugin"]}, classifiers=[ "Development Status :: 3 - Alpha", diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py index 2294691..d5793af 100644 --- a/tutorxqueue/__about__.py +++ b/tutorxqueue/__about__.py @@ -1 +1 @@ -__version__ = "14.0.0" +__version__ = "15.0.0" diff --git a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile index abf511c..cde7e69 100644 --- a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile +++ b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile @@ -1,5 +1,4 @@ FROM docker.io/ubuntu:20.04 -MAINTAINER Overhang.io RUN apt update && \ apt upgrade -y && \ @@ -17,7 +16,7 @@ RUN python -m venv /openedx/venv ENV PATH /openedx/venv/bin:${PATH} RUN pip install --upgrade pip setuptools RUN pip install -r requirements.txt -RUN pip install uwsgi==2.0.20 +RUN pip install uwsgi==2.0.21 RUN mkdir /openedx/data /openedx/data/media