Revert "Merge branch 'epel7' into el6"

This reverts commit 07d6cfea6c, reversing
changes made to 074da2f7e0.

.gitignore

@@ -1,8 +1 @@
 /tox-1.4.2.zip
-/tox-1.6.1.tar.gz
-/tox-1.7.1.tar.gz
-/tox-1.8.1.tar.gz
-/tox-2.1.1.tar.gz
-/tox-2.3.1.tar.gz
-/tox-2.7.0.tar.gz
-/tox-2.9.1.tar.gz

python-tox.spec

@@ -5,217 +5,81 @@
 
 
 %global pypiname tox
-Name:           python-%{pypiname}
+Name:           python-tox
-Version:        2.9.1
+Version:        1.4.2
-Release:        3%{?dist}
+Release:        8%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
 License:        GPLv2+ and MIT
-URL:            http://tox.testrun.org/
+URL:            http://codespeak.net/tox
-Source0:        https://files.pythonhosted.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.zip
+#md5=dc52acf22eb57eaa33e704f8a54e7b34
+
 BuildArch:      noarch
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+Requires:  python-py
+Requires:  python-virtualenv
+%if 0%{?rhel}==6
+Requires:  python-argparse
+%endif
+
+# required for check
+%if 0%{?fedora}
+BuildRequires:  python-py
+BuildRequires:  pytest
+BuildRequires:  python-virtualenv
+%endif
 
 %description
-Tox as is a generic virtualenv management and test command line tool you
+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
+ - checking your package installs correctly with different Python versions 
    and interpreters
- - running your tests in each of the environments, configuring your test tool
+ - running your tests in each of the environments, configuring your test tool 
    of choice
- - acting as a frontend to Continuous Integration servers, greatly reducing
+ - acting as a frontend to Continuous Integration servers, greatly reducing 
    boilerplate and merging CI and shell-based testing.
 
-%package -n     python2-%{pypiname}
+%prep 
-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}
-%{?python_provide:%python_provide python3-%{pypiname}}
-Provides:       %{pypiname} = %{version}-%{release}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-setuptools_scm
-
-# Recommend "all the Pythons"
-Recommends:     python26
-Recommends:     python27
-Recommends:     python33
-Recommends:     python34
-Recommends:     python35
-Recommends:     python36
-Recommends:     python37
-Recommends:     pypy-devel
-Recommends:     pypy3-devel
-Recommends:     python2-devel
-Recommends:     python3-devel
-
-%if %{with internet}
-# for tests
-BuildRequires:  python3-py
-BuildRequires:  python3-pytest
-BuildRequires:  python3-virtualenv
-%endif
-
-%description -n python3-%{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.
-
-%prep
 %setup -q -n %{pypiname}-%{version}
 
-# remove bundled egg-info
-rm -rf %{pypiname}.egg-info
-
 %build
-%py2_build
+%{__python} setup.py build
-%py3_build
-
 
 %install
-%py2_install
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-rm %{buildroot}%{_bindir}/%{pypiname}*
-
-%py3_install
 
 # if internet connection available, run tests
 %if %{with internet}
 %check
-TOXENV=py27 %{__python2} setup.py test
+# python 2.7: fedora 17, fedora 18
-TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
+# python 3.2: fedora 17
+# python 3.3: fedora 18
+
+# el6: buildrequirements missing
+#%if 0%{?rhel}==6
+#TOXENV=py26 %{__python} setup.py test
+#%endif
+
+%if 0%{?fedora}==17 || 0%{?fedora}==18
+TOXENV=py27 %{__python} setup.py test
 %endif
 
-%files -n python2-%{pypiname}
+%endif
-%license LICENSE
+ 
-%{python2_sitelib}/%{pypiname}
+%files
-%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
+%doc LICENSE README.txt ISSUES.txt doc
-
-%files -n python3-%{pypiname}
 %{_bindir}/%{pypiname}
-%{_bindir}/%{pypiname}-quickstart
+%{python_sitelib}/%{pypiname}
-%{python3_sitelib}/%{pypiname}
+%{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
-%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
+
 
 %changelog
-* Thu Mar 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-3
+* Mon Feb 17 2014 Matthias Runge <mrunge@redhat.com> - 1.4.2-8
-- Switch to automatic dependency generator (also fixes #1556164)
+- python 2.6 requires argparse (rhbz#1065824)
-- Recommend python37
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 29 2018 Matthias Runge <mrunge@redhat.com> - 2.9.1-1
-- update to 2.9.1
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Apr 25 2017 Matthias Runge <mrunge@redhat.com> - 2.7.0-1
-- upgrade to 2.7.0
-
-* Sun Apr 09 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-8
-- Recommend the devel subpackages of Pythons (so tox works with extension modules)
-
-* Tue Feb 14 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-7
-- Recommend python36
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-5
-- Rebuild for Python 3.6
-
-* Mon Oct 10 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-4
-- Recommend "all the Pythons"
-
-* Thu Aug 11 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-3
-- /usr/bin/tox is Python3
-- Python 2 subpackage is python2-tox
-- Run the tests also on Python 3
-- Update Source URL and URL
-- Use modern macros
-- Get rid of Fedora 17 checks
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-2
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Mon Feb 29 2016 Matthias Runge <mrunge@redhat.com> - 2.3.1-1
-- update to 2.3.1
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Nov 12 2015 Kalev Lember <klember@redhat.com> - 2.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Tue Aug 25 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-2
-- add requirement: python-pluggy
-
-* Tue Aug 18 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-1
-- update to 2.1.1
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Dec 16 2014 Matthias Runge <mrunge@redhat.com> - 1.8.1-1
-- update to 1.8.1
-
-* Wed Aug 13 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-3
-- Fix ConfigError: ConfigError: substitution key 'posargs' not found
-  (rhbz#1127961, rhbz#1128562)
-
-* Wed Jul 30 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-2
-- require virtualenv >= 1.11.2 (rhbz#1122603)
-
-* Tue Jul 08 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-1
-- update to 1.7.1 (rhbz#111797)
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Sep 24 2013 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
-- update to 1.6.1
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Wed Nov 14 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-7
 - add requires python-py, python-virtualenv (rhbz#876246)

sources

@@ -1 +1 @@
-SHA512 (tox-2.9.1.tar.gz) = ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
+dc52acf22eb57eaa33e704f8a54e7b34  tox-1.4.2.zip