From 3a7ad52dd3e3d3521ecb9df496c5a1aee3f7d814 Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Wed, 15 Oct 2025 09:48:50 +0200 Subject: [PATCH 1/4] do not modify bash flags in the activate script --- py/tools/py/src/activate.tmpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/py/tools/py/src/activate.tmpl b/py/tools/py/src/activate.tmpl index eca807a1..35165f53 100644 --- a/py/tools/py/src/activate.tmpl +++ b/py/tools/py/src/activate.tmpl @@ -1,7 +1,5 @@ # Adapted from CPython Lib/venv/scripts/common/activate -set -eu -o pipefail - deactivate () { # reset old environment variables if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then @@ -84,5 +82,3 @@ export PATH # Call hash to forget past commands. Without forgetting # past commands the $PATH changes we made may not be respected hash -r 2> /dev/null - -set +eu +o pipefail From 04914c7bdd0625b3bf86ed0b1501c4d9d30befd2 Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Wed, 15 Oct 2025 11:05:44 +0200 Subject: [PATCH 2/4] update listing --- py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml b/py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml index 94269b73..0e46991d 100644 --- a/py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml +++ b/py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml @@ -2491,7 +2491,7 @@ files: - drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/ - drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/ - drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/ - - -rwxr-xr-x 0 0 0 2853 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate + - -rwxr-xr-x 0 0 0 2811 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate - -rwxr-xr-x 0 0 0 743120 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python - -rwxr-xr-x 0 0 0 743120 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3 - -rwxr-xr-x 0 0 0 743120 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9 From bd1decfbba13b909a86bcc082cb02bf54566c437 Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Wed, 15 Oct 2025 11:32:02 +0200 Subject: [PATCH 3/4] update listing --- py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml b/py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml index 96519260..bc5825a1 100644 --- a/py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml +++ b/py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml @@ -2510,7 +2510,7 @@ files: - drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/ - drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/ - drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/ - - -rwxr-xr-x 0 0 0 2853 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate + - -rwxr-xr-x 0 0 0 2811 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/activate - -rwxr-xr-x 0 0 0 870664 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python - -rwxr-xr-x 0 0 0 870664 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3 - -rwxr-xr-x 0 0 0 870664 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/aspect_rules_py/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9 From 98dccf26f83f1f53c3b55b210f3d80a62a5a15a2 Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Wed, 15 Oct 2025 18:10:49 +0200 Subject: [PATCH 4/4] trigger CI