From 664739ab3c9a93de22306cccd0d155ab6c4d302a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 Nov 2019 23:51:45 +0100 Subject: [PATCH] Subpackage python2-py has been removed --- python-py.spec | 73 ++++---------------------------------------------- 1 file changed, 5 insertions(+), 68 deletions(-) diff --git a/python-py.spec b/python-py.spec index 8ba16c0..41f279c 100644 --- a/python-py.spec +++ b/python-py.spec @@ -9,9 +9,6 @@ %bcond_without tests %endif -%bcond_without python2 -%bcond_without python3 - %global pytest_version_lb 2.9.0 %global pytest_version_ub 2.10 @@ -19,7 +16,7 @@ Name: python-%{srcname} Version: 1.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library with cross-python path, ini-parsing, io, code, log facilities License: MIT and Public Domain # main package: MIT, except: doc/style.css: Public Domain @@ -43,34 +40,6 @@ following tools and modules: * py.path: uniform local and svn path objects -%if %{with python2} -%package -n python2-%{srcname} -Summary: Library with cross-python path, ini-parsing, io, code, log facilities -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-setuptools_scm -%if %{with tests} -BuildRequires: python2-pytest >= %{pytest_version_lb}, python2-pytest < %{pytest_version_ub} -%endif # with tests -Requires: python2-setuptools -%{?python_provide:%python_provide python2-%{srcname}} -Provides: bundled(python2-apipkg) = 1.4 -Provides: bundled(python2-iniconfig) = 1.0.0 - -%description -n python2-%{srcname} -The py lib is a Python development support library featuring the -following tools and modules: - - * py.path: uniform local and svn path objects - * py.apipkg: explicit API control and lazy-importing - * py.iniconfig: easy parsing of .ini files - * py.code: dynamic code generation and introspection - * py.path: uniform local and svn path objects - -%endif # with python2 - - -%if %{with python3} %package -n python3-%{srcname} Summary: Library with cross-python path, ini-parsing, io, code, log facilities BuildRequires: python3-devel @@ -98,8 +67,6 @@ following tools and modules: * py.code: dynamic code generation and introspection * py.path: uniform local and svn path objects -%endif # with python3 - %prep %autosetup -n %{srcname}-%{version} @@ -112,58 +79,25 @@ find . \ %build -%if %{with python2} -%py2_build -%endif # with python2 - -%if %{with python3} %py3_build %if %{with docs} make -C doc html PYTHONPATH=$(pwd) rm -rf doc/_build/html/.buildinfo %endif # with docs -%endif # with python3 %install -%if %{with python2} -%py2_install -%endif # with python2 - -%if %{with python3} %py3_install -%endif # with python3 %check %if %{with tests} # disable failing Subversion checks for now - -%if %{with python2} -PYTHONPATH=%{buildroot}%{python2_sitelib} \ -LC_ALL=C.UTF-8 \ -py.test-%{python2_version} -r s -k"-TestWCSvnCommandPath" testing -%endif # with python2 - -%if %{with python3} PYTHONPATH=%{buildroot}%{python3_sitelib} \ py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing -%endif # with python3 - %endif # with tests -%if %{with python2} -%files -n python2-%{srcname} -%doc CHANGELOG -%doc README.rst -%license LICENSE -%{python2_sitelib}/py-*.egg-info/ -%{python2_sitelib}/py/ -%endif # with python2 - - -%if %{with python3} %files -n python3-%{srcname} %doc CHANGELOG %doc README.rst @@ -173,10 +107,13 @@ py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing %endif # with_docs %{python3_sitelib}/py-*.egg-info/ %{python3_sitelib}/py/ -%endif # with python3 %changelog +* Sat Nov 23 2019 Miro Hrončok - 1.8.0-7 +- Subpackage python2-py has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Thu Oct 03 2019 Miro Hrončok - 1.8.0-6 - Rebuilt for Python 3.8.0rc1 (#1748018)