Commit 5e172bee authored by Jochen Sprickerhof's avatar Jochen Sprickerhof

New upstream version 0.15.0

parent f5018e98
0.14.0 (2018-11-06)
0.15.0 (2019-01-24)
-------------------
- Use yaml.safe_load for untrusted yaml input.
- https://github.com/ros-infrastructure/rosdep/pull/651
- Evaluate conditions before collecting dependencies.
- https://github.com/ros-infrastructure/rosdep/pull/655
- Fixes https://github.com/ros-infrastructure/rosdep/pull/653
- Filter ROS 2 distros out of ROS 1 test results.
- https://github.com/ros-infrastructure/rosdep/pull/652
0.14.0 (2019-01-14)
-------------------
- Skip EOL distros by default, add option to include them
- https://github.com/ros-infrastructure/rosdep/pull/647
......
......@@ -8,7 +8,7 @@ setup(
version=__version__, # noqa:F821
packages=['rosdep2', 'rosdep2.platforms'],
package_dir={'': 'src'},
install_requires=['catkin_pkg', 'rospkg >= 1.0.37', 'rosdistro >= 0.4.0', 'PyYAML >= 3.1'],
install_requires=['catkin_pkg >= 0.4.0', 'rospkg >= 1.0.37', 'rosdistro >= 0.7.0', 'PyYAML >= 3.1'],
test_suite='nose.collector',
test_requires=['mock', 'nose >= 1.0'],
scripts=['scripts/rosdep', 'scripts/rosdep-source'],
......
__version__ = '0.14.0'
__version__ = '0.15.0'
......@@ -55,7 +55,7 @@ class RosdepLoader:
:raises: :exc:`yaml.YAMLError`
"""
try:
return yaml.load(yaml_contents)
return yaml.safe_load(yaml_contents)
except yaml.YAMLError as e:
raise InvalidData('Invalid YAML in [%s]: %s' % (origin, e), origin=origin)
......
......@@ -34,6 +34,8 @@ filesystem.
from __future__ import print_function
import os
import catkin_pkg.package
import rospkg
......@@ -137,8 +139,9 @@ class RosPkgLoader(RosdepLoader):
if resource_name in self.get_catkin_paths():
pkg = catkin_pkg.package.parse_package(self.get_catkin_paths()[resource_name])
pkg.evaluate_conditions(os.environ)
deps = pkg.build_depends + pkg.buildtool_depends + pkg.run_depends + pkg.test_depends
return [d.name for d in deps]
return [d.name for d in deps if d.evaluated_condition]
elif resource_name in self.get_loadable_resources():
return self._rospack.get_rosdeps(resource_name, implicit=implicit)
elif resource_name in self._rosstack.list():
......
[DEFAULT]
Depends: ca-certificates, python-rospkg (>= 1.0.37), python-yaml, python-catkin-pkg, python-rosdistro (>= 0.4.0)
Depends3: ca-certificates, python3-rospkg (>= 1.0.37), python3-yaml, python3-catkin-pkg, python3-rosdistro (>= 0.4.0)
Depends: ca-certificates, python-rospkg (>= 1.0.37), python-yaml, python-catkin-pkg (>= 0.4.0), python-rosdistro (>= 0.7.0)
Depends3: ca-certificates, python3-rospkg (>= 1.0.37), python3-yaml, python3-catkin-pkg (>= 0.4.0), python3-rosdistro (>= 0.7.0)
Conflicts: python3-rosdep, python-rosdep2, python3-rosdep2
Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2
Copyright-File: LICENSE
......
......@@ -52,7 +52,9 @@ def test_url_constants():
def test_get_gbprepo_as_rosdep_data():
from rosdep2.rosdistrohelper import get_index
from rosdep2.gbpdistro_support import get_gbprepo_as_rosdep_data
distro = sorted(get_index().distributions.keys())[0]
distro = sorted(
name for name, info in get_index().distributions.items()
if info.get('distribution_type') == 'ros1')[0]
data = get_gbprepo_as_rosdep_data(distro)
for k in ['ros', 'catkin', 'genmsg']:
assert k in data, data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment