[python-rosdep/el6] Disable nose tests
rmattes
rmattes at fedoraproject.org
Sat Feb 8 23:47:57 UTC 2014
commit 89a6788511a46645452b7aad937436a8903239bf
Author: Rich Mattes <richmattes at gmail.com>
Date: Sat Feb 8 18:48:10 2014 -0500
Disable nose tests
python-rosdep.spec | 7 +++++--
rosdep-0.10.14-nose.patch | 12 ++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/python-rosdep.spec b/python-rosdep.spec
index 3e1a3e1..e0ca735 100644
--- a/python-rosdep.spec
+++ b/python-rosdep.spec
@@ -15,11 +15,14 @@ Source0: https://github.com/ros-infrastructure/%{realname}/archive/%{comm
Patch0: %{realname}-0.10.14-pythonpip.patch
# Disable catkin-sphinx for now, until it's packaged
Patch1: %{realname}-0.10.14-catkinsphinx.patch
+# Disable nose: el6 version is too old
+Patch2: %{realname}-0.10.14-nose.patch
+
BuildArch: noarch
BuildRequires: PyYAML
BuildRequires: python-devel
-BuildRequires: python-nose
+#BuildRequires: python-nose
BuildRequires: python-rospkg
BuildRequires: python-setuptools-devel
BuildRequires: python-sphinx
@@ -42,7 +45,7 @@ specify a dependency on 'boost'.
%setup -qn %{realname}-%{commit}
%patch0 -p0 -b .pythonpip
%patch1 -p0 -b .catkinsphinx
-
+%patch2 -p0 -b .nose
%build
%{__python} setup.py build
pushd doc
diff --git a/rosdep-0.10.14-nose.patch b/rosdep-0.10.14-nose.patch
new file mode 100644
index 0000000..6394056
--- /dev/null
+++ b/rosdep-0.10.14-nose.patch
@@ -0,0 +1,12 @@
+diff -up ./setup.py.nose ./setup.py
+--- ./setup.py.nose 2014-02-08 18:45:42.932991412 -0500
++++ ./setup.py 2014-02-08 18:45:49.311233682 -0500
+@@ -11,8 +11,6 @@ setup(
+ packages=['rosdep2', 'rosdep2.platforms'],
+ package_dir={'': 'src'},
+ install_requires=['catkin_pkg', 'rospkg', 'rosdistro >= 0.3.0', 'PyYAML >= 3.1'],
+- setup_requires=['nose >= 1.0'],
+- test_suite='nose.collector',
+ test_requires=['mock'],
+ scripts=['scripts/rosdep', 'scripts/rosdep-source'],
+ author="Tully Foote, Ken Conley",
More information about the scm-commits
mailing list