From 97d29447e7b482de0cdadbf7ef526088cda97e03 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Wed, 23 Sep 2026 18:14:20 +0100 Subject: [PATCH 1/3] Correctly exclude arcat when it's in a non-standard location with an in-repo interpreter --- ChangeLog | 4 ++++ VERSION | 2 +- build_defs/python.build_defs | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11120d6..5dccefd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2.1.3 +------------- + * Correctly exclude arcat when it's in a non-standard location with an in-repo interpreter + Version 2.1.2 ------------- * Handle 'stub' modules that don't have a __spec__ (#328) diff --git a/VERSION b/VERSION index eca07e4..ac2cdeb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.2 +2.1.3 diff --git a/build_defs/python.build_defs b/build_defs/python.build_defs index 97af2a5..6b5dbed 100644 --- a/build_defs/python.build_defs +++ b/build_defs/python.build_defs @@ -10,7 +10,7 @@ we have a fairly elaborate optimisation whereby each python_library rule builds zipfile containing just its sources, and all of those are combined at the end to produce the final .pex. This builds at roughly the same pace for a clean build of a single target, but is drastically faster for building many targets with similar dependencies or rebuilding -a target which has only had small changes. +. a target which has only had small changes. """ @@ -54,7 +54,7 @@ def python_library(name:str, srcs:list=[], resources:list=[], deps:list=[], visi cmd = ' && '.join([compile_cmd, cmd]) if looks_like_build_label(interpreter) and ('|' in interpreter): before, _, _ = interpreter.partition('|') - cmd += f' --exclude_tools="$(location {before})"' + cmd += f'--exclude_tools="$TOOLS_ARCAT" --exclude_tools="$(location {before})"' # Pre-zip the files for later collection by python_binary. zip_rule = build_rule( name=name, From 8a8d4838b88a95c36204ae409a8b118fdff189a0 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Wed, 23 Sep 2026 18:17:06 +0100 Subject: [PATCH 2/3] load-bearing space --- build_defs/python.build_defs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_defs/python.build_defs b/build_defs/python.build_defs index 6b5dbed..f95ffee 100644 --- a/build_defs/python.build_defs +++ b/build_defs/python.build_defs @@ -54,7 +54,7 @@ def python_library(name:str, srcs:list=[], resources:list=[], deps:list=[], visi cmd = ' && '.join([compile_cmd, cmd]) if looks_like_build_label(interpreter) and ('|' in interpreter): before, _, _ = interpreter.partition('|') - cmd += f'--exclude_tools="$TOOLS_ARCAT" --exclude_tools="$(location {before})"' + cmd += f' --exclude_tools="$TOOLS_ARCAT" --exclude_tools="$(location {before})"' # Pre-zip the files for later collection by python_binary. zip_rule = build_rule( name=name, From ad43235bc85fec845bb1f8939ed3053bb91bf97b Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Wed, 23 Sep 2026 18:20:36 +0100 Subject: [PATCH 3/3] can I blame the cat for this one? --- build_defs/python.build_defs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_defs/python.build_defs b/build_defs/python.build_defs index f95ffee..6cb2baa 100644 --- a/build_defs/python.build_defs +++ b/build_defs/python.build_defs @@ -10,7 +10,7 @@ we have a fairly elaborate optimisation whereby each python_library rule builds zipfile containing just its sources, and all of those are combined at the end to produce the final .pex. This builds at roughly the same pace for a clean build of a single target, but is drastically faster for building many targets with similar dependencies or rebuilding -. a target which has only had small changes. +a target which has only had small changes. """