From f0c61d4374a95da1095703f9d8298c0031be2690 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 13 Jan 2025 19:33:28 -0600 Subject: [PATCH 1/6] Update release workflows to latest trusted publisher GHA. --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8cf7e9443..c306ef95f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: name: python-package-distributions path: dist/ - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@release/v1.10 + uses: pypa/gh-action-pypi-publish@release/v1.12.3 github-release: name: >- @@ -114,7 +114,7 @@ jobs: name: python-package-distributions path: dist/ - name: Publish distribution 📦 to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1.10 + uses: pypa/gh-action-pypi-publish@release/v1.12.3 with: repository-url: https://test.pypi.org/legacy/ skip-existing: true From 43d56b8c859ee4538e64c92776a51f2a5b20dae5 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 13 Jan 2025 19:46:40 -0600 Subject: [PATCH 2/6] Support pushing to test pypi on every push. This tests the build and deployment process much more often. --- .github/workflows/release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c306ef95f..05ec49f35 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,11 @@ name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI -on: push +on: + push: + # For the main branch only. + branches: + - main + workflow_dispatch: env: PYPI_URL: https://pypi.org/p/django-debug-toolbar @@ -95,7 +100,7 @@ jobs: publish-to-testpypi: name: Publish Python 🐍 distribution 📦 to TestPyPI - if: startsWith(github.ref, 'refs/tags/') # only publish to TestPyPI on tag pushes + # Always publish to TestPyPI on every push to main. needs: - build runs-on: ubuntu-latest From 5620e0e94c26dcca691f7a369779c89b14066751 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 13 Jan 2025 19:48:20 -0600 Subject: [PATCH 3/6] Correct the trusted publisher release GHA version. --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 05ec49f35..b470d7a92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: name: python-package-distributions path: dist/ - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@release/v1.12.3 + uses: pypa/gh-action-pypi-publish@release/v1.12 github-release: name: >- @@ -119,7 +119,7 @@ jobs: name: python-package-distributions path: dist/ - name: Publish distribution 📦 to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1.12.3 + uses: pypa/gh-action-pypi-publish@release/v1.12 with: repository-url: https://test.pypi.org/legacy/ skip-existing: true From 8d365cdeb041c8f74609337623a9bf430466fb74 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 13 Jan 2025 19:56:43 -0600 Subject: [PATCH 4/6] Remove unnecessary trigger for releasing new versions. --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b470d7a92..822040674 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,6 @@ on: # For the main branch only. branches: - main - workflow_dispatch: env: PYPI_URL: https://pypi.org/p/django-debug-toolbar From b6ae021080a53f5d08d8671fbb909527e6140152 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 13 Jan 2025 19:58:54 -0600 Subject: [PATCH 5/6] Version 5.0.1 --- README.rst | 2 +- debug_toolbar/__init__.py | 2 +- docs/changes.rst | 3 +++ docs/conf.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 369220452..99b127526 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ Here's a screenshot of the toolbar in action: In addition to the built-in panels, a number of third-party panels are contributed by the community. -The current stable version of the Debug Toolbar is 5.0.0. It works on +The current stable version of the Debug Toolbar is 5.0.1. It works on Django ≥ 4.2.0. The Debug Toolbar has experimental support for `Django's asynchronous views diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py index 470292dd6..2180a5880 100644 --- a/debug_toolbar/__init__.py +++ b/debug_toolbar/__init__.py @@ -4,7 +4,7 @@ # Do not use pkg_resources to find the version but set it here directly! # see issue #1446 -VERSION = "5.0.0" +VERSION = "5.0.1" # Code that discovers files or modules in INSTALLED_APPS imports this module. urls = "debug_toolbar.urls", APP_NAME diff --git a/docs/changes.rst b/docs/changes.rst index 5e548c299..bb5554fb8 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,9 @@ Change log Pending ------- +5.0.1 (2025-01-13) +------------------ +* Fixing the build and release process. No functional changes. 5.0.0 (2025-01-11) ------------------ diff --git a/docs/conf.py b/docs/conf.py index bd5270db9..c8a6a5cea 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,7 +25,7 @@ copyright = copyright.format(datetime.date.today().year) # The full version, including alpha/beta/rc tags -release = "5.0.0" +release = "5.0.1" # -- General configuration --------------------------------------------------- From 345b760f75cf8a23f34eddf00adfa88688b4af00 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 13 Jan 2025 20:31:15 -0600 Subject: [PATCH 6/6] Reverting back to tags GHA trigger. I forgot that limiting to pushes on the main branch would exclude pushes to tags. --- .github/workflows/release.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 822040674..97c00d947 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,6 @@ name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI -on: - push: - # For the main branch only. - branches: - - main +on: push env: PYPI_URL: https://pypi.org/p/django-debug-toolbar @@ -99,7 +95,7 @@ jobs: publish-to-testpypi: name: Publish Python 🐍 distribution 📦 to TestPyPI - # Always publish to TestPyPI on every push to main. + if: startsWith(github.ref, 'refs/tags/') # only publish to Test PyPI on tag pushes needs: - build runs-on: ubuntu-latest