[spec2scl/el6: 2/2] Disable tests on el6 (no pytest).
Bohuslav Kabrda
bkabrda at fedoraproject.org
Fri Sep 21 13:34:31 UTC 2012
commit 600114d2595497d3a8f6ebb34cfccdcb19294673
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Fri Sep 21 15:31:45 2012 +0200
Disable tests on el6 (no pytest).
spec2scl-remove-setup-requires-on-el-6.patch | 12 ++++++++++++
spec2scl.spec | 15 ++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/spec2scl-remove-setup-requires-on-el-6.patch b/spec2scl-remove-setup-requires-on-el-6.patch
new file mode 100644
index 0000000..e01d215
--- /dev/null
+++ b/spec2scl-remove-setup-requires-on-el-6.patch
@@ -0,0 +1,12 @@
+--- setup.py.orig 2012-09-21 15:13:57.779724249 +0200
++++ setup.py 2012-09-21 15:14:08.725717066 +0200
+@@ -28,9 +28,6 @@
+ url = 'https://bitbucket.org/bkabrda/spec2scl/',
+ license = 'MIT',
+ packages = find_packages(),
+- setup_requires = ['pytest',
+- 'flexmock >= 0.9.3'
+- ] + install_requires,
+ install_requires = install_requires,
+ entry_points={'console_scripts':['spec2scl = spec2scl.bin:main']},
+ classifiers = ['Development Status :: 4 - Beta',
diff --git a/spec2scl.spec b/spec2scl.spec
index ae6885f..6577b0c 100644
--- a/spec2scl.spec
+++ b/spec2scl.spec
@@ -3,23 +3,19 @@
Name: %{pypi_name}
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Convert RPM specfiles to be SCL ready
License: MIT
URL: https://bitbucket.org/bkabrda/spec2scl/
Source0: http://pypi.python.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Patch0: spec2scl-remove-setup-requires-on-el-6.patch
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: python-setuptools
-BuildRequires: python-flexmock
-BuildRequires: pytest
-%if 0%{?rhel}
-BuildRequires: python-argparse
Requires: python-argparse
-%endif
%description
spec2scl is a tool to convert RPM specfiles to SCL-style specfiles.
@@ -29,6 +25,7 @@ spec2scl is a tool to convert RPM specfiles to SCL-style specfiles.
%setup -q -n %{pypi_name}-%{version}
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
+%patch0 -p0
%build
%{__python} setup.py build
@@ -36,9 +33,6 @@ rm -rf %{pypi_name}.egg-info
%install
%{__python} setup.py install --skip-build --root %{buildroot}
-%check
-py.test-%{python_version} tests
-
%files
%doc README.rst LICENSE
# tests are wrongly installed, this has been fixed upstream and will be removed in next version
@@ -48,5 +42,8 @@ py.test-%{python_version} tests
%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
%changelog
+* Fri Sep 21 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.3.1-2
+- Disable tests on el6 (no pytest).
+
* Tue Sep 18 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.3.1-1
- Initial package.
More information about the scm-commits
mailing list