From faf1be88a75b15c299bafb91abdc0aaab762c6f6 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Jan 2021 12:16:50 -0800 Subject: [PATCH 1/5] Release from 'main', not 'master' (#391) --- noxfile.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/noxfile.py b/noxfile.py index 732abb6bd..af88400a5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -144,17 +144,17 @@ def release(session): diff = "\n".join(diff_generator) session.error(f"Got the wrong files:\n{diff}") - # Get back out into master. - session.run("git", "checkout", "-q", "master", external=True) + # Get back out into main. + session.run("git", "checkout", "-q", "main", external=True) # Check and upload distribution files. session.run("twine", "check", *files) # Push the commits and tag. # NOTE: The following fails if pushing to the branch is not allowed. This can - # happen on GitHub, if the master branch is protected, there are required + # happen on GitHub, if the main branch is protected, there are required # CI checks and "Include administrators" is enabled on the protection. - session.run("git", "push", "upstream", "master", release_version, external=True) + session.run("git", "push", "upstream", "main", release_version, external=True) # Upload the distribution. session.run("twine", "upload", *files) @@ -210,14 +210,14 @@ def _check_git_state(session, version_tag): ) if result.stdout.rstrip() not in allowed_upstreams: session.error(f"git remote `upstream` is not one of {allowed_upstreams}") - # Ensure we're on master branch for cutting a release. + # Ensure we're on main branch for cutting a release. result = subprocess.run( ["git", "rev-parse", "--abbrev-ref", "HEAD"], capture_output=True, encoding="utf-8", ) - if result.stdout != "master\n": - session.error(f"Not on master branch: {result.stdout!r}") + if result.stdout != "main\n": + session.error(f"Not on main branch: {result.stdout!r}") # Ensure there are no uncommitted changes. result = subprocess.run( From 53fd698b1620aca027324001bf53c8ffda0c17d1 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Jan 2021 12:22:39 -0800 Subject: [PATCH 2/5] Bump for release --- CHANGELOG.rst | 4 ++-- packaging/__about__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b9969fe6f..f368c458c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,8 +1,8 @@ Changelog --------- -*unreleased* -~~~~~~~~~~~~ +20.9 - 2021-01-29 +~~~~~~~~~~~~~~~~~ * Run [isort](https://pypi.org/project/isort/) over the code base (:issue:`377`) * Add support for the ``macosx_10_*_universal2`` platform tags (:issue:`379`) diff --git a/packaging/__about__.py b/packaging/__about__.py index db7fe5876..4c43a968c 100644 --- a/packaging/__about__.py +++ b/packaging/__about__.py @@ -18,7 +18,7 @@ __summary__ = "Core utilities for Python packages" __uri__ = "https://github.com/pypa/packaging" -__version__ = "20.9.dev0" +__version__ = "20.9" __author__ = "Donald Stufft and individual contributors" __email__ = "donald@stufft.io" From 47ce6287d042672032c32a43575f74c5c169dc6a Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Jan 2021 12:22:49 -0800 Subject: [PATCH 3/5] Bump for development --- CHANGELOG.rst | 5 +++++ packaging/__about__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f368c458c..bbf53cf64 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog --------- +*unreleased* +~~~~~~~~~~~~ + +No unreleased changes. + 20.9 - 2021-01-29 ~~~~~~~~~~~~~~~~~ diff --git a/packaging/__about__.py b/packaging/__about__.py index 4c43a968c..b43f363ab 100644 --- a/packaging/__about__.py +++ b/packaging/__about__.py @@ -18,7 +18,7 @@ __summary__ = "Core utilities for Python packages" __uri__ = "https://github.com/pypa/packaging" -__version__ = "20.9" +__version__ = "20.10.dev0" __author__ = "Donald Stufft and individual contributors" __email__ = "donald@stufft.io" From 0cfe695f0fd3b44278ec692ee3ba52de9ae6690d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 30 Jan 2021 15:35:40 +0100 Subject: [PATCH 4/5] Fix RST syntax in the changelog (#394) --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bbf53cf64..d2861677c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,7 @@ No unreleased changes. 20.9 - 2021-01-29 ~~~~~~~~~~~~~~~~~ -* Run [isort](https://pypi.org/project/isort/) over the code base (:issue:`377`) +* Run `isort `_ over the code base (:issue:`377`) * Add support for the ``macosx_10_*_universal2`` platform tags (:issue:`379`) * Introduce ``packaging.utils.parse_wheel_filename()`` and ``parse_sdist_filename()`` (:issue:`387` and :issue:`389`) From c8a2f0b234251518319bff900bba4d6a8a7690a1 Mon Sep 17 00:00:00 2001 From: Anders Astrom Date: Tue, 2 Feb 2021 02:15:29 +0100 Subject: [PATCH 5/5] Fix type hints for Version.post and Version.dev (#393) --- packaging/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/version.py b/packaging/version.py index 517d91f24..e3cfb6f92 100644 --- a/packaging/version.py +++ b/packaging/version.py @@ -372,12 +372,12 @@ def pre(self): @property def post(self): - # type: () -> Optional[Tuple[str, int]] + # type: () -> Optional[int] return self._version.post[1] if self._version.post else None @property def dev(self): - # type: () -> Optional[Tuple[str, int]] + # type: () -> Optional[int] return self._version.dev[1] if self._version.dev else None @property