From ebecfc01bc79b37f626cb6b7ce85a9903030c29b Mon Sep 17 00:00:00 2001 From: Jeremy Bertozzi Date: Sat, 26 Oct 2019 00:19:27 +0200 Subject: [PATCH] drop fedora build, build for python3 in epel7 --- python-packaging.spec | 77 ++++--------------------------------------- 1 file changed, 6 insertions(+), 71 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 42f4b34..df526b1 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,13 +1,5 @@ %global pypi_name packaging -%if 0%{?fedora} -%global build_wheel 1 -%global with_python3 1 -%endif - -%global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl -%global python3_wheelname %python2_wheelname - Name: python-%{pypi_name} Version: 16.8 Release: 5%{?dist} @@ -18,25 +10,13 @@ URL: https://github.com/pypa/packaging Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -# Dependencies with different names in Fedora and Epel7 -%if 0%{?fedora} -BuildRequires: python2-setuptools -BuildRequires: python2-devel -BuildRequires: python2-pytest -BuildRequires: python2-pyparsing -%else BuildRequires: python-setuptools BuildRequires: python-devel BuildRequires: pytest BuildRequires: pyparsing BuildRequires: python-sphinx -%endif - BuildRequires: python-pretend BuildRequires: python-six - -# Build Python 3 subpackage only for Fedora -%if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-pytest @@ -44,16 +24,6 @@ BuildRequires: python%{python3_pkgversion}-pretend BuildRequires: python%{python3_pkgversion}-pyparsing BuildRequires: python%{python3_pkgversion}-six BuildRequires: python%{python3_pkgversion}-sphinx -%endif - -%if 0%{?build_wheel} -BuildRequires: python2-pip -BuildRequires: python-wheel -%if 0%{?with_python3} -BuildRequires: python%{python3_pkgversion}-pip -BuildRequires: python%{python3_pkgversion}-wheel -%endif -%endif %description python-packaging provides core utilities for Python packages like utilities for @@ -63,29 +33,22 @@ dealing with versions, specifiers, markers etc. Summary: %{summary} %{?python_provide:%python_provide python2-%{pypi_name}} -%if 0%{?fedora} -Requires: python2-pyparsing -%else Requires: pyparsing -%endif - Requires: python-six %description -n python2-%{pypi_name} python2-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. -%if 0%{?with_python3} %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} - Requires: python%{python3_pkgversion}-pyparsing Requires: python%{python3_pkgversion}-six + %description -n python%{python3_pkgversion}-%{pypi_name} python3-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. -%endif %package -n python-%{pypi_name}-doc Summary: python-packaging documentation @@ -98,26 +61,12 @@ Documentation for python-packaging rm -rf %{pypi_name}.egg-info %build -%if 0%{?build_wheel} -%py2_build_wheel -%else %py2_build -%endif - -%if 0%{?with_python3} -%if 0%{?build_wheel} -%py3_build_wheel -%else %py3_build -%endif -%endif # generate html docs -%if 0%{?with_python3} -sphinx-build-3 docs html -%else +sphinx-build-%{python3_version} docs html sphinx-build docs html -%endif # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} @@ -125,28 +74,12 @@ rm -rf html/.{doctrees,buildinfo} rm -rf html/_static/fonts/ %install -%if 0%{?build_wheel} -%py2_install_wheel %{python2_wheelname} -%else %py2_install -%endif - -%if 0%{?with_python3} -%if 0%{?build_wheel} -%py3_install_wheel %{python3_wheelname} -%else %py3_install -%endif -%endif %check -%if 0%{?fedora} -%{__python2} -m pytest tests/ -%{__python3} -m pytest tests/ -%else # Disable non-working tests in Epel7 %{__python2} -m pytest --ignore=tests/test_requirements.py tests/ -%endif %files -n python2-%{pypi_name} %license LICENSE LICENSE.APACHE LICENSE.BSD @@ -154,19 +87,21 @@ rm -rf html/_static/fonts/ %{python2_sitelib}/%{pypi_name}/ %{python2_sitelib}/%{pypi_name}-*-info/ -%if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{pypi_name} %license LICENSE LICENSE.APACHE LICENSE.BSD %doc README.rst CHANGELOG.rst CONTRIBUTING.rst %{python3_sitelib}/%{pypi_name}/ %{python3_sitelib}/%{pypi_name}-*-info/ -%endif %files -n python-%{pypi_name}-doc %doc html %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Fri Oct 25 2019 Jérémy Bertozzi - 16.8-6 +- drop fedora build +- python3 build in epel7 + * Wed Mar 22 2017 Lumir Balhar - 16.8-5 - Epel7 compatible spec/package