Compare commits

...

23 Commits

Author SHA1 Message Date
Miro Hrončok 341cb9cf4b Fix invocation with Python 3.9 (#1798929)
Backported from Fedora 31:
https://src.fedoraproject.org/rpms/python-tox/c/aa466cd2d67b5ca7e5f4f58d0fbc704b38c97d94?branch=f31

Added 3.10 and 3.11 as well.

With this tox.ini:

    [tox]
    skipsdist = True
    [testenv]
    commands = python -c 'import sys; print(sys.version)'

Before:

    $ tox -e py39
    ...
    3.6.8 (default, Aug 24 2020, 17:57:11)
    ...
      py39: commands succeeded
      congratulations :)

After:

    $ tox -e py39
    ...
    3.9.1 (default, Jan 18 2021, 16:14:01)
    ...
      py39: commands succeeded
      congratulations :)

The Python 3.10+ addition remains untested, as I have no Python 3.10+ build for EL 8 available.
2021-01-19 17:03:05 +01:00
Miro Hrončok 28e0811301 Fedora CI: Add tests for Python 3.8 2020-07-24 12:02:35 +02:00
Gris Ge b3a2fec504 Initial build for EPEL8
The RHEL/CentOS 8.1 is shipping python3-setuptools_scm-1.15.7-4.el8
which limit us to use tox 3.4(as 3.5.0 need setuptools_scm > 2).

Signed-off-by: Gris Ge <cnfourt@gmail.com>
2020-03-10 19:36:00 +08:00
Artem Goncharov 5f6beb2377 Upgrade to 3.4.0 version (#1652657) 2018-11-22 16:58:55 +01:00
Petr Viktorin c286211cdb Elaborate why Tox recommends all the Pythons
https://bugzilla.redhat.com/show_bug.cgi?id=1645025
2018-11-02 17:45:23 +01:00
Matthias Runge 1581084f65 Revert the previous change and re-add
recommends: python27.
Bump release and rebuild
2018-11-01 12:02:46 +01:00
Matthias Runge ee3f83475f Revert "Remove remaining python2 bits"
This reverts commit 131621c865.
2018-11-01 12:00:21 +01:00
Matthias Runge 131621c865 Remove remaining python2 bits
Resolves: rhbz#1645025
2018-11-01 10:30:23 +01:00
Miro Hrončok 5d575fab31 Enable basic venv smoke test in the CI 2018-09-04 12:06:45 +02:00
Miro Hrončok 9325be7452 Don't recommend Python 2.6, it doesn't work with tox 3 2018-08-28 19:13:25 +02:00
Fedora Release Engineering 0a9a1e13fa - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 02:24:01 +00:00
Miro Hrončok 95f4a83ad1 Rebuilt for Python 3.7 2018-07-02 18:23:57 +02:00
Matthias Runge 2419c84d4c Upgrade to tox-3.0.0 2018-07-02 09:27:42 +02:00
Miro Hrončok cdbf10a574 Rebuilt for Python 3.7 2018-06-17 21:31:17 +02:00
Miro Hrončok 21a8dfc39d Stop recommending python33
https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/message/VTOQDUSGTMGOZOJHK4Y6GNVVLHA36QEC/
2018-05-15 13:31:11 +02:00
Miro Hrončok 3014377f18 Remove the python2 version once again
- everybody just uses the tox command, this is no library
- python2-detox was replaced by python3-detox, nothing requires python2-tox
- finally a proper fix for [1]
- several PRs to packages bogusly buildrequiring python2-tox were merged [2]

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1366193#c8
[2] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/RELZ7RA5DXGZYXSAGJ7RRONUN2ECJQH4/
2018-05-15 13:27:23 +02:00
Miro Hrončok 03fb4aeaf5 Revert "Remove the python2 version", Python 2 is needed
See https://bugzilla.redhat.com/show_bug.cgi?id=1575667

This reverts commit 0f06d08a6c.
2018-05-07 18:39:08 +02:00
Miro Hrončok 0f06d08a6c Remove the python2 version
- everybody just uses the tox command, this is no library
- python2-detox was replaced by python3-detox, nothing requires python2-tox
- finally a proper fix for [1]

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1366193#c8
2018-04-30 12:13:38 +02:00
Miro Hrončok 7ab1656082 Switch to automatic dependency generator (also fixes #1556164)
- Recommend python37
2018-03-15 16:05:35 +01:00
Fedora Release Engineering ff2180b68e - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 11:19:17 +00:00
Matthias Runge c25a770438 Update to 2.9.1 2018-01-29 11:08:43 +01:00
Fedora Release Engineering efaaaa73ec - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 12:04:20 +00:00
Matthias Runge 32f19627ca update to 2.7.0 2017-04-25 14:25:41 +02:00
5 changed files with 125 additions and 98 deletions
+4
View File
@@ -4,3 +4,7 @@
/tox-1.8.1.tar.gz
/tox-2.1.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
+13
View File
@@ -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(
+86 -97
View File
@@ -1,139 +1,128 @@
# 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: 2.3.1
Release: 8%{?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
Source0: %{pypi_source}
# Run py39 env with Python 3.9
# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
Patch1: py39.patch
# 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
BuildArch: noarch
%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:
- 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
- acting as a frontend to Continuous Integration servers, greatly reducing
boilerplate and merging CI and shell-based testing.
%package -n python2-%{pypiname}
%package -n python3-%{srcname}
Summary: %{summary}
%{?python_provide:%python_provide python2-%{pypiname}}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
Requires: python2-py
Requires: python2-virtualenv >= 1.11.2
Requires: python-pluggy
%if %{with internet}
# for tests
BuildRequires: python2-py
BuildRequires: python2-pytest
BuildRequires: python2-virtualenv >= 1.11.2
%endif
%description -n python2-%{pypiname}
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
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.
This package contains just the module you can import from Python 2,
for the actual command line utility, dnf install tox.
%package -n python3-%{pypiname}
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
Requires: python3-py
Requires: python3-pluggy
Requires: python3-virtualenv
BuildRequires: python3-setuptools_scm
# Recommend "all the Pythons"
Recommends: python26
Recommends: python27
Recommends: python33
Recommends: python34
Recommends: python35
Recommends: python36
Recommends: pypy-devel
Recommends: pypy3-devel
Recommends: python2-devel
Recommends: python3-devel
%if %{with internet}
# for tests
BuildRequires: python3-py
BuildRequires: python3-pytest
BuildRequires: python3-virtualenv
%endif
%?python_enable_dependency_generator
%description -n python3-%{pypiname}
Tox as is a generic virtualenv management and test command line tool you
%description -n python3-%{srcname}
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
- acting as a frontend to Continuous Integration servers, greatly reducing
boilerplate and merging CI and shell-based testing.
%prep
%setup -q -n %{pypiname}-%{version}
%autosetup -p1 -n %{srcname}-%{version}
# remove bundled egg-info
rm -rf %{pypiname}.egg-info
rm -rf %{srcname}.egg-info
%build
%py2_build
%py3_build
%install
%py2_install
rm %{buildroot}%{_bindir}/%{pypiname}*
%py3_install
# if internet connection available, run tests
%if %{with internet}
%check
TOXENV=py27 %{__python2} setup.py test
TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
%endif
%files -n python2-%{pypiname}
%doc ISSUES.txt doc
%license LICENSE
%{python2_sitelib}/%{pypiname}
%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
%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
* Tue Jan 19 2021 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-2
- Fix invocation with Python 3.9 (#1798929)
* 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)
* 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)
+1 -1
View File
@@ -1 +1 @@
9371b3d3e25c03751a0372e19602dfb9 tox-2.3.1.tar.gz
SHA512 (tox-3.4.0.tar.gz) = c14364dffac50bece66f15545325d7912459e49979b37b48ff399610517a43a10a4c005f4ca5ec9481fb4140803a18be64f94838610e07d1e7a4b3e5df2a7d87
+21
View File
@@ -0,0 +1,21 @@
---
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
repositories:
- repo: "https://src.fedoraproject.org/tests/python.git"
dest: "python"
tests:
- smoke36:
dir: python/smoke
run: VERSION=3.6 ./venv.sh
- smoke38:
dir: python/smoke
run: VERSION=3.8 ./venv.sh
required_packages:
- gcc
- python36-devel
- python38-devel
- python3-tox