diff --git a/setup.py b/setup.py index bf14fc7..980b832 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def load_about(): packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.8", - install_requires=["tutor>=19.0.0, <20"], + install_requires=["tutor>=20.0.0,<21"], entry_points={"tutor.plugin.v1": ["codejail = tutorcodejail.plugin"]}, classifiers=[ "Development Status :: 3 - Alpha", diff --git a/tutorcodejail/__about__.py b/tutorcodejail/__about__.py index 8ca2a2c..1e72e56 100644 --- a/tutorcodejail/__about__.py +++ b/tutorcodejail/__about__.py @@ -1,2 +1,2 @@ """Helps you keep your cool when creating dozens of open edX and eduNEXT environments.""" -__version__ = "19.1.1" +__version__ = "20.0.0" diff --git a/tutorcodejail/plugin.py b/tutorcodejail/plugin.py index c700080..2128935 100644 --- a/tutorcodejail/plugin.py +++ b/tutorcodejail/plugin.py @@ -33,7 +33,7 @@ "MIN_REPLICAS": 1, "MAX_REPLICAS": 4, "AVG_CPU": 65, - "SERVICE_VERSION": "release/sumac.2", + "SERVICE_VERSION": "release/teak.1", "SERVICE_REPOSITORY": "https://github.com/edunext/codejailservice.git", }, "overrides": {}, diff --git a/tutorcodejail/templates/codejail/build/codejail/Dockerfile b/tutorcodejail/templates/codejail/build/codejail/Dockerfile index 868740a..6f037d6 100644 --- a/tutorcodejail/templates/codejail/build/codejail/Dockerfile +++ b/tutorcodejail/templates/codejail/build/codejail/Dockerfile @@ -55,8 +55,8 @@ ENV VIRTUAL_ENV=/sandbox/venv/ WORKDIR /var/tmp RUN mkdir -p common/lib/ -ADD $EDX_PLATFORM_REPOSITORY#$EDX_PLATFORM_VERSION:requirements/edx-sandbox/releases . -RUN pip3 install -r sumac.txt +ADD $EDX_PLATFORM_REPOSITORY#$EDX_PLATFORM_VERSION:requirements/edx-sandbox/ . +RUN pip3 install -r releases/teak.txt # Allows you to add extra pip requirements to your codejail sandbox. {% if CODEJAIL_EXTRA_PIP_REQUIREMENTS is defined %}