commit 52634668a2d13a806ebf15c478addfb62c334383
Author: Jakub Bogusz <[email protected]>
Date: Wed Dec 25 09:18:16 2013 +0100
- reverted test patch; buffer and catch parameters are available when
testtools are installed before
python-extras-test.patch | 13 -------------
python-extras.spec | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
---
diff --git a/python-extras.spec b/python-extras.spec
index 6d6d403..873749f 100644
--- a/python-extras.spec
+++ b/python-extras.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without tests # do not perform "make test"
+%bcond_without tests # do not perform "make test" (use for extras/testtools
pair bootstrap)
%bcond_without python2 # CPython 2.x module
%bcond_without python3 # CPython 3.x module
@@ -13,13 +13,10 @@ License: MIT
Group: Libraries/Python
Source0:
https://pypi.python.org/packages/source/e/extras/extras-%{version}.tar.gz
# Source0-md5: 62d8ba049e3386a6df69b413ea81517b
-Patch0: %{name}-test.patch
URL: https://github.com/testing-cabal/extras
BuildRequires: python-distribute
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
-# when python3 present
-#BuildRequires: sed >= 4.0
%if %{with python3}
BuildRequires: python3-distribute
%endif
@@ -63,7 +60,6 @@ później wydzielony do ogólnego użytku, nie tylko w kontekście
testów.
%prep
%setup -q -n extras-%{version}
-%patch0 -p1
%build
%if %{with python2}
diff --git a/python-extras-test.patch b/python-extras-test.patch
deleted file mode 100644
index 7229233..0000000
--- a/python-extras-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Avoid:
-error: error in setup.cfg: command 'test' has no such option 'buffer'
-error: error in setup.cfg: command 'test' has no such option 'catch'
---- extras-0.0.3/setup.cfg.orig 2013-01-21 19:26:30.000000000 +0100
-+++ extras-0.0.3/setup.cfg 2013-12-24 10:28:33.949039541 +0100
-@@ -1,7 +1,5 @@
- [test]
- test_module = extras.tests
--buffer = 1
--catch = 1
-
- [egg_info]
- tag_build =
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-extras.git/commitdiff/52634668a2d13a806ebf15c478addfb62c334383
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
