Revert "Merge branch 'epel7' into el6"

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

.gitignore

@@ -1,6 +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

python-tox-Fix-command-expansion-and-parsing.patch

@@ -1,93 +0,0 @@
-# HG changeset patch
-# User Clark Boylan <clark.boylan@gmail.com>
-# Date 1391830704 28800
-# Node ID 62fe57a8fd3f8f44be8957e59846387d2f505227
-# Parent  b0360a54ab368ef428c7f83601ba6b64f6fec64f
-Fix command expansion and parsing.
-
-Tox testenv commands are parsed to expand variable substitutions and
-construct the argv list that will be passed to exec. Prior to this
-commit this parsing ate quotes surrounding variables and treated
-multiword variables as single argv items. Neither behavior was correct.
-To fix this create the expanded command before handing it off to shlex
-to do the tokenization of the argv list. Doing the parsing in this
-order ensures it is correct.
-
-diff --git a/tests/test_config.py b/tests/test_config.py
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -278,7 +278,7 @@
-         #    "reader.getargvlist('section', 'key1')")
-         assert reader.getargvlist('section', 'key1') == []
-         x = reader.getargvlist("section", "key2")
--        assert x == [["cmd1", "with space", "grr"],
-+        assert x == [["cmd1", "with", "space", "grr"],
-                      ["cmd2", "grr"]]
- 
-     def test_argvlist_windows_escaping(self, tmpdir, newconfig):
-@@ -304,7 +304,7 @@
-         #    "reader.getargvlist('section', 'key1')")
-         assert reader.getargvlist('section', 'key1') == []
-         x = reader.getargvlist("section", "key2")
--        assert x == [["cmd1", "with space", "grr"]]
-+        assert x == [["cmd1", "with", "space", "grr"]]
- 
- 
-     def test_argvlist_quoting_in_command(self, tmpdir, newconfig):
-diff --git a/tox/_config.py b/tox/_config.py
---- a/tox/_config.py
-+++ b/tox/_config.py
-@@ -527,30 +527,35 @@
-     def _processcommand(self, command):
-         posargs = getattr(self, "posargs", None)
- 
--        # special treat posargs which might contain multiple arguments
--        # in their defaults
-+        # Iterate through each word of the command substituting as
-+        # appropriate to construct the new command string. This
-+        # string is then broken up into exec argv components using
-+        # shlex.
-         newcommand = ""
-         for word in CommandParser(command).words():
--            if word.startswith("{posargs:") and word.endswith("}"):
-+            if word == "{posargs}" or word == "[]":
-                 if posargs:
--                    word = "{posargs}"
-+                    newcommand += " ".join(posargs)
-+                continue
-+            elif word.startswith("{posargs:") and word.endswith("}"):
-+                if posargs:
-+                    newcommand += " ".join(posargs)
-+                    continue
-                 else:
-                     word = word[9:-1]
--            newcommand += word
-+            new_arg = ""
-+            new_word = self._replace(word)
-+            new_word = self._replace(new_word)
-+            new_arg += new_word
-+            newcommand += new_arg
- 
--        # now we can properly parse the command
--        argv = []
--        for arg in shlex.split(newcommand):
--            if arg in ('[]', "{posargs}"):
--                if posargs:
--                    argv.extend(posargs)
--                continue
--            new_arg = ""
--            for word in CommandParser(arg).words():
--                new_word = self._replace(word)
--                new_word = self._replace(new_word)
--                new_arg += new_word
--            argv.append(new_arg)
-+        # Construct shlex object that will not escape any values,
-+        # use all values as is in argv.
-+        shlexer = shlex.shlex(newcommand, posix=True)
-+        shlexer.whitespace_split = True
-+        shlexer.escape = ''
-+        shlexer.commenters = ''
-+        argv = list(shlexer)
-         return argv
- 
-     def getargv(self, section, name, default=None, replace=True):

python-tox.spec

@@ -1,8 +1,3 @@
-%if 0%{?fedora} > 12
-# virtualenv for python3 is missing
-%global with_python3 1
-%endif
-
 # Tests requiring Internet connections are disabled by default
 # pass --with internet to run them (e.g. when doing a local rebuild
 # for sanity checks before committing)
@@ -11,27 +6,30 @@
 
 %global pypiname tox
 Name:           python-tox
-Version:        2.3.1
-Release:        1%{?dist}
+Version:        1.4.2
+Release:        8%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
 License:        GPLv2+ and MIT
 URL:            http://codespeak.net/tox
-Source0:        http://pypi.python.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 >= 1.11.2
-Requires:  python-pluggy
+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 >= 1.11.2
+BuildRequires:  python-virtualenv
 %endif
 
 %description
@@ -45,60 +43,13 @@ can use for:
  - acting as a frontend to Continuous Integration servers, greatly reducing 
    boilerplate and merging CI and shell-based testing.
 
-%if 0%{?with_python3}
-%package -n python3-%{pypiname}
-Summary:        Virtualenv-based automation of test activities
-Requires:       python3-py
-Requires:       python3-pluggy
-# python3-virtualenv is rhbz#537246
-Requires:       python3-virtualenv
-BuildRequires:  python3-py
-BuildRequires:  python3-pytest
-BuildRequires:  python3-virtualenv
-
-%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.
-%endif
-
-%prep
+%prep 
 %setup -q -n %{pypiname}-%{version}
 
-# remove bundled egg-info
-rm -rf %{pypiname}.egg-info
-
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
-
-
 %build
 %{__python} setup.py build
 
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
-
-
 %install
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
-mv %{buildroot}%{_bindir}/tox %{buildroot}%{_bindir}/python3-tox
-mv %{buildroot}%{_bindir}/tox-quickstart %{buildroot}%{_bindir}/python3-tox-quickstart
-popd
-%endif # with_python3
-
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # if internet connection available, run tests
@@ -113,71 +64,22 @@ popd
 #TOXENV=py26 %{__python} setup.py test
 #%endif
 
-%if 0%{?fedora}>=17
+%if 0%{?fedora}==17 || 0%{?fedora}==18
 TOXENV=py27 %{__python} setup.py test
 %endif
 
 %endif
-
+ 
 %files
-%doc ISSUES.txt doc
-%license LICENSE
+%doc LICENSE README.txt ISSUES.txt doc
 %{_bindir}/%{pypiname}
-%{_bindir}/%{pypiname}-quickstart
 %{python_sitelib}/%{pypiname}
 %{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
 
-%if 0%{?with_python3}
-%files -n python3-tox
-%{_bindir}/python3-%{pypiname}
-%{_bindir}/python3-%{pypiname}-quickstart
-%{python3_sitelib}/%{pypiname}
-%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
-%endif
 
 %changelog
-* 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
+* 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)

sources

@@ -1 +1 @@
-9371b3d3e25c03751a0372e19602dfb9  tox-2.3.1.tar.gz
+dc52acf22eb57eaa33e704f8a54e7b34  tox-1.4.2.zip