From 54f47c085b3b91b030536341469380415a75a364 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Tue, 7 Feb 2017 08:54:56 +0200 Subject: [PATCH] python-rosdep: remove pre-build dependency on nose Signed-off-by: Dmitry Rozhkov --- ...dependency-on-nose-from-setup.py-491.patch | 37 +++++++++++++++++++ .../python/python-rosdep_0.11.5.bb | 6 +-- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch diff --git a/recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch b/recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch new file mode 100644 index 0000000..17a1d70 --- /dev/null +++ b/recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch @@ -0,0 +1,37 @@ +From aae6b852e318015f46b2d49134594e14ca9d1321 Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov +Date: Wed, 21 Dec 2016 23:03:53 +0200 +Subject: [PATCH] Remove build dependency on nose from setup.py (#491) + +Having nose required to run setup.py is needed only to enable +the `nosetests` command which is redundant since it duplicates +the `test` command. Also it prevents building python-rosdep +in build environments where external downloads during build time +are prohibited in order to provide reproducible and more reliable +builds. + +Upstream-Status: Accepted [https://github.com/ros-infrastructure/rosdep/pull/491] + +Signed-off-by: Dmitry Rozhkov +--- + setup.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 0f6950c..a2146cf 100644 +--- a/setup.py ++++ b/setup.py +@@ -9,9 +9,8 @@ setup( + packages=['rosdep2', 'rosdep2.platforms'], + package_dir={'': 'src'}, + install_requires=['catkin_pkg', 'rospkg >= 1.0.37', 'rosdistro >= 0.4.0', 'PyYAML >= 3.1'], +- setup_requires=['nose >= 1.0'], + test_suite='nose.collector', +- test_requires=['mock'], ++ test_requires=['mock', 'nose >= 1.0'], + scripts=['scripts/rosdep', 'scripts/rosdep-source'], + author="Tully Foote, Ken Conley", + author_email="tfoote@osrfoundation.org", +-- +2.7.4 + diff --git a/recipes-devtools/python/python-rosdep_0.11.5.bb b/recipes-devtools/python/python-rosdep_0.11.5.bb index adf7ae0..b8fe94a 100644 --- a/recipes-devtools/python/python-rosdep_0.11.5.bb +++ b/recipes-devtools/python/python-rosdep_0.11.5.bb @@ -4,9 +4,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRCNAME = "rosdep" -DEPENDS = "python-nose" - -SRC_URI = "http://download.ros.org/downloads/rosdep/rosdep-${PV}.tar.gz" +SRC_URI = "http://download.ros.org/downloads/rosdep/rosdep-${PV}.tar.gz \ + file://0001-Remove-build-dependency-on-nose-from-setup.py-491.patch \ + " SRC_URI[md5sum] = "2c5669bc5cafcb1df8cd21ce14844cc4" SRC_URI[sha256sum] = "46e072074270a1ea25411829814f4bdc1f34b358c950e9b8a7b75b4a40efd96a"