From 17cd08d6a08ea6126be4a160c9c7265c02d0cedf Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 22 Feb 2022 23:50:22 +0000 Subject: [PATCH] Updated compatibility with tox4 Related: rhbz#2060109 --- pyproject-rpm-macros.spec | 5 ++++- pyproject_buildrequires.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec index c69e573..c5ddc65 100644 --- a/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -12,7 +12,7 @@ License: MIT # Increment Y and reset Z when new macros or features are added # Increment Z when this is a bugfix or a cosmetic change # Dropping support for EOL Fedoras is *not* considered a breaking change -Version: 1.0.0~rc1 +Version: 1.0.0~rc2 Release: 1%{?dist} # Macro files @@ -123,6 +123,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %license LICENSE %changelog +* Mon Feb 07 2022 Lumír Balhar - 1.0.0~rc2-1 +- Updated compatibility with tox4 + * Tue Jan 25 2022 Miro Hrončok - 1.0.0~rc1-1 - Release version 1.0.0, first release candidate diff --git a/pyproject_buildrequires.py b/pyproject_buildrequires.py index 5f55b01..21e74da 100644 --- a/pyproject_buildrequires.py +++ b/pyproject_buildrequires.py @@ -282,7 +282,7 @@ def generate_tox_requirements(toxenv, requirements): '--print-deps-to', deps.name, '--print-extras-to', extras.name, '--no-provision', provision.name, - '-qre', toxenv], + '-q', '-r', '-e', toxenv], check=False, encoding='utf-8', stdout=subprocess.PIPE,