Skip to content

Commit

Permalink
Update minimum version of rosdistro to support rosdistro index v4. (#493
Browse files Browse the repository at this point in the history
)

For now we don't make any use of the new distribution data in index v4.
This is a minimal update to fix failures with bloom due to the version
restrictions.
  • Loading branch information
nuclearsandwich committed Nov 7, 2018
1 parent d8be9d1 commit 61ffa7b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions bloom/commands/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@

try:
import rosdistro
if parse_version(rosdistro.__version__) < parse_version('0.4.0'):
error("rosdistro version 0.4.0 or greater is required, found '{0}' from '{1}'."
if parse_version(rosdistro.__version__) < parse_version('0.7.0'):
error("rosdistro version 0.7.0 or greater is required, found '{0}' from '{1}'."
.format(rosdistro.__version__, os.path.dirname(rosdistro.__file__)),
exit=True)
except ImportError:
Expand Down Expand Up @@ -218,7 +218,7 @@ def get_index():
error("This version of bloom does not support rosdistro version "
"'{0}', please use an older version of bloom."
.format(_rosdistro_index.version), exit=True)
if _rosdistro_index.version > 3:
if _rosdistro_index.version > 4:
error("This version of bloom does not support rosdistro version "
"'{0}', please update bloom.".format(_rosdistro_index.version), exit=True)
return _rosdistro_index
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'python-dateutil',
'PyYAML',
'rosdep >= 0.10.25',
'rosdistro >= 0.4.0',
'rosdistro >= 0.7.0',
'vcstools >= 0.1.22',
]

Expand Down
4 changes: 2 additions & 2 deletions stdeb.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[DEFAULT]
Depends: python-yaml, python-empy, python-argparse, python-rosdep (>= 0.10.25), python-rosdistro (>= 0.4.0), python-vcstools (>= 0.1.22), python-setuptools, python-catkin-pkg (>= 0.4.3)
Depends3: python3-yaml, python3-empy, python3-rosdep (>= 0.10.25), python3-rosdistro (>= 0.4.0), python3-vcstools (>= 0.1.22), python3-setuptools, python3-catkin-pkg (>= 0.4.3)
Depends: python-yaml, python-empy, python-argparse, python-rosdep (>= 0.10.25), python-rosdistro (>= 0.7.0), python-vcstools (>= 0.1.22), python-setuptools, python-catkin-pkg (>= 0.4.3)
Depends3: python3-yaml, python3-empy, python3-rosdep (>= 0.10.25), python3-rosdistro (>= 0.7.0), python3-vcstools (>= 0.1.22), python3-setuptools, python3-catkin-pkg (>= 0.4.3)
Conflicts: python3-bloom
Conflicts3: python-bloom
Copyright-File: LICENSE.txt
Expand Down

0 comments on commit 61ffa7b

Please sign in to comment.