Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Matthias Runge
|
acd6a5049f | ||
|
Matthias Runge
|
0492cc2907 |
+3
-2
@@ -1,2 +1,3 @@
|
||||
/tox-*.tar.gz
|
||||
/tox-*/
|
||||
/tox-1.4.2.zip
|
||||
/tox-1.6.1.tar.gz
|
||||
/tox-1.7.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):
|
||||
+101
-346
@@ -1,374 +1,129 @@
|
||||
# Tests are disbaled by default, they require:
|
||||
# a) tested tox to be installed
|
||||
# b) internet connection
|
||||
# To test, do the following:
|
||||
# 1) Build --without tests (the default)
|
||||
# (e.g. fedpkg mockbuild)
|
||||
# 2) Install the built package
|
||||
# (e.g. mock install ./results_python-tox/.../tox-...rpm)
|
||||
# 3) Build again --with tests (and internet connection)
|
||||
# (e.g. fedpkg mockbuild --enable-network --no-clean-all --with tests)
|
||||
# The Fedora CI tests do this.
|
||||
%bcond_with tests
|
||||
|
||||
# Unset -s on python shebang - ensure that extensions installed with pip
|
||||
# to user locations are seen and properly loaded
|
||||
# Fixes https://bugzilla.redhat.com/2057015
|
||||
%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)
|
||||
|
||||
Name: python-tox
|
||||
Version: 3.28.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Virtualenv-based automation of test activities
|
||||
|
||||
License: MIT
|
||||
URL: https://tox.readthedocs.io/
|
||||
Source0: %{pypi_source tox}
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: pyproject-rpm-macros
|
||||
|
||||
%if %{with tests}
|
||||
BuildRequires: /usr/bin/gcc
|
||||
BuildRequires: /usr/bin/git
|
||||
BuildRequires: /usr/bin/pip
|
||||
BuildRequires: /usr/bin/pytest
|
||||
BuildRequires: /usr/bin/python
|
||||
BuildRequires: libffi-devel
|
||||
# xdist is not used upstream, but we use it to speed up the %%check
|
||||
BuildRequires: python3-pytest-xdist
|
||||
# The tests only work if the tested tox is installed :(
|
||||
BuildRequires: tox = %{version}-%{release}
|
||||
%if 0%{?fedora} > 12
|
||||
# virtualenv for python3 is missing
|
||||
%global with_python3 0
|
||||
%endif
|
||||
|
||||
%global _description %{expand:
|
||||
Tox as is a generic virtualenv management and test command line tool you
|
||||
# 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)
|
||||
%bcond_with internet
|
||||
|
||||
|
||||
%global pypiname tox
|
||||
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://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
|
||||
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
|
||||
boilerplate and merging CI and shell-based testing.}
|
||||
- acting as a frontend to Continuous Integration servers, greatly reducing
|
||||
boilerplate and merging CI and shell-based testing.
|
||||
|
||||
%description %_description
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypiname}
|
||||
Summary: Virtualenv-based automation of test activities
|
||||
Requires: python3-py
|
||||
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:
|
||||
|
||||
%package -n tox
|
||||
Summary: %{summary}
|
||||
- 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
|
||||
|
||||
# Recommend "all the Pythons"
|
||||
# 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: python2.7
|
||||
Recommends: python3.6
|
||||
Recommends: python3.7
|
||||
Recommends: python3.8
|
||||
Recommends: python3.9
|
||||
Recommends: python3.10
|
||||
Recommends: pypy2-devel
|
||||
Recommends: pypy3-devel
|
||||
Recommends: python2-devel
|
||||
Recommends: python3-devel
|
||||
# Instead of adding new Pythons here, add `Supplements: tox` to them, see:
|
||||
# https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
|
||||
%prep
|
||||
%setup -q -n %{pypiname}-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%py_provides python3-tox
|
||||
# Remove this once Fedora 36 goes EOL:
|
||||
Obsoletes: python3-tox < 3.24.4-2
|
||||
|
||||
%description -n tox %_description
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n tox-%{version}
|
||||
|
||||
# In https://github.com/tox-dev/tox/pull/2463 upstream insisted on pinning tomli to >=2.0.1.
|
||||
# However, it works fine with 1.2.3 we have in Fedora 35+36, so we relax the dependency.
|
||||
# We rely on the Fedora CI to catch problems.
|
||||
sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg
|
||||
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires -r %{?with_tests:-x testing}
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
%pyproject_wheel
|
||||
%{__python} setup.py build
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py build
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%pyproject_save_files tox
|
||||
%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 %{with tests}
|
||||
# if internet connection available, run tests
|
||||
%if %{with internet}
|
||||
%check
|
||||
%pytest -n auto
|
||||
# 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 tox -f %{pyproject_files}
|
||||
%{_bindir}/tox
|
||||
%{_bindir}/tox-quickstart
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc LICENSE ISSUES.txt doc
|
||||
%{_bindir}/%{pypiname}
|
||||
%{_bindir}/%{pypiname}-quickstart
|
||||
%{python_sitelib}/%{pypiname}
|
||||
%{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Dec 18 2022 Miro Hrončok <mhroncok@redhat.com> - 3.28.0-1
|
||||
- Update to 3.28.0
|
||||
|
||||
* Fri Nov 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.27.1-1
|
||||
- Update to 3.27.1
|
||||
|
||||
* Wed Sep 14 2022 Miro Hrončok <mhroncok@redhat.com> - 3.26.0-1
|
||||
- Update to 3.26.0
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jul 13 2022 Lumír Balhar <lbalhar@redhat.com> - 3.25.1-1
|
||||
- Update to 3.25.1
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.25.0-2
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Mon May 09 2022 Miro Hrončok <mhroncok@redhat.com> - 3.25.0-1
|
||||
- Update to 3.25.0
|
||||
|
||||
* Tue Feb 22 2022 Rich Megginson <rmeggins@redhat.com> - 3.24.5-2
|
||||
- Remove -s flag from tox shebang, make tox see user-installed plugins
|
||||
- Fixes: rhbz#2057015
|
||||
|
||||
* Tue Jan 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.24.5-1
|
||||
- Update to 3.24.5
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Dec 13 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.4-2
|
||||
- Always BuildRequire runtime dependencies to avoid non-installable builds
|
||||
- Remove no longer needed obsoletes of python3-detox
|
||||
|
||||
* Wed Oct 13 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.24.4-1
|
||||
- Update to 3.24.4
|
||||
|
||||
* Tue Aug 31 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.3-1
|
||||
- Update to 3.24.3
|
||||
|
||||
* Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-2
|
||||
- Obsolete newer versions of python3-tox
|
||||
|
||||
* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-1
|
||||
- Update to 3.24.1
|
||||
|
||||
* Mon Aug 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-2
|
||||
- Remove Recommends Python 3.5
|
||||
- Add Recommends for Python 3.10
|
||||
- https://fedoraproject.org/wiki/Changes/RetirePython3.5
|
||||
- https://fedoraproject.org/wiki/Changes/Python3.10
|
||||
|
||||
* Mon Jul 26 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-1
|
||||
- Update to 3.24.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 3.23.0-3
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Mar 30 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-2
|
||||
- Allow building with setuptools_scm 6+
|
||||
|
||||
* Wed Mar 17 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-1
|
||||
- Update to 3.23.0
|
||||
|
||||
* Tue Feb 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.4-1
|
||||
- Update to 3.21.4
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-2
|
||||
- Rename the installable package to "tox"
|
||||
|
||||
* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-1
|
||||
- Update to 3.21.0
|
||||
|
||||
* Mon Sep 07 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.20.0-1
|
||||
- Update to 3.20.0
|
||||
- Fixes rhbz#1874601
|
||||
|
||||
* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-1
|
||||
- Update to 3.19.0
|
||||
- Fixes rhbz#1861313
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Jul 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.0-1
|
||||
- Update to 3.18.0
|
||||
- Fixes rhbz#1859875
|
||||
|
||||
* Tue Jul 14 2020 Miro Hrončok <mhroncok@redhat.com> - 3.17.0-1
|
||||
- Update to 3.17.0
|
||||
- Fixes rhbz#1856985
|
||||
|
||||
* Thu Jul 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.16.1-1
|
||||
- Update to 3.16.1
|
||||
- Fixes rhbz#1851519
|
||||
|
||||
* Mon Jun 08 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.2-1
|
||||
- Update to 3.15.2 (#1844689)
|
||||
|
||||
* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.15.1-1
|
||||
- Update to 3.15.1 (#1838137)
|
||||
|
||||
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.0-2
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Wed May 13 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.15.0-1
|
||||
- Update to 3.15.0
|
||||
- Stop recommending Python 3.4
|
||||
|
||||
* Thu Mar 19 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.14.6-1
|
||||
- Update to 3.14.6
|
||||
|
||||
* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.14.3-1
|
||||
- Update to 3.14.3 (#1725939)
|
||||
- Fix invocation with Python 3.9 (#1798929)
|
||||
- Recommend Python 3.9
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-4
|
||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||
|
||||
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jul 08 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-1
|
||||
- Update to 3.13.2 (#1699032)
|
||||
|
||||
* Tue Apr 30 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1
|
||||
- Update to 3.9.0
|
||||
- Obsolete detox
|
||||
- License is MIT
|
||||
|
||||
* Fri Feb 15 2019 Lumír Balhar <lbalhar@redhat.com> - 3.5.3-3
|
||||
- Recommend Python 3.8
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Nov 22 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.5.3-1
|
||||
- Upgrade to 3.5.3 version
|
||||
|
||||
* 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
|
||||
|
||||
* 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)
|
||||
|
||||
@@ -1 +1 @@
|
||||
SHA512 (tox-3.28.0.tar.gz) = 15c2b5e8f3220cc5be436d5eb0b460fa06ecb04c639f45d31fba284d23743d754e85dfe72fe6a1945f4e3aa094278911834e85c6d973972a3179c905178dec6e
|
||||
ec85bbfc7bd29600e91aa0e9754645d0 tox-1.7.1.tar.gz
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
"""
|
||||
Several packages with various Python interpreters *Supplement* tox.
|
||||
*Supplements* is a reverse dependency to *Recommends*.
|
||||
|
||||
See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
|
||||
|
||||
This script:
|
||||
|
||||
1) figures out all packages in the enabled repositories supplementing tox
|
||||
2) ensures there is a venv.sh test for each of them in tests.yml
|
||||
|
||||
That way, when we change tox (update, patch, etc.),
|
||||
we will always test it with all Pythons that supplement it.
|
||||
"""
|
||||
|
||||
import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
import yaml
|
||||
|
||||
|
||||
def parse_python_test_arg(command):
|
||||
tokens = shlex.split(command)
|
||||
for token in tokens:
|
||||
if token.startswith('PYTHON='):
|
||||
return token.removeprefix('PYTHON=')
|
||||
# only check VERSION if PYTHON was not found
|
||||
for token in tokens:
|
||||
if token.startswith('VERSION='):
|
||||
return 'python' + token.removeprefix('VERSION=')
|
||||
raise RuntimeError(f'Could not determine the Python version from `{command}`')
|
||||
|
||||
|
||||
# First, construct a set of various Pythons we test, e.g. {python3.10, python3.7, pypy3.6, ...}
|
||||
tested_pythons = set()
|
||||
with open('tests.yml') as f:
|
||||
tests_yml = yaml.safe_load(f)
|
||||
# this nested structure access is quite fragile,
|
||||
# but at least it should fail the test if we reach to a wrong place
|
||||
for test in tests_yml[-1]['roles'][0]['tests']:
|
||||
for value in test.values():
|
||||
run = value['run']
|
||||
if run.endswith('./venv.sh'):
|
||||
tested_pythons.add(parse_python_test_arg(run))
|
||||
print('Tested Pythons found in tests.yml:', file=sys.stderr)
|
||||
for python in sorted(tested_pythons):
|
||||
print(' ', python, file=sys.stderr)
|
||||
|
||||
|
||||
# Get all packages that supplement tox,
|
||||
# no repo explicitly specified means we use the enabled repos on the CI system which should be what we want
|
||||
repoquery_result = subprocess.check_output(['dnf', 'repoquery', '--whatsupplements', 'tox'], text=True)
|
||||
supplementing_pkgs = set(repoquery_result.splitlines())
|
||||
|
||||
|
||||
# It gets quite tricky, since packages like "pypy" can supplement tox, we get a set of provides for all of them
|
||||
supplementing_pkgs_provides = {}
|
||||
for nvra in supplementing_pkgs:
|
||||
repoquery_result = subprocess.check_output(['dnf', '-q', 'repoquery', '--provides', nvra], text=True)
|
||||
provides = set(repoquery_result.splitlines())
|
||||
unversioned_provides = {provide.split(' ')[0] for provide in provides}
|
||||
supplementing_pkgs_provides[nvra.rsplit('-', 2)[0]] = unversioned_provides
|
||||
|
||||
|
||||
# We use this hack to treat -devel and -libs packages as if they were not such
|
||||
def normalize_name(pkgname):
|
||||
for suffix in '-devel', '-libs':
|
||||
if pkgname.endswith(suffix):
|
||||
return pkgname.removesuffix(suffix)
|
||||
return pkgname
|
||||
|
||||
|
||||
# Now, for each package that supplements tox, we check if there is a tested Python that *is* it
|
||||
exit_code = 0
|
||||
for pkg, provides in supplementing_pkgs_provides.items():
|
||||
if normalize_name(pkg) in tested_pythons:
|
||||
print(f'{pkg} is tested', file=sys.stderr)
|
||||
continue
|
||||
for provide in provides:
|
||||
if normalize_name(provide) in tested_pythons:
|
||||
print(f'{pkg} is tested (via {provide})', file=sys.stderr)
|
||||
break
|
||||
else:
|
||||
print(f'{pkg} is NOT tested', file=sys.stderr)
|
||||
exit_code = 1
|
||||
|
||||
sys.exit(exit_code)
|
||||
@@ -1,97 +0,0 @@
|
||||
---
|
||||
- hosts: localhost
|
||||
tags:
|
||||
- classic
|
||||
tasks:
|
||||
- dnf:
|
||||
name: "*"
|
||||
state: latest
|
||||
|
||||
- hosts: localhost
|
||||
tags:
|
||||
- classic
|
||||
pre_tasks:
|
||||
- import_role:
|
||||
name: standard-test-source
|
||||
vars:
|
||||
fetch_only: True
|
||||
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
repositories:
|
||||
- repo: "https://src.fedoraproject.org/tests/python.git"
|
||||
dest: "python"
|
||||
- repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
|
||||
dest: "pyproject-rpm-macros"
|
||||
tests:
|
||||
- mock_with_tests:
|
||||
dir: .
|
||||
run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with tests
|
||||
- all_supplementing_pythons:
|
||||
dir: tests
|
||||
run: ./all_supplementing_pythons.py
|
||||
- smoke27:
|
||||
dir: python/smoke
|
||||
run: VERSION=2.7 METHOD=virtualenv ./venv.sh
|
||||
- smoke35_optional:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.5 INSTALL_OR_SKIP=true ./venv.sh
|
||||
- smoke36:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.6 ./venv.sh
|
||||
- smoke37:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.7 ./venv.sh
|
||||
- smoke38:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.8 ./venv.sh
|
||||
- smoke39:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.9 ./venv.sh
|
||||
- smoke310:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.10 ./venv.sh
|
||||
- smoke311:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.11 ./venv.sh
|
||||
- smoke312:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.12 ./venv.sh
|
||||
- smoke_pypy37_optional:
|
||||
dir: python/smoke
|
||||
run: PYTHON=pypy3.7 VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh
|
||||
- smoke_pypy38:
|
||||
dir: python/smoke
|
||||
run: PYTHON=pypy3.8 VERSION=3.8 ./venv.sh
|
||||
- smoke_pypy39:
|
||||
dir: python/smoke
|
||||
run: PYTHON=pypy3.9 VERSION=3.9 ./venv.sh
|
||||
- pyproject_pytest:
|
||||
dir: pyproject-rpm-macros/tests
|
||||
run: ./mocktest.sh python-pytest
|
||||
- pyproject_pluggy:
|
||||
dir: pyproject-rpm-macros/tests
|
||||
run: ./mocktest.sh python-pluggy
|
||||
- pyproject_openqa_client:
|
||||
dir: pyproject-rpm-macros/tests
|
||||
run: ./mocktest.sh python-openqa_client
|
||||
required_packages:
|
||||
- gcc
|
||||
- virtualenv
|
||||
- python2.7
|
||||
- python3.6
|
||||
- python3.7
|
||||
- python3.8
|
||||
- python3.9
|
||||
- python3.10-devel
|
||||
- python3.11-devel
|
||||
- python3.12-devel
|
||||
- python2-devel
|
||||
- pypy3.8-devel
|
||||
- pypy3.9-devel
|
||||
- python3-tox
|
||||
- dnf
|
||||
- mock
|
||||
- rpmdevtools
|
||||
- rpm-build
|
||||
- python3-pyyaml
|
||||
Reference in New Issue
Block a user