| |
@@ -1,17 +1,3 @@
|
| |
- %if 0%{?rhel}
|
| |
- %global with_python3 0
|
| |
- %else
|
| |
- %global with_python3 1
|
| |
- %endif
|
| |
-
|
| |
- %{!?_licensedir:%global license %%doc}
|
| |
-
|
| |
- %if 0%{?rhel} && 0%{?rhel} <= 6
|
| |
- %{!?__python2: %global __python2 /usr/bin/python2}
|
| |
- %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
| |
- %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
| |
- %endif
|
| |
-
|
| |
%global srcname pytest-beakerlib
|
| |
%global modulename pytest_beakerlib
|
| |
# Define tar version. TODO: remove with future releases.
|
| |
@@ -19,7 +5,7 @@
|
| |
|
| |
Name: python-%{srcname}
|
| |
Version: 0.7.1
|
| |
- Release: 6%{?dist}
|
| |
+ Release: 7%{?dist}
|
| |
Summary: A pytest plugin that reports test results to the BeakerLib framework
|
| |
|
| |
License: GPLv3+
|
| |
@@ -27,15 +13,10 @@
|
| |
Source0: https://releases.pagure.org/%{name}/%{srcname}-%{version}-%{tar_version}.tar.gz
|
| |
|
| |
BuildArch: noarch
|
| |
- BuildRequires: python2-devel
|
| |
- BuildRequires: python2-setuptools
|
| |
- BuildRequires: pytest
|
| |
|
| |
- %if 0%{?with_python3}
|
| |
BuildRequires: python3-devel
|
| |
BuildRequires: python3-setuptools
|
| |
BuildRequires: python3-pytest
|
| |
- %endif
|
| |
|
| |
# Test requirements:
|
| |
BuildRequires: beakerlib
|
| |
@@ -45,17 +26,6 @@
|
| |
an active BeakerLib session.
|
| |
|
| |
|
| |
- %package -n python2-%{srcname}
|
| |
- Summary: %{summary}
|
| |
- Requires: pytest
|
| |
- %{?python_provide:%python_provide python2-%{srcname}}
|
| |
-
|
| |
- %description -n python2-%{srcname}
|
| |
- Allows results of running a test suite under pytest to be reported to
|
| |
- an active BeakerLib session.
|
| |
-
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
%package -n python3-%{srcname}
|
| |
Summary: %{summary}
|
| |
Requires: python3-pytest
|
| |
@@ -64,7 +34,6 @@
|
| |
%description -n python3-%{srcname}
|
| |
Allows results of running a test suite under pytest to be reported to
|
| |
an active BeakerLib session.
|
| |
- %endif
|
| |
|
| |
|
| |
%prep
|
| |
@@ -75,17 +44,10 @@
|
| |
|
| |
|
| |
%build
|
| |
- %{__python2} setup.py build
|
| |
- %if 0%{?with_python3}
|
| |
%py3_build
|
| |
- %endif
|
| |
-
|
| |
|
| |
%install
|
| |
- %{__python2} setup.py install --skip-build --root %{buildroot}
|
| |
- %if 0%{?with_python3}
|
| |
%py3_install
|
| |
- %endif
|
| |
|
| |
|
| |
%check
|
| |
@@ -93,21 +55,9 @@
|
| |
rlJournalStart
|
| |
# There are failures in smoketest output as both success
|
| |
# and failure tests are being run with beakerlib plugin enabled.
|
| |
- PYTHON=%{__python2} bash smoketest.sh
|
| |
- %if 0%{?with_python3}
|
| |
PYTHON=%{__python3} bash smoketest.sh
|
| |
- %endif
|
| |
|
| |
|
| |
- %files -n python2-%{srcname}
|
| |
- %license COPYING
|
| |
- %doc README.rst
|
| |
- %doc test_demo.py
|
| |
- %doc smoketest.sh
|
| |
- %{python2_sitelib}/%{modulename}-%{version}-py2.?.egg-info
|
| |
- %{python2_sitelib}/%{modulename}.py*
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
%files -n python3-%{srcname}
|
| |
%license COPYING
|
| |
%doc README.rst
|
| |
@@ -116,10 +66,12 @@
|
| |
%{python3_sitelib}/%{modulename}-%{version}-py%{python3_version}.egg-info
|
| |
%{python3_sitelib}/%{modulename}.py
|
| |
%{python3_sitelib}/__pycache__/%{modulename}.cpython-3*.py*
|
| |
- %endif
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Thu Nov 08 2018 Petr Viktorin <pviktori@redhat.com> - 0.7.1-7
|
| |
+ - Remove the Python 2 subpackage
|
| |
+
|
| |
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-6
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
| |
|
| |