From 0d2cd5749248f8ea7854335c3a8334be5d672596 Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Mon, 7 Oct 2024 22:53:35 +0100 Subject: [PATCH 1/4] Python package upgrades --- requirements/local.txt | 6 +++--- requirements/testing.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/local.txt b/requirements/local.txt index cd771b0..bc1c6a0 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -2,7 +2,7 @@ bump2version==1.0.1 Django>=4.2,<5.0 -psycopg==3.2.1 -tox==4.18.1 -tox-uv==1.11.3 +psycopg==3.2.3 +tox==4.21.2 +tox-uv==1.13.0 twine==5.1.1 diff --git a/requirements/testing.txt b/requirements/testing.txt index 91e7702..49ddee3 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,3 +1,3 @@ coverage==7.6.1 -pipdeptree==2.23.3 -ruff==0.6.5 +pipdeptree==2.23.4 +ruff==0.6.9 From a823eaa56ad720eacded910725bac04ef6efad50 Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Mon, 7 Oct 2024 22:52:47 +0100 Subject: [PATCH 2/4] Drop Python 3.8 support --- pyproject.toml | 2 +- setup.py | 3 +-- tox.ini | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 912329c..9063b8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.ruff] line-length = 99 -target-version = 'py38' +target-version = 'py39' [tool.ruff.lint] select = [ diff --git a/setup.py b/setup.py index bcd38ef..19b6de0 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def read(filename): platforms=["any"], packages=find_packages(exclude=["tests"]), include_package_data=True, - python_requires=">=3.8", + python_requires=">=3.9", install_requires=["Django>=2.2"], classifiers=[ "Intended Audience :: Developers", @@ -29,7 +29,6 @@ def read(filename): "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/tox.ini b/tox.ini index 8067fb7..f5a339b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ envlist = check lint - py{38,39}-django2.2 - py{38,39,310}-django3.2 - py{38,39,310,311,312}-django4.2 + py39-django2.2 + py{39,310}-django3.2 + py{39,310,311,312}-django4.2 coverage no_package = true From 111a44dedfdffa3eb2b00ebd99636b93fda5e53c Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Mon, 7 Oct 2024 22:53:26 +0100 Subject: [PATCH 3/4] Support Python 3.13 --- .github/workflows/ci.yml | 2 +- setup.py | 1 + tox.ini | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c43dfe9..c771685 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' cache-dependency-path: 'requirements/*.txt' - name: Run tox diff --git a/setup.py b/setup.py index 19b6de0..b5020b4 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ def read(filename): "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Framework :: Django", "Framework :: Django :: 2.2", "Framework :: Django :: 3.2", diff --git a/tox.ini b/tox.ini index f5a339b..1893cd8 100644 --- a/tox.ini +++ b/tox.ini @@ -22,13 +22,13 @@ commands = make test package = editable [testenv:check] -basepython = python3.12 +basepython = python3.13 commands = make check [testenv:lint] -basepython = python3.12 +basepython = python3.13 commands = make lint [testenv:coverage] -basepython = python3.12 +basepython = python3.13 commands = make coverage-report From 1b22b2e86fa7bd939005e9b67d29a19e882f802e Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Mon, 7 Oct 2024 22:58:58 +0100 Subject: [PATCH 4/4] Postgres 17 for CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c771685..7b960ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: tox -e ${{ matrix.tox_env }} services: postgres: - image: postgres:16-alpine + image: postgres:17-alpine env: POSTGRES_PASSWORD: password ports: