From 8a4a1c5702a5ea4936eb20204297045223a1d82f Mon Sep 17 00:00:00 2001 From: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> Date: Tue, 25 Jan 2022 11:20:41 +0100 Subject: [PATCH 1/4] don't read setuptools warnings in build_requires.py --- src/tox/package/builder/isolated.py | 3 ++- src/tox/venv.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tox/package/builder/isolated.py b/src/tox/package/builder/isolated.py index b2cf05e06..7e1ae5547 100644 --- a/src/tox/package/builder/isolated.py +++ b/src/tox/package/builder/isolated.py @@ -145,5 +145,6 @@ def get_build_requires(build_info, package_venv, setup_dir): returnout=True, action=action, cwd=setup_dir, + capture_err=False, ) - return json.loads(result.split("\n")[-2]) + return json.loads(result.strip().split("\n")[-1]) diff --git a/src/tox/venv.py b/src/tox/venv.py index 87e01656e..13235c8a9 100644 --- a/src/tox/venv.py +++ b/src/tox/venv.py @@ -583,6 +583,7 @@ def _pcall( ignore_ret=False, returnout=False, env=None, + capture_err=True, ): if env is None: env = self._get_os_environ(is_test_command=is_test_command) @@ -618,6 +619,7 @@ def _pcall( ignore_ret=ignore_ret, returnout=returnout, report_fail=not is_test_command, + capture_err=capture_err, ) def setupenv(self): From a478e0fd4828ffdef97403463cbf409d5949e30b Mon Sep 17 00:00:00 2001 From: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> Date: Tue, 25 Jan 2022 11:33:53 +0100 Subject: [PATCH 2/4] update changelog.rst --- docs/changelog.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index f2a927e86..4083f8830 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -11,6 +11,14 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +v3.24.6 +Bugfixes +^^^^^^^^ + +- Fixed failing isolated_build because of setuptools warning. -- by :user:`zariiii9003` + `#2333 `_ + + v3.24.5 (2021-12-29) Bugfixes ^^^^^^^^ From d6e3d05db20a6dbe4c83bbdd7440fb92e6cef7a0 Mon Sep 17 00:00:00 2001 From: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> Date: Tue, 25 Jan 2022 11:53:32 +0100 Subject: [PATCH 3/4] Incorporate feedback --- docs/changelog.rst | 8 -------- docs/changelog/2332.bugfix.rst | 2 ++ src/tox/package/builder/isolated.py | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) create mode 100644 docs/changelog/2332.bugfix.rst diff --git a/docs/changelog.rst b/docs/changelog.rst index 4083f8830..f2a927e86 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -11,14 +11,6 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start -v3.24.6 -Bugfixes -^^^^^^^^ - -- Fixed failing isolated_build because of setuptools warning. -- by :user:`zariiii9003` - `#2333 `_ - - v3.24.5 (2021-12-29) Bugfixes ^^^^^^^^ diff --git a/docs/changelog/2332.bugfix.rst b/docs/changelog/2332.bugfix.rst new file mode 100644 index 000000000..bd9e20b1b --- /dev/null +++ b/docs/changelog/2332.bugfix.rst @@ -0,0 +1,2 @@ +Fixed failing isolated_build because setuptools warning was captured +in ``build_requires``. -- by :user:`zariiii9003` \ No newline at end of file diff --git a/src/tox/package/builder/isolated.py b/src/tox/package/builder/isolated.py index 7e1ae5547..1b3f6f491 100644 --- a/src/tox/package/builder/isolated.py +++ b/src/tox/package/builder/isolated.py @@ -147,4 +147,4 @@ def get_build_requires(build_info, package_venv, setup_dir): cwd=setup_dir, capture_err=False, ) - return json.loads(result.strip().split("\n")[-1]) + return json.loads(result.split("\n")[-2]) From 9a9a2937ddd96b6193658d35b2b7005be0cdd537 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 10:54:04 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/changelog/2332.bugfix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog/2332.bugfix.rst b/docs/changelog/2332.bugfix.rst index bd9e20b1b..6c297563a 100644 --- a/docs/changelog/2332.bugfix.rst +++ b/docs/changelog/2332.bugfix.rst @@ -1,2 +1,2 @@ Fixed failing isolated_build because setuptools warning was captured -in ``build_requires``. -- by :user:`zariiii9003` \ No newline at end of file +in ``build_requires``. -- by :user:`zariiii9003`