Compare commits
42 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7020984115 | |||
| aa466cd2d6 | |||
| cbb1e4c150 | |||
| 119eb1eba0 | |||
| 745bdd1bfb | |||
| 224c79a35f | |||
| 80602e339d | |||
| 4e85c05c34 | |||
| cb1dcfef37 | |||
| 1380a99f6e | |||
| c1c8c91355 | |||
| 130c199691 | |||
| 138cc6b75e | |||
| 4f5a2fef3e | |||
| 5f6beb2377 | |||
| c286211cdb | |||
| 1581084f65 | |||
| ee3f83475f | |||
| 131621c865 | |||
| 5d575fab31 | |||
| 9325be7452 | |||
| 0a9a1e13fa | |||
| 95f4a83ad1 | |||
| 2419c84d4c | |||
| cdbf10a574 | |||
| 21a8dfc39d | |||
| 3014377f18 | |||
| 03fb4aeaf5 | |||
| 0f06d08a6c | |||
| 7ab1656082 | |||
| ff2180b68e | |||
| c25a770438 | |||
| efaaaa73ec | |||
| 32f19627ca | |||
| f0d7c36890 | |||
| bfb11cae80 | |||
| 38dc612112 | |||
| 53edfdda47 | |||
| 454e6cdbf8 | |||
| 1fd92e9476 | |||
| 1c269861a6 | |||
| 328c6708c1 |
@@ -4,3 +4,11 @@
|
|||||||
/tox-1.8.1.tar.gz
|
/tox-1.8.1.tar.gz
|
||||||
/tox-2.1.1.tar.gz
|
/tox-2.1.1.tar.gz
|
||||||
/tox-2.3.1.tar.gz
|
/tox-2.3.1.tar.gz
|
||||||
|
/tox-2.7.0.tar.gz
|
||||||
|
/tox-2.9.1.tar.gz
|
||||||
|
/tox-3.0.0.tar.gz
|
||||||
|
/tox-3.4.0.tar.gz
|
||||||
|
/tox-3.5.3.tar.gz
|
||||||
|
/tox-3.9.0.tar.gz
|
||||||
|
/tox-3.13.1.tar.gz
|
||||||
|
/tox-3.13.2.tar.gz
|
||||||
|
|||||||
+112
@@ -0,0 +1,112 @@
|
|||||||
|
From dab74691cd1cd55621c943fc869f8ee821746ff6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||||
|
Date: Mon, 8 Jul 2019 19:08:17 +0200
|
||||||
|
Subject: [PATCH] Use importlib.metadata from the standard library on Python
|
||||||
|
3.8+
|
||||||
|
|
||||||
|
Fixes https://github.com/tox-dev/tox/issues/1367
|
||||||
|
---
|
||||||
|
CONTRIBUTORS | 1 +
|
||||||
|
setup.cfg | 2 +-
|
||||||
|
src/tox/config/__init__.py | 2 +-
|
||||||
|
src/tox/session/commands/show_config.py | 2 +-
|
||||||
|
src/tox/util/stdlib.py | 5 +++++
|
||||||
|
tox.ini | 2 +-
|
||||||
|
6 files changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
|
||||||
|
index 39d848b..ad0168f 100644
|
||||||
|
--- a/CONTRIBUTORS
|
||||||
|
+++ b/CONTRIBUTORS
|
||||||
|
@@ -58,6 +58,7 @@ Mattieu Agopian
|
||||||
|
Michael Manganiello
|
||||||
|
Mickaël Schoentgen
|
||||||
|
Mikhail Kyshtymov
|
||||||
|
+Miro Hrončok
|
||||||
|
Monty Taylor
|
||||||
|
Morgan Fainberg
|
||||||
|
Nick Douma
|
||||||
|
diff --git a/setup.cfg b/setup.cfg
|
||||||
|
index 3950ea3..c2bb1c2 100644
|
||||||
|
--- a/setup.cfg
|
||||||
|
+++ b/setup.cfg
|
||||||
|
@@ -37,7 +37,7 @@ classifiers =
|
||||||
|
packages = find:
|
||||||
|
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
|
||||||
|
install_requires =
|
||||||
|
- importlib-metadata >= 0.12, <1
|
||||||
|
+ importlib-metadata >= 0.12, <1;python_version<"3.8"
|
||||||
|
packaging >= 14
|
||||||
|
pluggy >= 0.12.0, <1
|
||||||
|
py >= 1.4.17, <2
|
||||||
|
diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py
|
||||||
|
index c1a3239..849b31f 100644
|
||||||
|
--- a/src/tox/config/__init__.py
|
||||||
|
+++ b/src/tox/config/__init__.py
|
||||||
|
@@ -15,7 +15,6 @@ from fnmatch import fnmatchcase
|
||||||
|
from subprocess import list2cmdline
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
|
-import importlib_metadata
|
||||||
|
import pluggy
|
||||||
|
import py
|
||||||
|
import toml
|
||||||
|
@@ -34,6 +33,7 @@ from tox.reporter import (
|
||||||
|
verbosity1,
|
||||||
|
)
|
||||||
|
from tox.util.path import ensure_empty_dir
|
||||||
|
+from tox.util.stdlib import importlib_metadata
|
||||||
|
|
||||||
|
from .parallel import ENV_VAR_KEY as PARALLEL_ENV_VAR_KEY
|
||||||
|
from .parallel import add_parallel_config, add_parallel_flags
|
||||||
|
diff --git a/src/tox/session/commands/show_config.py b/src/tox/session/commands/show_config.py
|
||||||
|
index 11c5cf2..efb713a 100644
|
||||||
|
--- a/src/tox/session/commands/show_config.py
|
||||||
|
+++ b/src/tox/session/commands/show_config.py
|
||||||
|
@@ -1,13 +1,13 @@
|
||||||
|
import sys
|
||||||
|
from collections import OrderedDict
|
||||||
|
|
||||||
|
-import importlib_metadata
|
||||||
|
from packaging.requirements import Requirement
|
||||||
|
from packaging.utils import canonicalize_name
|
||||||
|
from six import StringIO
|
||||||
|
from six.moves import configparser
|
||||||
|
|
||||||
|
from tox import reporter
|
||||||
|
+from tox.util.stdlib import importlib_metadata
|
||||||
|
|
||||||
|
DO_NOT_SHOW_CONFIG_ATTRIBUTES = (
|
||||||
|
"interpreters",
|
||||||
|
diff --git a/src/tox/util/stdlib.py b/src/tox/util/stdlib.py
|
||||||
|
index 0b25859..5f687b7 100644
|
||||||
|
--- a/src/tox/util/stdlib.py
|
||||||
|
+++ b/src/tox/util/stdlib.py
|
||||||
|
@@ -3,6 +3,11 @@ import threading
|
||||||
|
from contextlib import contextmanager
|
||||||
|
from tempfile import TemporaryFile
|
||||||
|
|
||||||
|
+if sys.version_info >= (3, 8):
|
||||||
|
+ from importlib import metadata as importlib_metadata # noqa
|
||||||
|
+else:
|
||||||
|
+ import importlib_metadata # noqa
|
||||||
|
+
|
||||||
|
|
||||||
|
def is_main_thread():
|
||||||
|
"""returns true if we are within the main thread"""
|
||||||
|
diff --git a/tox.ini b/tox.ini
|
||||||
|
index fa5b321..fcb1418 100644
|
||||||
|
--- a/tox.ini
|
||||||
|
+++ b/tox.ini
|
||||||
|
@@ -139,7 +139,7 @@ include_trailing_comma = True
|
||||||
|
force_grid_wrap = 0
|
||||||
|
line_length = 99
|
||||||
|
known_first_party = tox,tests
|
||||||
|
-known_third_party = apiclient,docutils,filelock,flaky,freezegun,git,httplib2,importlib_metadata,oauth2client,packaging,pathlib2,pluggy,py,pytest,setuptools,six,sphinx,toml
|
||||||
|
+known_third_party = apiclient,docutils,filelock,flaky,freezegun,git,httplib2,oauth2client,packaging,pathlib2,pluggy,py,pytest,setuptools,six,sphinx,toml
|
||||||
|
|
||||||
|
[testenv:release]
|
||||||
|
description = do a release, required posarg of the version number
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/tox/constants.py b/src/tox/constants.py
|
||||||
|
index 8dcc86b..1c90e47 100644
|
||||||
|
--- a/src/tox/constants.py
|
||||||
|
+++ b/src/tox/constants.py
|
||||||
|
@@ -30,7 +30,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]?)?$")
|
||||||
|
- 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(
|
||||||
@@ -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):
|
|
||||||
+206
-94
@@ -1,141 +1,253 @@
|
|||||||
%if 0%{?fedora} > 12
|
|
||||||
# virtualenv for python3 is missing
|
|
||||||
%global with_python3 1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Tests requiring Internet connections are disabled by default
|
# Tests requiring Internet connections are disabled by default
|
||||||
# pass --with internet to run them (e.g. when doing a local rebuild
|
# pass --with internet to run them (e.g. when doing a local rebuild
|
||||||
# for sanity checks before committing)
|
# for sanity checks before committing). Example:
|
||||||
|
# $ mock --enable-network --with internet <SRPM>
|
||||||
%bcond_with internet
|
%bcond_with internet
|
||||||
|
|
||||||
|
|
||||||
%global pypiname tox
|
%global pypi_name tox
|
||||||
Name: python-tox
|
Name: python-%{pypi_name}
|
||||||
Version: 2.3.1
|
Version: 3.13.2
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Virtualenv-based automation of test activities
|
Summary: Virtualenv-based automation of test activities
|
||||||
|
|
||||||
# file toxbootstrap.py is licensed under MIT License
|
License: MIT
|
||||||
License: GPLv2+ and MIT
|
URL: https://tox.readthedocs.io/
|
||||||
URL: http://codespeak.net/tox
|
Source0: %{pypi_source}
|
||||||
Source0: http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
|
|
||||||
|
|
||||||
|
# Use importlib.metadata from stdlib on Python 3.8
|
||||||
|
# Rebased from https://github.com/tox-dev/tox/pull/1368
|
||||||
|
Patch0: 1368.patch
|
||||||
|
|
||||||
|
# Run py39 env with Python 3.9
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
|
||||||
|
Patch1: py39.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: python2-devel
|
|
||||||
BuildRequires: python-setuptools
|
|
||||||
Requires: python-py
|
|
||||||
Requires: python-virtualenv >= 1.11.2
|
|
||||||
Requires: python-pluggy
|
|
||||||
# required for check
|
|
||||||
%if 0%{?fedora}
|
|
||||||
BuildRequires: python-py
|
|
||||||
BuildRequires: pytest
|
|
||||||
BuildRequires: python-virtualenv >= 1.11.2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Tox as is a generic virtualenv management and test command line tool you
|
Tox as is a generic virtualenv management and test command line tool you
|
||||||
can use for:
|
can use for:
|
||||||
|
|
||||||
- checking your package installs correctly with different Python versions
|
- checking your package installs correctly with different Python versions
|
||||||
and interpreters
|
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
|
of choice
|
||||||
- acting as a frontend to Continuous Integration servers, greatly reducing
|
- acting as a frontend to Continuous Integration servers, greatly reducing
|
||||||
boilerplate and merging CI and shell-based testing.
|
boilerplate and merging CI and shell-based testing.
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
|
||||||
%package -n python3-%{pypiname}
|
%package -n python3-%{pypi_name}
|
||||||
Summary: Virtualenv-based automation of test activities
|
Summary: %{summary}
|
||||||
Requires: python3-py
|
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||||
Requires: python3-pluggy
|
Provides: %{pypi_name} = %{version}-%{release}
|
||||||
# python3-virtualenv is rhbz#537246
|
BuildRequires: python3-devel
|
||||||
Requires: python3-virtualenv
|
BuildRequires: python3-setuptools
|
||||||
|
BuildRequires: python3-setuptools_scm
|
||||||
|
|
||||||
|
# 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: python27
|
||||||
|
Recommends: python34
|
||||||
|
Recommends: python35
|
||||||
|
Recommends: python36
|
||||||
|
Recommends: python37
|
||||||
|
Recommends: python38
|
||||||
|
Recommends: python39
|
||||||
|
Recommends: pypy2-devel
|
||||||
|
Recommends: pypy3-devel
|
||||||
|
Recommends: python2-devel
|
||||||
|
Recommends: python3-devel
|
||||||
|
|
||||||
|
# Replace the python2 version
|
||||||
|
Obsoletes: python2-tox < 2.9.1-4
|
||||||
|
|
||||||
|
# Replace detox (no longer supported, functionality is now in tox)
|
||||||
|
Obsoletes: python3-detox < 0.19-5
|
||||||
|
|
||||||
|
%if %{with internet}
|
||||||
|
# for tests
|
||||||
|
BuildRequires: python3-filelock
|
||||||
|
BuildRequires: python3-flaky
|
||||||
|
BuildRequires: python3-freezegun
|
||||||
|
BuildRequires: python3-packaging
|
||||||
|
BuildRequires: python3-pathlib2
|
||||||
|
BuildRequires: python3-pip
|
||||||
|
BuildRequires: python3-pluggy >= 0.12
|
||||||
|
BuildRequires: python3-psutil
|
||||||
BuildRequires: python3-py
|
BuildRequires: python3-py
|
||||||
BuildRequires: python3-pytest
|
BuildRequires: python3-pytest
|
||||||
|
BuildRequires: python3-pytest-mock
|
||||||
|
#BuildRequires: python3-pytest-randomly -- not packaged
|
||||||
|
BuildRequires: python3-pytest-xdist
|
||||||
|
BuildRequires: python3-toml
|
||||||
BuildRequires: python3-virtualenv
|
BuildRequires: python3-virtualenv
|
||||||
|
BuildRequires: python3-wheel
|
||||||
|
BuildRequires: (python3-importlib-metadata if python3 < 3.8)
|
||||||
|
BuildRequires: /usr/bin/git
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n python3-%{pypiname}
|
%?python_enable_dependency_generator
|
||||||
Tox as is a generic virtualenv management and test command line tool you
|
|
||||||
|
%description -n python3-%{pypi_name}
|
||||||
|
Tox as is a generic virtualenv management and test command line tool you
|
||||||
can use for:
|
can use for:
|
||||||
|
|
||||||
- checking your package installs correctly with different Python versions
|
- checking your package installs correctly with different Python versions
|
||||||
and interpreters
|
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
|
of choice
|
||||||
- acting as a frontend to Continuous Integration servers, greatly reducing
|
- acting as a frontend to Continuous Integration servers, greatly reducing
|
||||||
boilerplate and merging CI and shell-based testing.
|
boilerplate and merging CI and shell-based testing.
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{pypiname}-%{version}
|
%autosetup -p1 -n %{pypi_name}-%{version}
|
||||||
|
|
||||||
# remove bundled egg-info
|
# remove bundled egg-info
|
||||||
rm -rf %{pypiname}.egg-info
|
rm -rf %{pypi_name}.egg-info
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
|
||||||
rm -rf %{py3dir}
|
|
||||||
cp -a . %{py3dir}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__python} setup.py build
|
%py3_build
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
|
||||||
pushd %{py3dir}
|
|
||||||
%{__python3} setup.py build
|
|
||||||
popd
|
|
||||||
%endif # with_python3
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if 0%{?with_python3}
|
%py3_install
|
||||||
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
|
# if internet connection available, run tests
|
||||||
%if %{with internet}
|
%if %{with internet}
|
||||||
%check
|
%check
|
||||||
# python 2.7: fedora 17, fedora 18
|
# there will be failures like
|
||||||
# python 3.2: fedora 17
|
# ModuleNotFoundError: tox
|
||||||
# python 3.3: fedora 18
|
# or InterpreterNotFound: python
|
||||||
|
# We juggle the environment variables as much as we can, but it's not perfect.
|
||||||
# el6: buildrequirements missing
|
# To workaround this:
|
||||||
#%if 0%{?rhel}==6
|
# 1. build --without internet
|
||||||
#TOXENV=py26 %{__python} setup.py test
|
# 2. install the new python3-tox
|
||||||
#%endif
|
# 3. build --with internet
|
||||||
|
mkdir .path
|
||||||
%if 0%{?fedora}>=17
|
ln -s %{__python3} .path/python
|
||||||
TOXENV=py27 %{__python} setup.py test
|
ln -s /usr/bin/easy_install-%{python3_version} .path/easy_install
|
||||||
|
ln -s /usr/bin/pytest-%{python3_version} .path/pytest
|
||||||
|
ln -s /usr/bin/pip3 .path/pip
|
||||||
|
export PATH=$(pwd)/.path:%{buildroot}%{_bindir}:$PATH
|
||||||
|
export PYTHONPATH=%{buildroot}%{python3_sitelib}
|
||||||
|
export TOXENV=py%{python3_version_nodots}
|
||||||
|
export TOX_TESTENV_PASSENV="PATH TOX_TESTENV_PASSENV"
|
||||||
|
# TODO figure out why PEP517/518 tests and test_provision_cli_args_ignore won't pass
|
||||||
|
pytest-3 -n auto -k "not test_verbose_isolated_build and not test_dist_exists_version_change and not test_provision_cli_args_ignore"
|
||||||
|
rm -rf .path
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%endif
|
%files -n python3-%{pypi_name}
|
||||||
|
%{_bindir}/%{pypi_name}
|
||||||
%files
|
%{_bindir}/%{pypi_name}-quickstart
|
||||||
%doc ISSUES.txt doc
|
%{python3_sitelib}/%{pypi_name}/
|
||||||
%license LICENSE
|
%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
|
||||||
%{_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
|
%changelog
|
||||||
|
* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
|
||||||
|
- Fix invocation with Python 3.9 (#1798929)
|
||||||
|
- Recommend Python 3.9
|
||||||
|
|
||||||
|
* 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
|
* Mon Feb 29 2016 Matthias Runge <mrunge@redhat.com> - 2.3.1-1
|
||||||
- update to 2.3.1
|
- update to 2.3.1
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
9371b3d3e25c03751a0372e19602dfb9 tox-2.3.1.tar.gz
|
SHA512 (tox-3.13.2.tar.gz) = 06c92c803bef7c2dd3796ecc869d78dc4d3044e62688bcf529b7c6b8330532aab30dcc44425fc226886a35d8227225db5e3f2435a469e90af7ad440231abbc35
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
---
|
||||||
|
- hosts: localhost
|
||||||
|
tags:
|
||||||
|
- classic
|
||||||
|
tasks:
|
||||||
|
- dnf:
|
||||||
|
name: "*"
|
||||||
|
state: latest
|
||||||
|
|
||||||
|
- hosts: localhost
|
||||||
|
roles:
|
||||||
|
- role: standard-test-basic
|
||||||
|
tags:
|
||||||
|
- classic
|
||||||
|
repositories:
|
||||||
|
- repo: "https://src.fedoraproject.org/tests/python.git"
|
||||||
|
dest: "python"
|
||||||
|
tests:
|
||||||
|
- smoke27:
|
||||||
|
dir: python/smoke
|
||||||
|
run: VERSION=2.7 METHOD=virtualenv ./venv.sh
|
||||||
|
- smoke34:
|
||||||
|
dir: python/smoke
|
||||||
|
run: VERSION=3.4 ./venv.sh
|
||||||
|
- smoke35:
|
||||||
|
dir: python/smoke
|
||||||
|
run: VERSION=3.5 ./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
|
||||||
|
required_packages:
|
||||||
|
- gcc
|
||||||
|
- virtualenv
|
||||||
|
- python27
|
||||||
|
- python34
|
||||||
|
- python35
|
||||||
|
- python36
|
||||||
|
- python37
|
||||||
|
- python38
|
||||||
|
- python39
|
||||||
|
- python2-devel
|
||||||
|
- python3-devel
|
||||||
|
- python3-tox
|
||||||
Reference in New Issue
Block a user