From 3014377f1895884c17cef3197c1b89a580ca7589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 30 Apr 2018 12:13:38 +0200 Subject: [PATCH] Remove the python2 version once again - everybody just uses the tox command, this is no library - python2-detox was replaced by python3-detox, nothing requires python2-tox - finally a proper fix for [1] - several PRs to packages bogusly buildrequiring python2-tox were merged [2] [1] https://bugzilla.redhat.com/show_bug.cgi?id=1366193#c8 [2] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/RELZ7RA5DXGZYXSAGJ7RRONUN2ECJQH4/ --- python-tox.spec | 49 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 3001a71..99d31df 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -7,7 +7,7 @@ %global pypiname tox Name: python-%{pypiname} Version: 2.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtualenv-based automation of test activities # file toxbootstrap.py is licensed under MIT License @@ -27,35 +27,6 @@ can use for: - acting as a frontend to Continuous Integration servers, greatly reducing boilerplate and merging CI and shell-based testing. -%package -n python2-%{pypiname} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypiname}} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-setuptools_scm - -%if %{with internet} -# for tests -BuildRequires: python2-py -BuildRequires: python2-pytest -BuildRequires: python2-virtualenv >= 1.11.2 -%endif - -%?python_enable_dependency_generator - -%description -n python2-%{pypiname} -Tox as is a generic virtualenv management and test command line tool you -can use for: - - - checking your package installs correctly with different Python versions - and interpreters - - running your tests in each of the environments, configuring your test tool - of choice - - acting as a frontend to Continuous Integration servers, greatly reducing - boilerplate and merging CI and shell-based testing. - -This package contains just the module you can import from Python 2, -for the actual command line utility, dnf install tox. %package -n python3-%{pypiname} Summary: %{summary} @@ -78,6 +49,9 @@ Recommends: pypy3-devel Recommends: python2-devel Recommends: python3-devel +# Replace the python2 version +Obsoletes: python2-tox < 2.9.1-4 + %if %{with internet} # for tests BuildRequires: python3-py @@ -85,6 +59,8 @@ BuildRequires: python3-pytest BuildRequires: python3-virtualenv %endif +%?python_enable_dependency_generator + %description -n python3-%{pypiname} Tox as is a generic virtualenv management and test command line tool you can use for: @@ -103,28 +79,18 @@ can use for: rm -rf %{pypiname}.egg-info %build -%py2_build %py3_build %install -%py2_install -rm %{buildroot}%{_bindir}/%{pypiname}* - %py3_install # if internet connection available, run tests %if %{with internet} %check -TOXENV=py27 %{__python2} setup.py test TOXENV=py%{python3_version_nodots} %{__python3} setup.py test %endif -%files -n python2-%{pypiname} -%license LICENSE -%{python2_sitelib}/%{pypiname} -%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info - %files -n python3-%{pypiname} %{_bindir}/%{pypiname} %{_bindir}/%{pypiname}-quickstart @@ -132,6 +98,9 @@ TOXENV=py%{python3_version_nodots} %{__python3} setup.py test %{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info %changelog +* Tue May 15 2018 Miro Hrončok - 2.9.1-6 +- Remove the python2 version once again + * Mon May 07 2018 Miro Hrončok - 2.9.1-5 - Add python2 back, see #1575667