python/python-testtools
SHA256
14
0
Fork 0
forked from pool/python-testtools
Code Pull Requests Activity

Accepting request 487994 from home:TheBlackCat:branches:devel:languages:python

Browse Source 
Fix python-fixtures dependency loop.

OBS-URL: https://build.opensuse.org/request/show/487994
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testtools?expand=0&rev=44
This commit is contained in:
Todd R
2017-04-14 16:46:59 +00:00
committed by Git OBS Bridge
parent 4ade965ff9
commit f52d9c8f4d
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python-testtools-doc.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 14 16:41:39 UTC 2017 - toddrme2178@gmail.com
- Use singlespec macros where possible to simplify spec file.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 8 19:29:56 UTC 2017 - toddrme2178@gmail.com Sat Apr 8 19:29:56 UTC 2017 - toddrme2178@gmail.com

14
python-testtools-doc.spec
View File

@@ -16,6 +16,7 @@
# #
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-testtools-doc Name: python-testtools-doc
Version: 2.2.0 Version: 2.2.0
Release: 0 Release: 0
@@ -24,14 +25,12 @@ License: MIT
Group: Documentation/HTML Group: Documentation/HTML
Url: https://launchpad.net/testtools Url: https://launchpad.net/testtools
Source: https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz Source: https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
BuildRequires: python-testtools = %{version} BuildRequires: python-rpm-macros
BuildRequires: python3-testtools = %{version} BuildRequires: %{python_module testtools = %{version}}
%if %{with tests} %if %{with tests}
# Test requirement # Test requirement
BuildRequires: python-testscenarios BuildRequires: %{python_module testscenarios = %{version}}
BuildRequires: python3-testscenarios BuildRequires: %{python_module unittest2 >= 0.8.0}
BuildRequires: python-unittest2 >= 0.8.0
BuildRequires: python3-unittest2 >= 0.8.0
%endif %endif
# Documentation requirements: # Documentation requirements:
BuildRequires: fdupes BuildRequires: fdupes
@@ -59,8 +58,7 @@ cp -r build/sphinx/html %{buildroot}%{_docdir}/python-testtools/
# Doing the tests in a separate package avoids this cycle. # Doing the tests in a separate package avoids this cycle.
%if %{with tests} %if %{with tests}
%check %check
python2 -m testtools.run testtools.tests.test_suite %{python_exec} -m testtools.run testtools.tests.test_suite
python3 -m testtools.run testtools.tests.test_suite
%endif %endif
%files %files

6
python-testtools.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 14 16:39:38 UTC 2017 - toddrme2178@gmail.com
- Change fixtures dependency to "Recommends". It is not a hard
dependency becauses it causes dependency loops.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 8 19:29:56 UTC 2017 - toddrme2178@gmail.com Sat Apr 8 19:29:56 UTC 2017 - toddrme2178@gmail.com

2
python-testtools.spec
View File

@@ -32,12 +32,12 @@ BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module pbr} BuildRequires: %{python_module pbr}
BuildRequires: %{python_module extras >= 1.0.0} BuildRequires: %{python_module extras >= 1.0.0}
Requires: python-extras >= 1.0.0 Requires: python-extras >= 1.0.0
Requires: python-fixtures >= 1.3.0
Requires: python-pbr >= 0.11 Requires: python-pbr >= 0.11
Requires: python-python-mimeparse Requires: python-python-mimeparse
Requires: python-six >= 1.4.0 Requires: python-six >= 1.4.0
Requires: python-traceback2 Requires: python-traceback2
Requires: python-unittest2 >= 1.0.0 Requires: python-unittest2 >= 1.0.0
Recommends: python-fixtures >= 1.3.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages