Make tox work on EL7

Without it, it fail because it try to use --download-cache option with pip, and pip fail. There is no workaround as far as I know, and this is currently causing trouble, see https://jenkins-fedora-apps.apps.ci.centos.org/blue/organizations/jenkins/fedbadges/detail/PR-75/10/pipeline#log-170
2020-04-03 13:32:07 +02:00
5 changed files with 73 additions and 420 deletions
@@ -1,24 +1 @@
 /tox-1.4.2.zip
-/tox-1.6.1.tar.gz
-/tox-1.7.1.tar.gz
-/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
-/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
@@ -1,344 +1,84 @@
-# 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
+# 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 pypi_name tox
-Name:           python-%{pypi_name}
-Version:        3.24.4
-Release:        1%{?dist}
+%global pypiname tox
+Name:           python-tox
+Version:        1.4.2
+Release:        9%{?dist}
 Summary:        Virtualenv-based automation of test activities

-License:        MIT
-URL:            https://tox.readthedocs.io/
-Source0:        %{pypi_source}
+# file toxbootstrap.py is licensed under MIT License
+License:        GPLv2+ and MIT
+URL:            http://codespeak.net/tox
+Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.zip
+#md5=dc52acf22eb57eaa33e704f8a54e7b34
+# variation of https://github.com/tox-dev/tox/commit/ac1b57ac659f41cf157d6d847b57ba82f8987137
+Patch0:         tox-1.4.2-fix_epel7.diff

 BuildArch:      noarch
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+Requires:  python-py
+Requires:  python-virtualenv
+# required for check
+%if 0%{?fedora}
+BuildRequires:  python-py
+BuildRequires:  pytest
+BuildRequires:  python-virtualenv
+%endif

 %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 python3-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-Provides:       %{pypi_name} = %{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:     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}
-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.
-
-%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"
-
-# remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+%prep 
+%setup -q -n %{pypiname}-%{version}
+%patch0 -p1

 %build
-%py3_build
-
+%{__python} setup.py build

 %install
-%py3_install
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}

-%if %{with tests}
+# if internet connection available, run tests
+%if %{with internet}
 %check
-%pytest -n auto
+# python 2.7: fedora 17, fedora 18
+# python 3.2: fedora 17
+# python 3.3: fedora 18
+
+# el6: buildrequirements missing
+#%if 0%{?rhel}==6
+#TOXENV=py26 %{__python} setup.py test
+#%endif
+
+%if 0%{?fedora}==17 || 0%{?fedora}==18
+TOXENV=py27 %{__python} setup.py test
 %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/
+%endif
+ 
+%files
+%doc LICENSE README.txt ISSUES.txt doc
+%{_bindir}/%{pypiname}
+%{python_sitelib}/%{pypiname}
+%{python_sitelib}/%{pypiname}-%{version}-py2.?.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)
- 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
-
-* 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
- update to 2.3.1
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Nov 12 2015 Kalev Lember <klember@redhat.com> - 2.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Tue Aug 25 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-2
- add requirement: python-pluggy
-
-* Tue Aug 18 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-1
- update to 2.1.1
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Dec 16 2014 Matthias Runge <mrunge@redhat.com> - 1.8.1-1
- update to 1.8.1
-
-* Wed Aug 13 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-3
- Fix ConfigError: ConfigError: substitution key 'posargs' not found
-  (rhbz#1127961, rhbz#1128562)
-
-* Wed Jul 30 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-2
- require virtualenv >= 1.11.2 (rhbz#1122603)
-
-* Tue Jul 08 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-1
- update to 1.7.1 (rhbz#111797)
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Sep 24 2013 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
- update to 1.6.1
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Thu Apr 02 2020 Michael Scherer <misc@zarb.org> - 1.4.2-9
+- fix run on newer pip on EL7

 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -1 +1 @@
-SHA512 (tox-3.24.4.tar.gz) = 9fe2256276b83bf3bc55ec1876be41da2ff7217187f4bf8f4d728106f9c63fc59d146de5e424f7a90d28b938d312c175f7c815bfd3a17d329bec9ba4102139fc
+dc52acf22eb57eaa33e704f8a54e7b34  tox-1.4.2.zip
@@ -1,79 +0,0 @@
---
- 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
-    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
-    - python3-tox
-    - dnf
-    - mock
-    - rpmdevtools
-    - rpm-build
@@ -0,0 +1,15 @@
+Index: tox/_venv.py
+===================================================================
+--- tox-1.4.2/tox/_venv.py
+++ tox-1.4.2.orig/tox/_venv.py	2020-04-02 16:05:49.006344130 +0200
+@@ -224,10 +224,6 @@
+ 
+     def pip_install(self, args, indexserver=None, action=None):
+         argv = ["pip", "install"] + self._commoninstallopts(indexserver)
+-        if self.envconfig.downloadcache:
+-            self.envconfig.downloadcache.ensure(dir=1)
+-            argv.append("--download-cache=%s" %
+-                self.envconfig.downloadcache)
+         for x in ('PIP_RESPECT_VIRTUALENV', 'PIP_REQUIRE_VIRTUALENV'):
+             try:
+                 del os.environ[x]