Skip to content

Commit

Permalink
Update version string as it's not compatible after setuptools 66+ (#1018
Browse files Browse the repository at this point in the history
)

* Use local version separator instead of relying on legacy version support.

Signed-off-by: Marco A. Gutierrez <[email protected]>

* Handle version splitting with 'local' version delimiter.

---------

Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Scott K Logan <[email protected]>
  • Loading branch information
3 people authored Nov 12, 2024
1 parent 3ced183 commit 922e838
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ros_buildfarm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# same version as in:
# - setup.py
# - stdeb.cfg
__version__ = '3.0.1-master'
__version__ = '3.0.1+master'
2 changes: 2 additions & 0 deletions ros_buildfarm/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ def get_hash(path):

def _get_version_parts():
version_parts = __version__.split('-', 1)
if len(version_parts) < 2:
version_parts = __version__.split('+', 1)
if len(version_parts) == 2:
return version_parts
return version_parts[0], None
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# same version as in:
# - ros_buildfarm/__init__.py
# - stdeb.cfg
'version': '3.0.1-master',
'version': '3.0.1+master',
'python_requires': '>=3.6',
'packages': find_packages(exclude=['test']),
'package_data': {
Expand Down

0 comments on commit 922e838

Please sign in to comment.