Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Miro Hrončok
|
341cb9cf4b | ||
|
Miro Hrončok
|
28e0811301 | ||
|
Gris Ge
|
b3a2fec504 |
@@ -8,4 +8,3 @@
|
||||
/tox-2.9.1.tar.gz
|
||||
/tox-3.0.0.tar.gz
|
||||
/tox-3.4.0.tar.gz
|
||||
/tox-3.5.3.tar.gz
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/tox/constants.py b/src/tox/constants.py
|
||||
index bd21562..e1b7c3f 100644
|
||||
index bd21562..3b5e57f 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
|
||||
@@ -7,7 +7,7 @@ index bd21562..e1b7c3f 100644
|
||||
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)]
|
||||
+ CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)]
|
||||
PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]
|
||||
OTHER_PYTHON_INTERPRETERS = ["jython"]
|
||||
DEFAULT_FACTORS = _construct_default_factors(
|
||||
|
||||
+21
-89
@@ -1,19 +1,12 @@
|
||||
# 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 srcname tox
|
||||
|
||||
|
||||
%global pypiname tox
|
||||
Name: python-%{pypiname}
|
||||
Version: 3.5.3
|
||||
Release: 4%{?dist}
|
||||
Name: python-%{srcname}
|
||||
Version: 3.4.0
|
||||
Release: 2%{?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
|
||||
License: MIT
|
||||
URL: https://tox.readthedocs.io
|
||||
Source0: %{pypi_source}
|
||||
|
||||
# Run py39 env with Python 3.9
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
|
||||
@@ -33,49 +26,20 @@ can use for:
|
||||
boilerplate and merging CI and shell-based testing.
|
||||
|
||||
|
||||
%package -n python3-%{pypiname}
|
||||
%package -n python3-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-%{pypiname}}
|
||||
Provides: %{pypiname} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python3-%{srcname}}
|
||||
Provides: %{srcname} = %{version}-%{release}
|
||||
BuildRequires: python3-devel
|
||||
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: pypy-devel
|
||||
Recommends: pypy3-devel
|
||||
Recommends: python2-devel
|
||||
Recommends: python3-devel
|
||||
|
||||
# Replace the python2 version
|
||||
Obsoletes: python2-tox < 2.9.1-4
|
||||
|
||||
%if %{with internet}
|
||||
# for tests
|
||||
BuildRequires: python3-py
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-pytest-mock
|
||||
BuildRequires: python3-pytest-xdist
|
||||
BuildRequires: python3-virtualenv
|
||||
%endif
|
||||
|
||||
%?python_enable_dependency_generator
|
||||
|
||||
%description -n python3-%{pypiname}
|
||||
%description -n python3-%{srcname}
|
||||
Tox as is a generic virtualenv management and test command line tool you
|
||||
can use for:
|
||||
|
||||
@@ -87,10 +51,10 @@ can use for:
|
||||
boilerplate and merging CI and shell-based testing.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pypiname}-%{version}
|
||||
%autosetup -p1 -n %{srcname}-%{version}
|
||||
|
||||
# remove bundled egg-info
|
||||
rm -rf %{pypiname}.egg-info
|
||||
rm -rf %{srcname}.egg-info
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
@@ -99,50 +63,18 @@ rm -rf %{pypiname}.egg-info
|
||||
%install
|
||||
%py3_install
|
||||
|
||||
# if internet connection available, run tests
|
||||
%if %{with internet}
|
||||
%check
|
||||
# there will be failures like
|
||||
# ModuleNotFoundError: tox
|
||||
# or InterpreterNotFound: python
|
||||
# We juggle the environment variables as much as we can, but it's not perfect.
|
||||
# To workaround this:
|
||||
# 1. build --without internet
|
||||
# 2. install the new python3-tox
|
||||
# 3. build --with internet
|
||||
mkdir .path
|
||||
ln -s %{__python3} .path/python
|
||||
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_alwayscopy"
|
||||
rm -rf .path
|
||||
%endif
|
||||
|
||||
%files -n python3-%{pypiname}
|
||||
%{_bindir}/%{pypiname}
|
||||
%{_bindir}/%{pypiname}-quickstart
|
||||
%{python3_sitelib}/%{pypiname}
|
||||
%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
|
||||
%files -n python3-%{srcname}
|
||||
%{_bindir}/%{srcname}
|
||||
%{_bindir}/%{srcname}-quickstart
|
||||
%{python3_sitelib}/%{srcname}
|
||||
%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
|
||||
|
||||
%changelog
|
||||
* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-4
|
||||
* Tue Jan 19 2021 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-2
|
||||
- Fix invocation with Python 3.9 (#1798929)
|
||||
- Recommend Python 3.9
|
||||
|
||||
* 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
|
||||
* Tue Feb 25 2020 Gris Ge <fge@redhat.com> - 3.4.0-1
|
||||
- Port to EPEL8
|
||||
|
||||
* Mon Nov 19 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.4.0-1
|
||||
- Upgrade to 3.4.0 version (#1652657)
|
||||
|
||||
@@ -1 +1 @@
|
||||
SHA512 (tox-3.5.3.tar.gz) = d93fd44af6e62d0ceb756894f2b6d3fc695f7a797069422c93a1d82eb62542227f900ed19505cb6f77345a9c03fd1080f017638fa623d985c4f6ded48aad5545
|
||||
SHA512 (tox-3.4.0.tar.gz) = c14364dffac50bece66f15545325d7912459e49979b37b48ff399610517a43a10a4c005f4ca5ec9481fb4140803a18be64f94838610e07d1e7a4b3e5df2a7d87
|
||||
|
||||
+2
-25
@@ -8,37 +8,14 @@
|
||||
- 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
|
||||
- python36-devel
|
||||
- python38-devel
|
||||
- python3-tox
|
||||
|
||||
Reference in New Issue
Block a user