From ff880e9e0877077c6500e5b225413bb633bc8346 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 26 Jul 2021 15:20:11 -0700 Subject: [PATCH] py: fix abi_requires() --- python/pvxslibs/version.py | 7 ++++--- setup.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/python/pvxslibs/version.py b/python/pvxslibs/version.py index d3dcf01..c6002cd 100644 --- a/python/pvxslibs/version.py +++ b/python/pvxslibs/version.py @@ -15,9 +15,10 @@ __all__ = ( version = get_distribution('pvxslibs').version # as a string -version_info = (int(x) for x in re.match(r'([\d]+)\.([\d]+)\.([\d]+)', version).groups()) +version_info = re.match(r'([\d]+)\.([\d]+)\.([\d]+)([ab]\d+)?', version).groups() -version_info = namedtuple('Version', ['major', 'minor', 'maintainance'])(*version_info) +version_info = namedtuple('Version', ['major', 'minor', 'maintainance', 'dev']) \ + (int(version_info[0]), int(version_info[1]), int(version_info[2]), version_info[3]) def abi_requires(): """Return a version requirement string which identifies @@ -28,4 +29,4 @@ def abi_requires(): """ nextminor = version_info.minor+1 - return 'pvxslibs >={0.major}.{0.minor}.{0.maintainance}, <{0.major}.{1}.0a1'.format(version_info, nextminor) + return 'pvxslibs >={0}, <{1.major}.{2}.0a1'.format(version, version_info, nextminor) diff --git a/setup.py b/setup.py index 3321e2d..0190fe7 100755 --- a/setup.py +++ b/setup.py @@ -620,7 +620,7 @@ pvxs_ver = '%(PVXS_MAJOR_VERSION)s.%(PVXS_MINOR_VERSION)s.%(PVXS_MAINTENANCE_VER setup( name='pvxslibs', - version=pvxs_ver+"a3", + version=pvxs_ver+"a4", description="PVXS libraries packaged for python", url='https://mdavidsaver.github.io/pvxs', author='Michael Davidsaver',