Upgrade to 3.4.0 version (#1652657)

https://bugzilla.redhat.com/show_bug.cgi?id=1645025

.gitignore

@@ -6,3 +6,5 @@
 /tox-2.3.1.tar.gz
 /tox-2.7.0.tar.gz
 /tox-2.9.1.tar.gz
+/tox-3.0.0.tar.gz
+/tox-3.4.0.tar.gz

python-tox.spec

@@ -6,8 +6,8 @@
 
 %global pypiname tox
 Name:           python-%{pypiname}
-Version:        2.9.1
+Version:        3.4.0
-Release:        3%{?dist}
+Release:        1%{?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}
@@ -66,9 +37,14 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools_scm
 
 # Recommend "all the Pythons"
-Recommends:     python26
+# Why? Tox exists to enable developers to test libraries against various Python
+# versions, with just "dnf install tox" and a config file.
+# See: https://developer.fedoraproject.org/tech/languages/python/python-installation.html#using-virtualenv
+# Tox itself runs on the system python3 (i.e. %%{python3_version},
+# however it launches other Python versions as subprocesses.
+# It recommends all Python versions it supports. (This is an exception to
+# the rule that Fedora packages may not require the alternative interpreters.)
 Recommends:     python27
-Recommends:     python33
 Recommends:     python34
 Recommends:     python35
 Recommends:     python36
@@ -78,6 +54,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 +64,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 +84,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 +103,37 @@ TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
 %{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Mon Nov 19 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.4.0-1
+- Upgrade to 3.4.0 version (#1652657)
+
+* Thu Nov 01 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-6
+- remove and revert the change to recommend python 2.7 (rhbz#1645025)
+
+* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-4
+- Don't recommend Python 2.6, it doesn't work with tox 3
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
+- Rebuilt for Python 3.7
+
+* Mon Jul 02 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-1
+- upgrade to 3.0.0
+
+* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-7
+- Rebuilt for Python 3.7
+
+* Tue May 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-6
+- Remove the python2 version once again
+- Stop recommending python33 (it's retired)
+
+* Mon May 07 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-5
+- Add python2 back, see #1575667
+
+* Mon Apr 30 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-4
+- Remove the python2 version
+
 * Thu Mar 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-3
 - Switch to automatic dependency generator (also fixes #1556164)
 - Recommend python37

sources

@@ -1 +1 @@
-SHA512 (tox-2.9.1.tar.gz) = ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
+SHA512 (tox-3.4.0.tar.gz) = c14364dffac50bece66f15545325d7912459e49979b37b48ff399610517a43a10a4c005f4ca5ec9481fb4140803a18be64f94838610e07d1e7a4b3e5df2a7d87

tests/tests.yml

@@ -0,0 +1,36 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/python.git"
+      dest: "python"
+    tests:
+    - smoke27:
+        dir: python/smoke
+        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
+    - smoke34:
+        dir: python/smoke
+        run: VERSION=3.4 ./venv.sh
+    - smoke35:
+        dir: python/smoke
+        run: VERSION=3.5 ./venv.sh
+    - smoke36:
+        dir: python/smoke
+        run: VERSION=3.6 ./venv.sh
+    - smoke37:
+        dir: python/smoke
+        run: VERSION=3.7 ./venv.sh
+    required_packages:
+    - gcc
+    - /usr/bin/virtualenv
+    - python27
+    - python34
+    - python35
+    - python36
+    - python37
+    - python2-devel
+    - python3-devel
+    - python3-tox