Revert "Merge branch 'epel7' into el6"

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

python-tox.spec

@@ -7,7 +7,7 @@
 %global pypiname tox
 Name:           python-tox
 Version:        1.4.2
-Release:        9%{?dist}
+Release:        8%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
@@ -15,14 +15,16 @@ License:        GPLv2+ and MIT
 URL:            http://codespeak.net/tox
 Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.zip
 #md5=dc52acf22eb57eaa33e704f8a54e7b34
-# variation of https://github.com/tox-dev/tox/commit/ac1b57ac659f41cf157d6d847b57ba82f8987137
-Patch0:         tox-1.4.2-fix_epel7.diff
 
 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
@@ -43,7 +45,6 @@ can use for:
 
 %prep 
 %setup -q -n %{pypiname}-%{version}
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -77,11 +78,8 @@ TOXENV=py27 %{__python} setup.py test
 
 
 %changelog
-* Thu Apr 02 2020 Michael Scherer <misc@zarb.org> - 1.4.2-9
-- fix run on newer pip on EL7
-
-* 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
+* Mon Feb 17 2014 Matthias Runge <mrunge@redhat.com> - 1.4.2-8
+- python 2.6 requires argparse (rhbz#1065824)
 
 * Wed Nov 14 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-7
 - add requires python-py, python-virtualenv (rhbz#876246)

tox-1.4.2-fix_epel7.diff

@@ -1,15 +0,0 @@
-Index: tox/_venv.py
-===================================================================
---- tox-1.4.2/tox/_venv.py
-+++ tox-1.4.2.orig/tox/_venv.py	2020-04-02 16:05:49.006344130 +0200
-@@ -224,10 +224,6 @@
- 
-     def pip_install(self, args, indexserver=None, action=None):
-         argv = ["pip", "install"] + self._commoninstallopts(indexserver)
--        if self.envconfig.downloadcache:
--            self.envconfig.downloadcache.ensure(dir=1)
--            argv.append("--download-cache=%s" %
--                self.envconfig.downloadcache)
-         for x in ('PIP_RESPECT_VIRTUALENV', 'PIP_REQUIRE_VIRTUALENV'):
-             try:
-                 del os.environ[x]