- updated to 1.8.2

- run tests

diff --git a/python-rst.linker.spec b/python-rst.linker.spec
index 181c2ed7add116ef5b141bd7954cdfed79dd47b1..acd1c1c43dc4a64914d116dd53bf4ad89f4a8b26 100644 (file)
--- a/python-rst.linker.spec
+++ b/python-rst.linker.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without doc     # documentation (uses python2, needs repository metadata)
-%bcond_with    tests   # "make test" (pytest-runner doesn't support \--build-base)
+%bcond_without tests   # py.test tests
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
@@ -11,38 +11,42 @@
 Summary:       rst.linker - Python 2 Sphinx plugin to add links to the changelog
 Summary(pl.UTF-8):     rst.linker - wtyczka Sphinksa dla Pythona 2 do dodawania odnośników do changeloga
 Name:          python-rst.linker
-Version:       1.6
-Release:       2
+Version:       1.8.2
+Release:       1
 License:       MIT
 Group:         Libraries/Python
 #Source0Download: https://pypi.python.org/simple/rst.linker/
-Source0:       https://pypi.python.org/packages/4e/d5/efb8c29b36c0f9a139208e3c7b546bebcc0bd434535773fd447dfc47ebb1/rst.linker-%{version}.tar.gz
-# Source0-md5: 1d80b37c613e4666abcbe23e55f92875
+Source0:       https://pypi.python.org/packages/95/a8/8efe7a856db37dd3ca95f434525741e90f6133b868ab57e61f410578607e/rst.linker-%{version}.tar.gz
+# Source0-md5: 783b4591bad3449d713b5b4428fb71d6
 URL:           https://bitbucket.org/jaraco/rst.linker
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.710
 %if %{with python2}
 BuildRequires: python-devel >= 1:2.7
 BuildRequires: python-modules >= 1:2.7
-BuildRequires: python-pytest >= 2.8
-BuildRequires: python-pytest-runner
 BuildRequires: python-setuptools
-BuildRequires: python-setuptools_scm >= 1.9
+BuildRequires: python-setuptools_scm >= 1.15.0
+%if %{with tests}
+BuildRequires: python-dateutil
+BuildRequires: python-path
+BuildRequires: python-pytest >= 2.8
 BuildRequires: python-six
+%endif
 %{?with_doc:BuildRequires:     sphinx-pdg}
 %endif
 %if %{with python3}
 BuildRequires: python3-devel >= 1:3.2
 BuildRequires: python3-modules >= 1:3.2
-BuildRequires: python3-pytest >= 2.8
-BuildRequires: python3-pytest-runner
 BuildRequires: python3-setuptools
-BuildRequires: python3-setuptools_scm >= 1.9
+BuildRequires: python3-setuptools_scm >= 1.15.0
+%if %{with tests}
+BuildRequires: python3-dateutil
+BuildRequires: python3-path
+BuildRequires: python3-pytest >= 2.8
 BuildRequires: python3-six
 %endif
+%endif
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.714
 Requires:      python-Sphinx
-Requires:      python-dateutil
-Requires:      python-six
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,8 +62,6 @@ Summary:      rst.linker - Python 3 Sphinx plugin to add links to the changelog
 Summary(pl.UTF-8):     rst.linker - wtyczka Sphinksa dla Pythona 3 do dodawania odnośników do changeloga
 Group:         Libraries/Python
 Requires:      python3-Sphinx
-Requires:      python3-dateutil
-Requires:      python3-six
 
 %description -n python3-rst.linker
 rst.linker is a Sphinx plugin to add links to the changelog.
@@ -84,8 +86,9 @@ Dokumentacja do modułu rst.linker.
 
 %build
 %if %{with python2}
-%{__python} setup.py \
-       build --build-base build-2 %{?with_tests:test}
+%py_build
+
+%{?with_tests:%{__python} -m pytest test_all.py}
 
 %if %{with doc}
 %{__python} setup.py build_sphinx
@@ -93,8 +96,9 @@ Dokumentacja do modułu rst.linker.
 %endif
 
 %if %{with python3}
-%{__python3} setup.py \
-       build --build-base build-3 %{?with_tests:test}
+%py3_build
+
+%{?with_tests:%{__python3} -m pytest test_all.py}
 %endif
 
 %install
@@ -116,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.rst
+%doc CHANGES.rst README.rst
 %dir %{py_sitescriptdir}/rst
 %{py_sitescriptdir}/rst/linker.py[co]
 %{py_sitescriptdir}/rst.linker-%{version}-py*.egg-info
@@ -126,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-rst.linker
 %defattr(644,root,root,755)
-%doc CHANGES.rst
+%doc CHANGES.rst README.rst
 %dir %{py3_sitescriptdir}/rst
 %{py3_sitescriptdir}/rst/linker.py
 %dir %{py3_sitescriptdir}/rst/__pycache__