From 164438bcf1da4d9851212666945cde4553d6fb8c Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 6 Sep 2024 08:46:33 +0500 Subject: [PATCH 1/4] fix: move to ubuntu-latest --- .github/workflows/ci.yml | 5 ++--- .github/workflows/pypi-release.yml | 2 +- .readthedocs.yaml | 2 +- requirements/constraints.txt | 3 +-- tox.ini | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c9887e..09a0e27 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: token: ${{ secrets.CODECOV_TOKEN }} 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/.readthedocs.yaml b/.readthedocs.yaml index a632c83..09115bf 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -17,7 +17,7 @@ formats: # Set the version of python needed to build these docs. build: - os: "ubuntu-22.04" + os: "ubuntu-latest" tools: python: "3.11" diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 6b5a96f..98e6738 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,5 +9,4 @@ # linking to it here is good. # Common constraints for edx repos --c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt -backports.zoneinfo;python_version<"3.9" +-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.tx diff --git a/tox.ini b/tox.ini index 0197d3c..a48ff70 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,7 @@ envlist = py{311,312}-django{42}, quality allowlist_externals = make deps = - django32: Django>=3.2,<4.0 - django42: Django>=4.2,<4.3 + django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt commands = make test From 822046e22027867783bbe01a664aa1ddb87d6905 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 6 Sep 2024 08:50:26 +0500 Subject: [PATCH 2/4] fix: readthedocs ubuntu versioning --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 09115bf..63a07c2 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -17,7 +17,7 @@ formats: # Set the version of python needed to build these docs. build: - os: "ubuntu-latest" + os: "ubuntu-lts-latest" tools: python: "3.11" From 8dfb1e82f1b5e111dbf4ace077859d26c3c47b28 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 6 Sep 2024 10:23:18 +0500 Subject: [PATCH 3/4] fix: constraints.txt issue --- requirements/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 98e6738..8f8ed18 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,4 +9,4 @@ # linking to it here is good. # Common constraints for edx repos --c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.tx +-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt From 0ec136b1a79accaa1afb5b9a6eaf66fdec1d5ed3 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 9 Sep 2024 09:21:21 +0500 Subject: [PATCH 4/4] chore: make upgrade --- requirements/ci.txt | 21 --------------------- requirements/pip-tools.in | 2 +- requirements/test.txt | 12 ------------ 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 6b2766f..e8327c7 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 @@ -161,11 +153,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 @@ -244,10 +231,6 @@ pluggy==1.5.0 # -r requirements/tox.txt # pytest # tox -pycparser==2.22 - # via - # -r requirements/test.txt - # cffi pygments==2.18.0 # via # -r requirements/test.txt @@ -333,10 +316,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/test.txt b/requirements/test.txt index 32bbfee..71f382d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -30,8 +30,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 @@ -52,8 +50,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 @@ -91,10 +87,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 @@ -142,8 +134,6 @@ platformdirs==4.3.2 # via pylint pluggy==1.5.0 # via pytest -pycparser==2.22 - # via cffi pygments==2.18.0 # via # readme-renderer @@ -205,8 +195,6 @@ rich==13.8.0 # twine s3transfer==0.10.2 # via boto3 -secretstorage==3.3.3 - # via keyring simplejson==3.19.3 # via # -r requirements/base.txt