From 4a756487743cad10a0fd7d2a816c3c27304ea7d4 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Mon, 28 Apr 2025 13:10:56 +0100 Subject: [PATCH 1/3] packaging: Fix InvalidVersion in release versions fixes #1263 --- docs/changelog.rst | 1 + setup.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 904c4dd7..ecc037db 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -27,6 +27,7 @@ In progress (unreleased) * :gh:issue:`1118` CI: Don't copy SSH private key to temporary dir * :gh:issue:`1118` CI: Don't share temporary directory between test groupings * :gh:issue:`1256` CI: Upgrade Github jobs from Ubuntu 20.04 to 22.04 & 24.04 +* :gh:issue:`1263` packaging: Fix InvalidVersion in release versions v0.3.22 (2025-02-04) diff --git a/setup.py b/setup.py index 375a96ff..1639d383 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,8 @@ def grep_version(): match = version_pattern.search(fp.read()) if match is None: raise ValueError('Could not find __version__ string in %s', path) - return '.'.join(str(part) for part in match.groups()) + # E.g. '0.1.2', '0.1.3dev' + return '.'.join(str(part) for part in match.groups() if part) def long_description(): From 8e25944c9486d854d749b727deb0ca2ef21a9e46 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Mon, 28 Apr 2025 11:13:31 +0100 Subject: [PATCH 2/3] Prepare v0.3.23 --- docs/changelog.rst | 4 ++-- mitogen/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index ecc037db..acf64e53 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,8 +18,8 @@ To avail of fixes in an unreleased version, please download a ZIP file `directly from GitHub `_. -In progress (unreleased) ------------------------- +v0.3.23 (2025-04-28) +-------------------- * :gh:issue:`1121` :mod:`mitogen`: Log skipped :py:mod:`termios` attributes * :gh:issue:`1238` packaging: Avoid :py:mod:`ast`, requires Python = 2.6 diff --git a/mitogen/__init__.py b/mitogen/__init__.py index 125ab052..88994957 100644 --- a/mitogen/__init__.py +++ b/mitogen/__init__.py @@ -35,7 +35,7 @@ be expected. On the slave, it is built dynamically during startup. #: Library version as a tuple. -__version__ = (0, 3, 23, 'dev') +__version__ = (0, 3, 23) #: This is :data:`False` in slave contexts. Previously it was used to prevent From c146682e2e58fd34d9e344a784c025e8fd09be20 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Mon, 28 Apr 2025 11:14:48 +0100 Subject: [PATCH 3/3] Begin 0.3.24dev --- docs/changelog.rst | 5 +++++ mitogen/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index acf64e53..1ae61118 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,6 +18,11 @@ To avail of fixes in an unreleased version, please download a ZIP file `directly from GitHub `_. +In progress (unreleased) +------------------------ + + + v0.3.23 (2025-04-28) -------------------- diff --git a/mitogen/__init__.py b/mitogen/__init__.py index 88994957..87e7572a 100644 --- a/mitogen/__init__.py +++ b/mitogen/__init__.py @@ -35,7 +35,7 @@ be expected. On the slave, it is built dynamically during startup. #: Library version as a tuple. -__version__ = (0, 3, 23) +__version__ = (0, 3, 24, 'dev') #: This is :data:`False` in slave contexts. Previously it was used to prevent