From 19c55ef01a194175640cb7d3445ef0a8e914cff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 6 Feb 2020 13:04:17 +0100 Subject: [PATCH] Fix invocation with Python 3.9 (#1798929) - Recommend Python 3.9 --- py39.patch | 13 +++++++++++++ python-tox.spec | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 py39.patch diff --git a/py39.patch b/py39.patch new file mode 100644 index 0000000..4e3c0d5 --- /dev/null +++ b/py39.patch @@ -0,0 +1,13 @@ +diff --git a/src/tox/constants.py b/src/tox/constants.py +index bd21562..e1b7c3f 100644 +--- a/src/tox/constants.py ++++ b/src/tox/constants.py +@@ -28,7 +28,7 @@ def _construct_default_factors(cpython_versions, pypy_versions, other_interprete + class PYTHON: + PY_FACTORS_RE = re.compile("^(?!py$)(py|pypy|jython)([2-9][0-9]?)?$") + PY_FACTORS_MAP = {"py": "python", "pypy": "pypy", "jython": "jython"} +- CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)] ++ CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9)] + PYPY_VERSION_TUPLES = [(2, 7), (3, 5)] + OTHER_PYTHON_INTERPRETERS = ["jython"] + DEFAULT_FACTORS = _construct_default_factors( diff --git a/python-tox.spec b/python-tox.spec index 162ca55..bf74ed5 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -7,13 +7,18 @@ %global pypiname tox Name: python-%{pypiname} Version: 3.5.3 -Release: 3%{?dist} +Release: 4%{?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 + +# Run py39 env with Python 3.9 +# https://bugzilla.redhat.com/show_bug.cgi?id=1798929 +Patch1: py39.patch + BuildArch: noarch %description @@ -50,6 +55,7 @@ Recommends: python35 Recommends: python36 Recommends: python37 Recommends: python38 +Recommends: python39 Recommends: pypy-devel Recommends: pypy3-devel Recommends: python2-devel @@ -79,7 +85,7 @@ can use for: boilerplate and merging CI and shell-based testing. %prep -%setup -q -n %{pypiname}-%{version} +%autosetup -p1 -n %{pypiname}-%{version} # remove bundled egg-info rm -rf %{pypiname}.egg-info @@ -104,6 +110,10 @@ TOXENV=py%{python3_version_nodots} %{__python3} setup.py test %{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Feb 06 2020 Miro Hrončok - 3.5.3-4 +- Fix invocation with Python 3.9 (#1798929) +- Recommend Python 3.9 + * Fri Feb 15 2019 Lumír Balhar - 3.5.3-3 - Recommend Python 3.8