From 3108990fda459724bba35f1c467c24236bf30019 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 12:55:27 +0100 Subject: [PATCH 01/11] tests: fix pipenv runner Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 56f388df..2ae77823 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -37,7 +37,6 @@ pipenv_env['PIPENV_NO_INHERIT'] = '1' pipenv_env['PIPENV_NOSPIN'] = '1' - def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! call = (executable, '-m', 'pipenv', @@ -45,6 +44,9 @@ def pipenv_run(*args: str) -> CompletedProcess: print('+ ', *call, file=stderr) res = run(call, cwd=this_dir, env=pipenv_env, shell=False) # nosec:B603 if res.returncode != 0: + print('res', repr(res)) + print('call', repr(call)) + print('pipenv_env', repr(pipenv_env)) raise RuntimeError('process failed') return res From b0718cb5a2875053d79021eb37f97cb43cf0600c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:07:42 +0100 Subject: [PATCH 02/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 2ae77823..bb6a5551 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -39,14 +39,12 @@ def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! - call = (executable, '-m', 'pipenv', + call = (executable, '-m', 'pipenv', '--python', executable, *args) print('+ ', *call, file=stderr) + print('!!! DEBUG:', repr(call)) res = run(call, cwd=this_dir, env=pipenv_env, shell=False) # nosec:B603 if res.returncode != 0: - print('res', repr(res)) - print('call', repr(call)) - print('pipenv_env', repr(pipenv_env)) raise RuntimeError('process failed') return res From 23de26256b52477e14bccebd06045252ce9e4e82 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:12:23 +0100 Subject: [PATCH 03/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index bb6a5551..70198948 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -37,6 +37,7 @@ pipenv_env['PIPENV_NO_INHERIT'] = '1' pipenv_env['PIPENV_NOSPIN'] = '1' + def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! call = (executable, '-m', 'pipenv', '--python', executable, From 721933c0c591b47c491bdcd71fd208a5727a73ac Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:14:11 +0100 Subject: [PATCH 04/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 70198948..fee19ac5 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -40,7 +40,7 @@ def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! - call = (executable, '-m', 'pipenv', '--python', executable, + call = (executable, '-m', 'pipenv', *args) print('+ ', *call, file=stderr) print('!!! DEBUG:', repr(call)) From 1981c0f7dcf9b880d012e9d91a30eeb14b8254f0 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:25:12 +0100 Subject: [PATCH 05/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index fee19ac5..d1d537c5 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -23,7 +23,7 @@ from os.path import dirname, join from shutil import rmtree from subprocess import CompletedProcess, run # nosec:B404 -from sys import executable, stderr +from sys import executable, stderr, version_info from typing import Any __all__ = ['main'] @@ -38,9 +38,12 @@ pipenv_env['PIPENV_NOSPIN'] = '1' +py_version = '.'.join(map(str,version_info[:2])) +print('debug:', executable, py_version) + def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! - call = (executable, '-m', 'pipenv', + call = (executable, '-m', 'pipenv', '--python', py_version, *args) print('+ ', *call, file=stderr) print('!!! DEBUG:', repr(call)) From 879bd758d44f43615ecf6925b200bf577c9aca29 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:39:20 +0100 Subject: [PATCH 06/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index d1d537c5..15424767 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -38,9 +38,10 @@ pipenv_env['PIPENV_NOSPIN'] = '1' -py_version = '.'.join(map(str,version_info[:2])) +py_version = '.'.join(map(str, version_info[:2])) print('debug:', executable, py_version) + def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! call = (executable, '-m', 'pipenv', '--python', py_version, From 7997e75960dd574a3e6962fdab8b1f690c30c566 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:41:27 +0100 Subject: [PATCH 07/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 15424767..a2cb9653 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -47,7 +47,6 @@ def pipenv_run(*args: str) -> CompletedProcess: call = (executable, '-m', 'pipenv', '--python', py_version, *args) print('+ ', *call, file=stderr) - print('!!! DEBUG:', repr(call)) res = run(call, cwd=this_dir, env=pipenv_env, shell=False) # nosec:B603 if res.returncode != 0: raise RuntimeError('process failed') From d8e2a957ec20ea1f61fd15a3a677c25fd7128256 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:42:01 +0100 Subject: [PATCH 08/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index a2cb9653..3b6c63e7 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -39,7 +39,6 @@ py_version = '.'.join(map(str, version_info[:2])) -print('debug:', executable, py_version) def pipenv_run(*args: str) -> CompletedProcess: From 818f3fb1aa820aef0c508a695b02305958829e64 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:42:40 +0100 Subject: [PATCH 09/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 3b6c63e7..46e72cd4 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -38,7 +38,7 @@ pipenv_env['PIPENV_NOSPIN'] = '1' -py_version = '.'.join(map(str, version_info[:2])) +py_version = '.'.join(map(str, version_info[:3])) def pipenv_run(*args: str) -> CompletedProcess: From 0b87e65ff3fb1ff393343bec51a858f0e8488329 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:50:22 +0100 Subject: [PATCH 10/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 46e72cd4..91a10ca6 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -36,14 +36,12 @@ pipenv_env['PIPENV_IGNORE_VIRTUALENVS'] = '1' pipenv_env['PIPENV_NO_INHERIT'] = '1' pipenv_env['PIPENV_NOSPIN'] = '1' - - -py_version = '.'.join(map(str, version_info[:3])) +pipenv_env['PIPENV_PYTHON'] = executable def pipenv_run(*args: str) -> CompletedProcess: # pipenv is not API, but a CLI -- call it like that! - call = (executable, '-m', 'pipenv', '--python', py_version, + call = (executable, '-m', 'pipenv', *args) print('+ ', *call, file=stderr) res = run(call, cwd=this_dir, env=pipenv_env, shell=False) # nosec:B603 From a9b10f6a569600c5d2bf7a150e74ffdea14712b1 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 28 Oct 2026 13:50:58 +0100 Subject: [PATCH 11/11] wip Signed-off-by: Jan Kowalleck --- tests/_data/infiles/environment/via-pipenv/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_data/infiles/environment/via-pipenv/init.py b/tests/_data/infiles/environment/via-pipenv/init.py index 91a10ca6..8abccc41 100644 --- a/tests/_data/infiles/environment/via-pipenv/init.py +++ b/tests/_data/infiles/environment/via-pipenv/init.py @@ -23,7 +23,7 @@ from os.path import dirname, join from shutil import rmtree from subprocess import CompletedProcess, run # nosec:B404 -from sys import executable, stderr, version_info +from sys import executable, stderr from typing import Any __all__ = ['main']