From 97ce88bf7b92408ff635323f180d8868b87e6741 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 23 2022 11:31:47 +0000 Subject: [PATCH 1/3] Prepare spec for multiple flags in %py3_shebang_flags See the relevant change of packaging guidelines: https://pagure.io/packaging-committee/pull-request/1165 tl;dr If we ever add more flags, we want to remove s here, not all flags. --- diff --git a/python-tox.spec b/python-tox.spec index 630eb6a..399399e 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -14,7 +14,7 @@ # Unset -s on python shebang - ensure that extensions installed with pip # to user locations are seen and properly loaded # Fixes https://bugzilla.redhat.com/2057015 -%global py3_shebang_flags %nil +%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox Version: 3.24.5 From cbec16b980a5401d02666cc718ee543cdd374dc7 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: May 09 2022 10:37:30 +0000 Subject: [PATCH 2/3] Update to 3.25.0 --- diff --git a/python-tox.spec b/python-tox.spec index 399399e..9d3c301 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,8 +17,8 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.24.5 -Release: 2%{?dist} +Version: 3.25.0 +Release: 1%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -118,6 +118,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Mon May 09 2022 Miro Hrončok - 3.25.0-1 +- Update to 3.25.0 + * Tue Feb 22 2022 Rich Megginson - 3.24.5-2 - Remove -s flag from tox shebang, make tox see user-installed plugins - Fixes: rhbz#2057015 diff --git a/sources b/sources index 4065001..a41a313 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.24.5.tar.gz) = 2b047c5682c2c57268fb46055207388d060fb31511d6e442dc49244a5ac53c4d2fecd7bb9a8e33bb02b580192926592523dfb991c4bd8b216559f71a1c548f9a +SHA512 (tox-3.25.0.tar.gz) = d98ed9f589c751ddc187618caf509fbc64e99f1b5eafeb9cbd919d94d10e15a55331658121efabac53ef07adeb71af15da8be86fc4f35688a8f9b93bf3e723d1 From ef76b4eeb6e655c4b8e357a5ec08c2ab84d399a7 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: May 09 2022 11:03:09 +0000 Subject: [PATCH 3/3] /usr/bin/poetry is not needed for tests, poetry is pip-installed as a build backend --- diff --git a/python-tox.spec b/python-tox.spec index 9d3c301..39388cb 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -34,7 +34,6 @@ BuildRequires: pyproject-rpm-macros 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