Skip to content

[pull] main from django:main #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jun 25, 2026
Merged

[pull] main from django:main #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01c3cce
Replaced the defunct pgp.mit.edu keyserver with GitHub for key import.
nessita Jun 24, 2026
93a1751
Avoided breaking sha1sum verification in the generated checksum.txt f…
nessita Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions docs/internals/howto-release-django.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,13 +555,8 @@ Building the artifacts
To use this file, you will need a working install of PGP or other
compatible public-key encryption software. You will also need to have
the Django release manager's public key in your keyring. This key has
the ID ``XXXXXXXXXXXXXXXX`` and can be imported from the MIT
keyserver, for example, if using the open-source GNU Privacy Guard
implementation of PGP:

gpg --keyserver pgp.mit.edu --recv-key XXXXXXXXXXXXXXXX

or via the GitHub API:
the ID ``XXXXXXXXXXXXXXXX`` and can be imported from GitHub, for example,
if using the open-source GNU Privacy Guard implementation of PGP:

curl https://github.com/<<RELEASE MANAGER GITHUB USERNAME>>.gpg | gpg --import -

Expand Down
11 changes: 3 additions & 8 deletions scripts/do_django_release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@
To use this file, you will need a working install of PGP or other
compatible public-key encryption software. You will also need to have
the Django release manager's public key in your keyring. This key has
the ID ``{pgp_key_id}`` and can be imported from the MIT
keyserver, for example, if using the open-source GNU Privacy Guard
implementation of PGP:

gpg --keyserver pgp.mit.edu --recv-key {pgp_key_id}

or via the GitHub API:
the ID ``{pgp_key_id}`` and can be imported from GitHub, for example, if
using the open-source GNU Privacy Guard implementation of PGP:

curl {pgp_key_url} | gpg --import -

Expand Down Expand Up @@ -67,7 +62,7 @@
Git tag
=======

{commit_hash} {django_version}
The {django_version} tag points to commit {commit_hash}.
"""


Expand Down
6 changes: 5 additions & 1 deletion scripts/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ def test_release_metadata(self):
self.assertIn("ABCD1234ABCD1234", result)
self.assertIn("https://github.com/releaser.gpg", result)
self.assertIn("Django-5.2.4.checksum.txt", result)
self.assertIn("abc123def456abc123def456abc123def456abc1 5.2.4", result)
self.assertIn(
"The 5.2.4 tag points to commit "
"abc123def456abc123def456abc123def456abc1.",
result,
)

def test_artifact_checksums(self):
result = self.generate_checksum_file()
Expand Down
Loading