diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 210fc2e..986e545 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,9 @@ on: jobs: run_tests: name: Tests - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: matrix: - os: [ubuntu-20.04] python-version: ['3.11', '3.12'] toxenv: [django42, quality] @@ -36,7 +35,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.11' && matrix.toxenv=='py311-django42' + if: matrix.python-version == '3.11' && matrix.toxenv == 'django42' uses: codecov/codecov-action@v4 with: flags: unittests diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index bb3af48..e030d8a 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout diff --git a/requirements/ci.txt b/requirements/ci.txt index 32f9716..133936c 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -46,10 +46,6 @@ certifi==2024.8.30 # via # -r requirements/test.txt # requests -cffi==1.17.1 - # via - # -r requirements/test.txt - # cryptography chardet==5.2.0 # via # -r requirements/test.txt @@ -89,10 +85,6 @@ coverage[toml]==7.6.1 # coveralls coveralls==4.0.1 # via -r requirements/test.txt -cryptography==43.0.1 - # via - # -r requirements/test.txt - # secretstorage ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 @@ -168,11 +160,6 @@ jaraco-functools==4.0.2 # via # -r requirements/test.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/test.txt - # keyring - # secretstorage jinja2==3.1.4 # via # -r requirements/test.txt @@ -265,10 +252,6 @@ pluggy==1.5.0 # tox pycodestyle==2.12.1 # via -r requirements/test.txt -pycparser==2.22 - # via - # -r requirements/test.txt - # cffi pygments==2.18.0 # via # -r requirements/test.txt @@ -358,10 +341,6 @@ s3transfer==0.10.2 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.3 - # via - # -r requirements/test.txt - # keyring simplejson==3.19.3 # via # -r requirements/test.txt diff --git a/requirements/pip-tools.in b/requirements/pip-tools.in index caf45a9..056da12 100644 --- a/requirements/pip-tools.in +++ b/requirements/pip-tools.in @@ -1,4 +1,4 @@ - # Dependencies to run compile tools +# Dependencies to run compile tools -c constraints.txt pip-tools # Contains pip-compile, used to generate pip requirements files diff --git a/requirements/quality.txt b/requirements/quality.txt index ad85824..2f50c3f 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -33,8 +33,6 @@ botocore==1.35.14 # s3transfer certifi==2024.8.30 # via requests -cffi==1.17.1 - # via cryptography chardet==5.2.0 # via binaryornot charset-normalizer==3.3.2 @@ -51,8 +49,6 @@ code-annotations==1.8.0 # via edx-lint cookiecutter==2.6.0 # via xblock-sdk -cryptography==43.0.1 - # via secretstorage ddt==1.7.2 # via -r requirements/quality.in dill==0.3.8 @@ -96,10 +92,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.0.2 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.4 # via # code-annotations @@ -156,8 +148,6 @@ platformdirs==4.3.2 # via pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pycparser==2.22 - # via cffi pygments==2.18.0 # via # readme-renderer @@ -219,8 +209,6 @@ s3transfer==0.10.2 # via # -r requirements/base.txt # boto3 -secretstorage==3.3.3 - # via keyring simplejson==3.19.3 # via # -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index 0b1b44b..a392459 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -33,8 +33,6 @@ botocore==1.35.14 # s3transfer certifi==2024.8.30 # via requests -cffi==1.17.1 - # via cryptography chardet==5.2.0 # via binaryornot charset-normalizer==3.3.2 @@ -55,8 +53,6 @@ coverage[toml]==7.6.1 # via coveralls coveralls==4.0.1 # via -r requirements/test.in -cryptography==43.0.1 - # via secretstorage ddt==1.7.2 # via -r requirements/test.in dill==0.3.8 @@ -104,10 +100,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.0.2 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.4 # via # code-annotations @@ -170,8 +162,6 @@ pluggy==1.5.0 # via pytest pycodestyle==2.12.1 # via -r requirements/test.in -pycparser==2.22 - # via cffi pygments==2.18.0 # via # readme-renderer @@ -239,8 +229,6 @@ s3transfer==0.10.2 # via # -r requirements/base.txt # boto3 -secretstorage==3.3.3 - # via keyring simplejson==3.19.3 # via # -r requirements/base.txt diff --git a/tox.ini b/tox.ini index 2b27bb2..97d6dc3 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ allowlist_externals = make deps = - django42: Django>=4.2,<4.3 + django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt commands = make test