Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Miro Hrončok
|
341cb9cf4b | ||
|
Miro Hrončok
|
28e0811301 | ||
|
Gris Ge
|
b3a2fec504 |
-14
@@ -8,17 +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
|
||||
/tox-3.9.0.tar.gz
|
||||
/tox-3.13.1.tar.gz
|
||||
/tox-3.13.2.tar.gz
|
||||
/tox-3.14.3.tar.gz
|
||||
/tox-3.14.6.tar.gz
|
||||
/tox-3.15.0.tar.gz
|
||||
/tox-3.15.1.tar.gz
|
||||
/tox-3.15.2.tar.gz
|
||||
/tox-3.16.1.tar.gz
|
||||
/tox-3.17.0.tar.gz
|
||||
/tox-3.18.0.tar.gz
|
||||
/tox-3.19.0.tar.gz
|
||||
/tox-3.24.1.tar.gz
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/tox/constants.py b/src/tox/constants.py
|
||||
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
|
||||
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), (3, 10), (3, 11)]
|
||||
PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]
|
||||
OTHER_PYTHON_INTERPRETERS = ["jython"]
|
||||
DEFAULT_FACTORS = _construct_default_factors(
|
||||
+24
-175
@@ -1,27 +1,17 @@
|
||||
# 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/.../python3-tox-...rpm)
|
||||
# 3) Build again --with tests (and internet connection)
|
||||
# (e.g. fedpkg mockbuild --enable-network --no-clean-all)
|
||||
# The Fedora CI tests do this.
|
||||
%bcond_with tests
|
||||
%global srcname tox
|
||||
|
||||
|
||||
%global pypi_name tox
|
||||
Name: python-%{pypi_name}
|
||||
Version: 3.24.4
|
||||
Release: 1%{?dist}
|
||||
Name: python-%{srcname}
|
||||
Version: 3.4.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Virtualenv-based automation of test activities
|
||||
|
||||
License: MIT
|
||||
URL: https://tox.readthedocs.io/
|
||||
URL: https://tox.readthedocs.io
|
||||
Source0: %{pypi_source}
|
||||
|
||||
# Run py39 env with Python 3.9
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
|
||||
Patch1: py39.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -36,72 +26,20 @@ can use for:
|
||||
boilerplate and merging CI and shell-based testing.
|
||||
|
||||
|
||||
%package -n python3-%{pypi_name}
|
||||
%package -n python3-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
Provides: %{pypi_name} = %{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: python2.7
|
||||
Recommends: python3.5
|
||||
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: python36
|
||||
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 tests}
|
||||
BuildRequires: python3-filelock
|
||||
BuildRequires: python3-flaky
|
||||
BuildRequires: python3-freezegun
|
||||
BuildRequires: python3-packaging
|
||||
BuildRequires: python3-pip
|
||||
BuildRequires: python3-pluggy >= 0.12
|
||||
BuildRequires: python3-poetry
|
||||
BuildRequires: python3-psutil
|
||||
BuildRequires: python3-py
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-pytest-mock
|
||||
BuildRequires: python3-pytest-randomly
|
||||
BuildRequires: python3-pytest-xdist
|
||||
BuildRequires: python3-toml
|
||||
BuildRequires: python3-virtualenv
|
||||
BuildRequires: python3-wheel
|
||||
BuildRequires: (python3-importlib-metadata if python3 < 3.8)
|
||||
BuildRequires: /usr/bin/gcc
|
||||
BuildRequires: /usr/bin/git
|
||||
BuildRequires: /usr/bin/pip
|
||||
BuildRequires: /usr/bin/poetry
|
||||
BuildRequires: /usr/bin/pytest
|
||||
BuildRequires: /usr/bin/python
|
||||
BuildRequires: libffi-devel
|
||||
# The tests only work if the tested tox is installed :(
|
||||
BuildRequires: %{pypi_name} = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%?python_enable_dependency_generator
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
%description -n python3-%{srcname}
|
||||
Tox as is a generic virtualenv management and test command line tool you
|
||||
can use for:
|
||||
|
||||
@@ -113,14 +51,10 @@ can use for:
|
||||
boilerplate and merging CI and shell-based testing.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pypi_name}-%{version}
|
||||
|
||||
# Pathlib2 was retired in Fedora, instead of unretiring it,
|
||||
# it's enough to use pathlib instead.
|
||||
find . -type f -name "*.py" -print0 | xargs -0 sed -i "s/pathlib2/pathlib/g"
|
||||
%autosetup -p1 -n %{srcname}-%{version}
|
||||
|
||||
# remove bundled egg-info
|
||||
rm -rf %{pypi_name}.egg-info
|
||||
rm -rf %{srcname}.egg-info
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
@@ -129,103 +63,18 @@ rm -rf %{pypi_name}.egg-info
|
||||
%install
|
||||
%py3_install
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
%pytest -n auto
|
||||
%endif
|
||||
|
||||
%files -n python3-%{pypi_name}
|
||||
%{_bindir}/%{pypi_name}
|
||||
%{_bindir}/%{pypi_name}-quickstart
|
||||
%{python3_sitelib}/%{pypi_name}/
|
||||
%{python3_sitelib}/%{pypi_name}-%{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
|
||||
* 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
|
||||
|
||||
* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-1
|
||||
- Update to 3.24.1
|
||||
|
||||
* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-3
|
||||
- Add Recommends for Python 3.10
|
||||
- https://fedoraproject.org/wiki/Changes/Python3.10
|
||||
|
||||
* Thu Mar 18 2021 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-2
|
||||
- Expose tox requires via the config object
|
||||
- Add --no-provision flag
|
||||
|
||||
* 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)
|
||||
* 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
|
||||
|
||||
* 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
|
||||
* 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.24.4.tar.gz) = 9fe2256276b83bf3bc55ec1876be41da2ff7217187f4bf8f4d728106f9c63fc59d146de5e424f7a90d28b938d312c175f7c815bfd3a17d329bec9ba4102139fc
|
||||
SHA512 (tox-3.4.0.tar.gz) = c14364dffac50bece66f15545325d7912459e49979b37b48ff399610517a43a10a4c005f4ca5ec9481fb4140803a18be64f94838610e07d1e7a4b3e5df2a7d87
|
||||
|
||||
+4
-62
@@ -1,79 +1,21 @@
|
||||
---
|
||||
- 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
|
||||
tags:
|
||||
- classic
|
||||
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:
|
||||
- rpmbuild:
|
||||
dir: .
|
||||
run: "dnf -y build-dep --define '_with_tests 1' {{ tenv_workdir }}/python-tox.spec && rpmbuild --define '_sourcedir {{ tenv_workdir }}' --with tests -ba {{ tenv_workdir }}/python-tox.spec"
|
||||
- smoke27:
|
||||
dir: python/smoke
|
||||
run: VERSION=2.7 METHOD=virtualenv ./venv.sh
|
||||
- smoke34_optional:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.4 INSTALL_OR_SKIP=true ./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
|
||||
- smoke310:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.10 ./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
|
||||
- python27
|
||||
- python35
|
||||
- python36
|
||||
- python37
|
||||
- python38
|
||||
- python39
|
||||
- python3.10
|
||||
- python2-devel
|
||||
- python3-devel
|
||||
- python36-devel
|
||||
- python38-devel
|
||||
- python3-tox
|
||||
- dnf
|
||||
- mock
|
||||
- rpmdevtools
|
||||
- rpm-build
|
||||
|
||||
Reference in New Issue
Block a user