Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Matthias Runge
|
acd6a5049f | ||
|
Matthias Runge
|
0492cc2907 |
@@ -1,6 +1,3 @@
|
||||
/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
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
# 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):
|
||||
+66
-123
@@ -1,3 +1,8 @@
|
||||
%if 0%{?fedora} > 12
|
||||
# virtualenv for python3 is missing
|
||||
%global with_python3 0
|
||||
%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)
|
||||
@@ -5,16 +10,29 @@
|
||||
|
||||
|
||||
%global pypiname tox
|
||||
Name: python-%{pypiname}
|
||||
Version: 2.3.1
|
||||
Release: 8%{?dist}
|
||||
Name: python-tox
|
||||
Version: 1.7.1
|
||||
Release: 3%{?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/
|
||||
Source0: https://files.pythonhosted.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
|
||||
URL: http://codespeak.net/tox
|
||||
Source0: http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
|
||||
|
||||
Patch0: python-tox-Fix-command-expansion-and-parsing.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-setuptools
|
||||
Requires: python-py
|
||||
Requires: python-virtualenv >= 1.11.2
|
||||
# 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
|
||||
@@ -27,64 +45,14 @@ 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
|
||||
Requires: python2-py
|
||||
Requires: python2-virtualenv >= 1.11.2
|
||||
Requires: python-pluggy
|
||||
|
||||
%if %{with internet}
|
||||
# for tests
|
||||
BuildRequires: python2-py
|
||||
BuildRequires: python2-pytest
|
||||
BuildRequires: python2-virtualenv >= 1.11.2
|
||||
%endif
|
||||
|
||||
%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.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypiname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-%{pypiname}}
|
||||
Provides: %{pypiname} = %{version}-%{release}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
Summary: Virtualenv-based automation of test activities
|
||||
Requires: python3-py
|
||||
Requires: python3-pluggy
|
||||
Requires: python3-virtualenv
|
||||
|
||||
# Recommend "all the Pythons"
|
||||
Recommends: python26
|
||||
Recommends: python27
|
||||
Recommends: python33
|
||||
Recommends: python34
|
||||
Recommends: python35
|
||||
Recommends: python36
|
||||
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
|
||||
@@ -96,91 +64,66 @@ can use for:
|
||||
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}
|
||||
%patch0 -p1
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%endif
|
||||
|
||||
# remove bundled egg-info
|
||||
rm -rf %{pypiname}.egg-info
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%py3_build
|
||||
%{__python} setup.py build
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py build
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%install
|
||||
%py2_install
|
||||
rm %{buildroot}%{_bindir}/%{pypiname}*
|
||||
%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
|
||||
|
||||
%py3_install
|
||||
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
|
||||
|
||||
# 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
|
||||
# python 2.7: fedora 17, fedora 18
|
||||
# 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
|
||||
TOXENV=py27 %{__python} setup.py test
|
||||
%endif
|
||||
|
||||
%files -n python2-%{pypiname}
|
||||
%doc ISSUES.txt doc
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/%{pypiname}
|
||||
%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
|
||||
|
||||
%files -n python3-%{pypiname}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc LICENSE ISSUES.txt doc
|
||||
%{_bindir}/%{pypiname}
|
||||
%{_bindir}/%{pypiname}-quickstart
|
||||
%{python3_sitelib}/%{pypiname}
|
||||
%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
|
||||
%{python_sitelib}/%{pypiname}
|
||||
%{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
|
||||
|
||||
|
||||
%changelog
|
||||
* 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)
|
||||
|
||||
Reference in New Issue
Block a user