From 74db11a8364ab4383d4bbf11596d21b82b88bdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 22 Nov 2024 13:48:09 +0100 Subject: [PATCH] Remove python 2.7 from tox configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář (cherry picked from commit af10ab312b248052e987ee2c50650e2db85be5e4) --- requirements.txt | 4 +--- test-requirements.txt | 1 - tox.ini | 17 +---------------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2a34d731..ff13a3be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ # Some packages must be installed via dnf/yum first, see doc/contributing.rst dogpile.cache -flufl.lock ; python_version >= '3.0' -flufl.lock < 3.0 ; python_version <= '2.7' +flufl.lock jsonschema kobo koji @@ -12,4 +11,3 @@ ordered_set productmd pykickstart python-multilib -urlgrabber ; python_version < '3.0' diff --git a/test-requirements.txt b/test-requirements.txt index 338b8ff3..7074df89 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,3 @@ -mock; python_version < '3.3' parameterized pytest pytest-cov diff --git a/tox.ini b/tox.ini index 012b6020..74c0e78c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = bandit, flake8, black, py27, py3 +envlist = bandit, flake8, black, py3 [testenv:flake8] deps = @@ -26,21 +26,6 @@ commands = {[testenv:flake8]commands} black --check --diff pungi pungi_utils setup.py tests --exclude tests/_composes -[testenv:py27] -sitepackages = true -deps = - -rrequirements.txt - -rtest-requirements.txt -allowlist_externals = - sh - make - coverage -commands = - sh -c 'find . -name "*.pyc" -exec rm -f \{\} +' - pip install --force-reinstall pytest mock - make test-coverage - coverage xml - [testenv:py3] sitepackages = true deps =