From 9ff6bf687f1115a75e25823115f88bbafad21688 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 6 Sep 2024 11:09:40 +0500 Subject: [PATCH 1/2] fix: move to ubuntu-latest --- .github/workflows/ci.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/pypi-publish.yml | 2 +- Dockerfile | 2 +- tox.ini | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29e624a0..4cc192ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - '**' jobs: run_tests: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: matrix: python-version: ['3.11', '3.12'] diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ffa7cf79..a826746f 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -6,7 +6,7 @@ on: - master jobs: push: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest if: github.event_name == 'push' steps: diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 705f3b49..2df9bd47 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -8,7 +8,7 @@ on: jobs: push: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Checkout diff --git a/Dockerfile b/Dockerfile index b315597a..4de8c38f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:noble +FROM ubuntu:latest RUN apt-get update && apt-get install -y \ gettext \ diff --git a/tox.ini b/tox.ini index 96cfce73..cc8195e0 100644 --- a/tox.ini +++ b/tox.ini @@ -11,20 +11,20 @@ addopts = --cov workbench --cov sample_xblocks --cov-report term-missing --cov-r norecursedirs = .* doc bin prototype screenshots requirements [testenv] -allowlist_externals = +allowlist_externals = make deps = - django42: Django>=4.2,<4.3 + django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt -passenv = +passenv = DISPLAY -commands = +commands = make var/workbench.db python -Wd -m pytest {posargs} [testenv:quality] -deps = +deps = -r{toxinidir}/requirements/quality.txt -commands = +commands = pylint workbench sample_xblocks isort --check-only workbench sample_xblocks From e4af8b45787f61b7cf67915c834cd3a1b9bdf631 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 9 Sep 2024 09:55:40 +0500 Subject: [PATCH 2/2] chore: make upgrade --- requirements/ci.txt | 2 +- requirements/dev.txt | 2 +- requirements/quality.txt | 2 +- requirements/test.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 3f5e3b88..f1194300 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -20,7 +20,7 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.3.1 +platformdirs==4.3.2 # via # tox # virtualenv diff --git a/requirements/dev.txt b/requirements/dev.txt index 4a6bb727..1461344d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -202,7 +202,7 @@ packaging==24.1 # tox pbr==6.1.0 # via stevedore -platformdirs==4.3.1 +platformdirs==4.3.2 # via # -r requirements/test.txt # pylint diff --git a/requirements/quality.txt b/requirements/quality.txt index 8d07505d..c785fee5 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -170,7 +170,7 @@ packaging==24.1 # tox pbr==6.1.0 # via stevedore -platformdirs==4.3.1 +platformdirs==4.3.2 # via # -r requirements/test.txt # pylint diff --git a/requirements/test.txt b/requirements/test.txt index cb3945a0..6d09ae72 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -135,7 +135,7 @@ packaging==24.1 # pytest # pytest-rerunfailures # tox -platformdirs==4.3.1 +platformdirs==4.3.2 # via # tox # virtualenv