| |
@@ -1,18 +1,23 @@
|
| |
%global pypi_name click
|
| |
|
| |
+ # pytest in base RHEL is too old
|
| |
+ %bcond_with python2_tests
|
| |
+
|
| |
+ %bcond_without python3_tests
|
| |
+
|
| |
+ # pytest in EPEL hasn't been built for python3_other yet
|
| |
+ %bcond_with python3_other_tests
|
| |
+
|
| |
Name: python-%{pypi_name}
|
| |
Version: 6.7
|
| |
- Release: 6%{?dist}
|
| |
+ Release: 7%{?dist}
|
| |
Summary: Simple wrapper around optparse for powerful command line utilities
|
| |
|
| |
License: BSD
|
| |
URL: https://github.com/mitsuhiko/click
|
| |
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
|
| |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1500962
|
| |
- # https://github.com/pallets/click/pull/838
|
| |
- Patch0: 0001-Remove-outdated-comment-about-Click-3.0.patch
|
| |
- Patch1: 0002-Add-pytest-option-to-not-capture-warnings.patch
|
| |
- Patch2: 0003-Catch-and-test-pytest-warning.patch
|
| |
+ # https://github.com/pallets/click/commit/20b4b1c0d1564ab4ef44b7d27d5b650735e28be3
|
| |
+ Patch3: update-tests-to-work-with-newer-pytest-versions.patch
|
| |
|
| |
BuildArch: noarch
|
| |
|
| |
@@ -28,28 +33,27 @@
|
| |
Summary: %{summary}
|
| |
%{?python_provide:%python_provide python2-%{pypi_name}}
|
| |
BuildRequires: python2-devel
|
| |
- %if ! (0%{?rhel} && 0%{?rhel} <= 7)
|
| |
BuildRequires: python2-setuptools
|
| |
- # pytest in base RHEL is too old, we'll skip the tests there
|
| |
- BuildRequires: python2-pytest >= 2.8
|
| |
- %else
|
| |
- BuildRequires: python-setuptools
|
| |
- %endif
|
| |
+ %{?with_python2_tests:BuildRequires: python2-pytest >= 2.8}
|
| |
|
| |
%description -n python2-%{pypi_name} %{_description}
|
| |
|
| |
- Python 2 version.
|
| |
-
|
| |
%package -n python%{python3_pkgversion}-%{pypi_name}
|
| |
Summary: %{summary}
|
| |
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
|
| |
BuildRequires: python%{python3_pkgversion}-devel
|
| |
BuildRequires: python%{python3_pkgversion}-setuptools
|
| |
- BuildRequires: python%{python3_pkgversion}-pytest >= 2.8
|
| |
+ %{?with_python3_tests:BuildRequires: python%{python3_pkgversion}-pytest >= 2.8}
|
| |
|
| |
%description -n python%{python3_pkgversion}-%{pypi_name} %{_description}
|
| |
|
| |
- Python 3 version.
|
| |
+ %package -n python%{python3_other_pkgversion}-%{pypi_name}
|
| |
+ Summary: %{summary}
|
| |
+ BuildRequires: python%{python3_other_pkgversion}-devel
|
| |
+ BuildRequires: python%{python3_other_pkgversion}-setuptools
|
| |
+ %{?with_python3_other_tests:BuildRequires: python%{python3_other_pkgversion}-pytest >= 2.8}
|
| |
+
|
| |
+ %description -n python%{python3_other_pkgversion}-%{pypi_name} %{_description}
|
| |
|
| |
%prep
|
| |
%autosetup -n %{pypi_name}-%{version} -p1
|
| |
@@ -57,33 +61,42 @@
|
| |
%build
|
| |
%py2_build
|
| |
%py3_build
|
| |
+ %py3_other_build
|
| |
|
| |
%install
|
| |
%py2_install
|
| |
%py3_install
|
| |
+ %py3_other_install
|
| |
|
| |
%check
|
| |
- export PYTHONPATH=$(pwd)
|
| |
export LC_ALL=en_US.UTF-8
|
| |
- %if ! (0%{?rhel} && 0%{?rhel} <= 7)
|
| |
- # pytest in base RHEL is too old, we'll skip the tests there
|
| |
- py.test-%{python2_version} tests --tb=long --verbose
|
| |
- %endif
|
| |
- py.test-%{python3_version} tests --tb=long --verbose
|
| |
+ %{?with_python2_tests:PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} tests --verbose}
|
| |
+ %{?with_python3_tests:PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} tests --verbose}
|
| |
+ %{?with_python3_other_tests:PYTHONPATH=%{buildroot}%{python3_other_sitelib} py.test-%{python3_other_version} tests --verbose}
|
| |
|
| |
%files -n python2-%{pypi_name}
|
| |
%license LICENSE
|
| |
%doc README CHANGES
|
| |
- %{python2_sitelib}/%{pypi_name}-*.egg-info/
|
| |
- %{python2_sitelib}/%{pypi_name}/
|
| |
+ %{python2_sitelib}/%{pypi_name}
|
| |
+ %{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info
|
| |
|
| |
%files -n python%{python3_pkgversion}-%{pypi_name}
|
| |
%license LICENSE
|
| |
%doc README CHANGES
|
| |
- %{python3_sitelib}/%{pypi_name}-*.egg-info/
|
| |
- %{python3_sitelib}/%{pypi_name}/
|
| |
+ %{python3_sitelib}/%{pypi_name}
|
| |
+ %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
|
| |
+
|
| |
+ %files -n python%{python3_other_pkgversion}-%{pypi_name}
|
| |
+ %license LICENSE
|
| |
+ %doc README CHANGES
|
| |
+ %{python3_other_sitelib}/%{pypi_name}
|
| |
+ %{python3_other_sitelib}/%{pypi_name}-%{version}-py%{python3_other_version}.egg-info
|
| |
|
| |
%changelog
|
| |
+ * Mon Oct 08 2018 Carl George <carl@george.computer> - 6.7-7
|
| |
+ - Add python3_other subpackage
|
| |
+ - Backport upstream commit for newer pytest compatibility
|
| |
+
|
| |
* Thu Oct 12 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.7-6
|
| |
- Fixup EPEL packaging
|
| |
- Adopt to packaging guidelines
|
| |
This change will enable the python36 subpackage in EPEL7. It also cleans up test invocation and replaces some patches with a backported upstream commit.