From 9d5fbba711da44e01fe0faf637f6a8034090e4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= Date: Wed, 15 Nov 2023 12:12:08 +0100 Subject: [PATCH 1/5] Add support for Django 5.0 --- .github/workflows/test.yml | 7 +++++++ pyproject.toml | 1 + tox.ini | 2 ++ 3 files changed, 10 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 04d90048..29a6e073 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,13 @@ jobs: tox-environment: django32 - python-version: '3.10' tox-environment: django32 + # Django 5.0 + - python-version: '3.10' + tox-environment: django50 + - python-version: '3.11' + tox-environment: django50 + - python-version: '3.12' + tox-environment: django50 # Django main - python-version: '3.10' tox-environment: djangomain diff --git a/pyproject.toml b/pyproject.toml index 9a6ffd43..c4ed792d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,7 @@ classifiers = [ "Framework :: Django :: 3.2", "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", diff --git a/tox.ini b/tox.ini index 50406922..4ce04ace 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ envlist = django32 django41 django42 + django50 djangomain isolated_build = true @@ -16,6 +17,7 @@ deps = django32: Django>=3.2,<4.0 django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 + django50: Django>=5.0b1,<5.1 djangomain: https://github.com/django/django/archive/main.tar.gz [testenv:black] From 7a865439c4748f760f63b2a70fd771d2133ecf95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 17:27:36 +0000 Subject: [PATCH 2/5] Bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index cbdc232c..bb58e5bc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 - name: Install dependencies run: python -m pip install tox diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2f782873..10ad872e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 - name: Install dependencies run: python -m pip install tox diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 750a694b..68f35da8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.x" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 29a6e073..61d5ec8a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: - 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 }} From d7338042513f0a5fbe621f26f80a7a1637eb1b12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:33:37 +0000 Subject: [PATCH 3/5] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68f35da8..47bbd102 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: run: twine check --strict dist/* - name: Upload package to GitHub - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist path: dist/ From 983ffa198f283c19de9363eceee4927b6ec3b712 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:33:41 +0000 Subject: [PATCH 4/5] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47bbd102..f18e3725 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: id-token: write steps: - name: Retrieve artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: dist path: dist/ From 7c23a2e18deda3282d47b5604a35e9c9a074e837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= Date: Sun, 17 Mar 2024 12:26:49 +0100 Subject: [PATCH 5/5] Drop Django 4.1 and mark support for Django 5.0 --- .github/workflows/test.yml | 4 +--- pyproject.toml | 1 - tox.ini | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61d5ec8a..7917c9ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,14 +14,12 @@ jobs: matrix: # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django python-version: - - 3.8 - - 3.9 - '3.10' - '3.11' - '3.12' tox-environment: - - django41 - django42 + - django50 include: # Django 3.2 - python-version: 3.8 diff --git a/pyproject.toml b/pyproject.toml index c4ed792d..b2db850a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,6 @@ classifiers = [ "Environment :: Web Environment", "Framework :: Django", "Framework :: Django :: 3.2", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", "Intended Audience :: Developers", diff --git a/tox.ini b/tox.ini index 4ce04ace..5a191e25 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ envlist = isort docs django32 - django41 django42 django50 djangomain @@ -15,9 +14,8 @@ isolated_build = true commands = {envpython} -Wa -b -m django test --settings tests.settings deps = django32: Django>=3.2,<4.0 - django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 - django50: Django>=5.0b1,<5.1 + django50: Django>=5.0,<5.1 djangomain: https://github.com/django/django/archive/main.tar.gz [testenv:black]