From 21f5e446f214e6f094bb2ae66daba58bb2e45eaf Mon Sep 17 00:00:00 2001 From: Michael Harradon Date: Tue, 16 Nov 2021 02:36:09 -0500 Subject: [PATCH 1/2] Fix version bug --- setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 766cbd1a..4c6f984a 100644 --- a/setup.py +++ b/setup.py @@ -51,15 +51,15 @@ def get_version(): # - localpart gb92bef6[-dirty] desc = subprocess.check_output([ 'git', 'describe', '--dirty', '--long', '--match', 'v*', - ]) - match = re.match(b'^v([^-]*)-([0-9]+)-(.*)$', desc) + ]).decode('ascii') + match = re.match('^v([^-]*)-([0-9]+)-(.*)$', desc) assert match is not None verpart, revpart, localpart = match.groups() # Create a post version. - if revpart > b'0' or b'dirty' in localpart: + if int(revpart) > 0 or 'dirty' in localpart: # Local part may be g0123abcd or g0123abcd-dirty. # Hyphens not kosher here, so replace by dots. - localpart = localpart.replace(b'-', b'.') + localpart = localpart.replace('-', '.') full_version = '%s.post%s+%s' % (verpart, revpart, localpart) # Create a release version. else: @@ -130,6 +130,8 @@ def make_release_tree(self, base_dir, files): # doesn't pass them through when it doesn't know about them a priori. version_py = 'src/version.py' +print(pkg_version) + setup( name='cgpm', version=pkg_version, From e9531d092af900b3027896e0fcb56753ff4a2e8c Mon Sep 17 00:00:00 2001 From: Michael Harradon Date: Tue, 16 Nov 2021 12:57:48 -0500 Subject: [PATCH 2/2] Remove debug print --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 4c6f984a..dbac0384 100644 --- a/setup.py +++ b/setup.py @@ -130,8 +130,6 @@ def make_release_tree(self, base_dir, files): # doesn't pass them through when it doesn't know about them a priori. version_py = 'src/version.py' -print(pkg_version) - setup( name='cgpm', version=pkg_version,