From 750fde593f29822ed749dcb4ed6f3508ee175468 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 16 Dec 2024 08:33:10 -0500 Subject: [PATCH 1/6] Test with 3.12 and no longer with 3.8 --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 45783b0..5df96bd 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 From f8a45356cbd22ad465069ec72ca71a0310aefd99 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 16 Dec 2024 08:35:20 -0500 Subject: [PATCH 2/6] fix formatting in changelog --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 659d7e9..4fa5b8e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,12 @@ 0.1.10 +~~~~~~ - Support for Django 3.2 `pull#51 ` Thanks @UsamaSadiq 0.1.9 +~~~~~ - Fix potential problem with default cache key generation (sort order, possible identical key, quoting of paramters with ``=`` sign in string) From 8c0432505fee9a4e4e9071e6880a78b52b64c4df Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 16 Dec 2024 08:36:27 -0500 Subject: [PATCH 3/6] v5 --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 5df96bd..578c13c 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From f54b0f71978207589b97cf7a78798e44509b9d92 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 16 Dec 2024 08:39:11 -0500 Subject: [PATCH 4/6] tox --- CHANGELOG.rst | 6 ++++++ tox.ini | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4fa5b8e..737cc1d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,9 @@ +0.1.11 +~~~~~~ + +- Include 3.12 in tests and omit 3.8 + `pull#69 ` + 0.1.10 ~~~~~~ diff --git a/tox.ini b/tox.ini index 9fcd94e..6c8f17e 100644 --- a/tox.ini +++ b/tox.ini @@ -3,17 +3,17 @@ envlist = lint-py311, readme-py311, docs-py311, - py38-django{32,41,42}, py39-django{32,41,42}, py310-django{32,41,42}, py311-django{41,42}, + py312-django{41,42}, [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 - 3.11: py311, lint, restlint + 3.11: py311 + 3.12: py312, lint, restlint [testenv] usedevelop = true @@ -28,13 +28,13 @@ deps = commands = pytest {posargs:tests} -[testenv:docs-py311] +[testenv:docs-py312] deps = sphinx commands = docs: sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html -[testenv:readme-py311] +[testenv:readme-py312] deps = twine readme_renderer[md] @@ -42,6 +42,6 @@ commands = python setup.py sdist twine check dist/* -[testenv:lint-py311] +[testenv:lint-py312] extras = dev commands=therapist run --use-tracked-files From b8cc5f5a579ca048053f970472504984c7f0b4de Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 16 Dec 2024 08:39:46 -0500 Subject: [PATCH 5/6] tox --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 6c8f17e..b8124c3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - lint-py311, - readme-py311, - docs-py311, + lint-py312, + readme-py312, + docs-py312, py39-django{32,41,42}, py310-django{32,41,42}, py311-django{41,42}, From e61e57bfa25f436740fe127df11dc9c6a1c7ad84 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 16 Dec 2024 08:45:10 -0500 Subject: [PATCH 6/6] use 3.11 for therapist --- .github/workflows/python.yml | 10 +++++++++- tox.ini | 16 ++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 578c13c..54e062b 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -3,7 +3,15 @@ name: Python -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + +# Drop permissions to minimum for security +permissions: + contents: read jobs: build: diff --git a/tox.ini b/tox.ini index b8124c3..7161aaf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - lint-py312, - readme-py312, - docs-py312, + lint-py311, + readme-py311, + docs-py311, py39-django{32,41,42}, py310-django{32,41,42}, py311-django{41,42}, @@ -12,8 +12,8 @@ envlist = python = 3.9: py39 3.10: py310 - 3.11: py311 - 3.12: py312, lint, restlint + 3.11: py311, lint, restlint + 3.12: py312 [testenv] usedevelop = true @@ -28,13 +28,13 @@ deps = commands = pytest {posargs:tests} -[testenv:docs-py312] +[testenv:docs-py311] deps = sphinx commands = docs: sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html -[testenv:readme-py312] +[testenv:readme-py311] deps = twine readme_renderer[md] @@ -42,6 +42,6 @@ commands = python setup.py sdist twine check dist/* -[testenv:lint-py312] +[testenv:lint-py311] extras = dev commands=therapist run --use-tracked-files