Merge branch 'master' into v2.6.0

MarkUsProject · Dec 19, 2024 · cc88ced · cc88ced
2 parents d1ed0a1 + 46766a6
commit cc88ced
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 40 deletions.
diff --git a/.github/workflows/test_ci.yml b/.github/workflows/test_ci.yml
@@ -9,26 +9,23 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - 3.7
-          - 3.8
-          - 3.9
-          - '3.10'
           - 3.11
           - 3.12
+          - 3.13
         test-dir:
           - client
           - server
     name: ${{ matrix.test-dir }} tests with python ${{ matrix.python-version }}
     env:
       AUTOTESTER_CONFIG: server/autotest_server/tests/fixtures/test_config.yml
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 24.10.0
     hooks:
     - id: black
   - repo: https://github.com/pycqa/flake8

diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,10 @@
 # CHANGELOG
 All notable changes to this project will be documented here.
 
+## [v2.6.0]
+- Update python versions in docker file (#568)
+- Update Github Actions config to use Python 3.11-3.13 and update action versions (#569)
+
 ## [v2.5.2]
 - Haskell Tests - allow displaying of compilation errors (#554)
 - Add status api for monitoring if Gunicorn is down (#555)

diff --git a/client/.dockerfiles/Dockerfile b/client/.dockerfiles/Dockerfile
@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION
+ARG UBUNTU_VERSION=22.04
 
 FROM ubuntu:$UBUNTU_VERSION
 

diff --git a/client/requirements.txt b/client/requirements.txt
@@ -2,9 +2,9 @@ flask==2.2.5;python_version<"3.8"
 flask==3.0.3;python_version>="3.8"
 python-dotenv==0.21.1;python_version<"3.8"
 python-dotenv==1.0.1;python_version>="3.8"
-rq==1.16.2
-redis==5.0.4
+rq==2.0.0
+redis==5.2.0
 jsonschema==4.17.3;python_version<"3.8"
-jsonschema==4.22.0;python_version>="3.8"
+jsonschema==4.23.0;python_version>="3.8"
 Werkzeug==2.2.3;python_version<"3.8"
-Werkzeug==3.0.3;python_version>="3.8"
+Werkzeug==3.1.3;python_version>="3.8"
diff --git a/docker-compose.yml → compose.yaml b/docker-compose.yml → compose.yaml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   server:
     build:
@@ -9,7 +7,7 @@ services:
         UBUNTU_VERSION: '22.04'
         LOGIN_USER: 'docker'
         WORKSPACE: '/home/docker/.autotesting'
-    image: markus-autotest-server-dev:1.1.0
+    image: markus-autotest-server-dev:1.2.0
     volumes:
       - ./server:/app:cached
       - workspace:/home/docker/.autotesting:rw
@@ -29,7 +27,7 @@ services:
       dockerfile: ./.dockerfiles/Dockerfile
       args:
         UBUNTU_VERSION: '22.04'
-    image: markus-autotest-client-dev:1.1.0
+    image: markus-autotest-client-dev:1.2.0
     container_name: 'autotest-client'
     volumes:
       - ./client:/app:cached
@@ -46,7 +44,7 @@ services:
       - markus_dev
 
   postgres:
-    image: postgres:10
+    image: postgres:14
     volumes:
       - postgres_autotest:/var/lib/postgresql/data
     environment:
@@ -56,7 +54,7 @@ services:
       - '45432:5432'
 
   redis:
-    image: redis:3.2-alpine
+    image: redis:7
     volumes:
       - redis_autotest:/data
     ports:

diff --git a/server/.dockerfiles/Dockerfile b/server/.dockerfiles/Dockerfile
@@ -1,6 +1,6 @@
-ARG UBUNTU_VERSION
+ARG UBUNTU_VERSION=22.04
 
-FROM ubuntu:$UBUNTU_VERSION as base
+FROM ubuntu:$UBUNTU_VERSION AS base
 
 
 ARG LOGIN_USER
@@ -9,18 +9,12 @@ ARG WORKSPACE
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
     DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install python3.7 \
-                       python3.7-venv \
-                       python3.8 \
-                       python3.8-venv \
-                       python3.9 \
-                       python3.9-venv \
-                       python3.10 \
-                       python3.10-venv \
-                       python3.11 \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install python3.11 \
                        python3.11-venv \
                        python3.12 \
                        python3.12-venv \
+                       python3.13 \
+                       python3.13-venv \
                        redis-server \
                        postgresql-client \
                        libpq-dev \

diff --git a/server/autotest_server/testers/jupyter/requirements.txt b/server/autotest_server/testers/jupyter/requirements.txt
@@ -1,3 +1,3 @@
 pytest==7.1.2
-psycopg2-binary==2.9.3
+psycopg2-binary==2.9.10
 git+https://github.com/MarkUsProject/autotest-helpers.git#subdirectory=notebook_helper
diff --git a/server/autotest_server/testers/jupyter/setup.py b/server/autotest_server/testers/jupyter/setup.py
@@ -18,7 +18,7 @@ def create_environment(settings_, env_dir, _default_env_dir):
 def settings():
     with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings_schema.json")) as f:
         settings_ = json.load(f)
-    py_versions = [f"3.{x}" for x in range(7, 13) if shutil.which(f"python3.{x}")]
+    py_versions = [f"3.{x}" for x in range(11, 14) if shutil.which(f"python3.{x}")]
     python_versions = settings_["properties"]["env_data"]["properties"]["python_version"]
     python_versions["enum"] = py_versions
     python_versions["default"] = py_versions[-1]

diff --git a/server/autotest_server/testers/py/requirements.txt b/server/autotest_server/testers/py/requirements.txt
@@ -1,2 +1,2 @@
 pytest==7.1.2
-psycopg2-binary==2.9.3
+psycopg2-binary==2.9.10
diff --git a/server/autotest_server/testers/py/setup.py b/server/autotest_server/testers/py/setup.py
@@ -18,7 +18,7 @@ def create_environment(settings_, env_dir, _default_env_dir):
 def settings():
     with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings_schema.json")) as f:
         settings_ = json.load(f)
-    py_versions = [f"3.{x}" for x in range(7, 13) if shutil.which(f"python3.{x}")]
+    py_versions = [f"3.{x}" for x in range(11, 14) if shutil.which(f"python3.{x}")]
     python_versions = settings_["properties"]["env_data"]["properties"]["python_version"]
     python_versions["enum"] = py_versions
     python_versions["default"] = py_versions[-1]

diff --git a/server/autotest_server/testers/pyta/setup.py b/server/autotest_server/testers/pyta/setup.py
@@ -24,7 +24,7 @@ def create_environment(settings_, env_dir, _default_env_dir):
 def settings():
     with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings_schema.json")) as f:
         settings_ = json.load(f)
-    py_versions = [f"3.{x}" for x in range(7, 13) if shutil.which(f"python3.{x}")]
+    py_versions = [f"3.{x}" for x in range(11, 14) if shutil.which(f"python3.{x}")]
     python_versions = settings_["properties"]["env_data"]["properties"]["python_version"]
     python_versions["enum"] = py_versions
     python_versions["default"] = py_versions[-1]

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -1,10 +1,11 @@
-rq==1.16.2
+rq==2.0.0
 click==8.1.7
-redis==5.0.4
-pyyaml==6.0.1
+redis==5.2.0
+pyyaml==6.0.1;python_version<"3.8"
+pyyaml==6.0.2;python_version>="3.8"
 jsonschema==4.17.3;python_version<"3.8"
-jsonschema==4.22.0;python_version>="3.8"
+jsonschema==4.23.0;python_version>="3.8"
 requests==2.31.0;python_version<"3.8"
 requests==2.32.3;python_version>="3.8"
-psycopg2-binary==2.9.9
+psycopg2-binary==2.9.10
 supervisor==4.2.5