alibuild 1.17.34a1__py3-none-any.whl → 1.17.36__py3-none-any.whl

{alibuild-1.17.34a1.dist-info → alibuild-1.17.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.34a1
+Version: 1.17.36
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -17,7 +17,7 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3<1.36.0
+Requires-Dist: boto3
 Provides-Extra: test
 Requires-Dist: tox; extra == "test"
 Provides-Extra: docs

{alibuild-1.17.34a1.dist-info → alibuild-1.17.36.dist-info}/RECORD

@@ -1,28 +1,28 @@
-alibuild-1.17.34a1.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
-alibuild-1.17.34a1.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
-alibuild-1.17.34a1.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
-alibuild-1.17.34a1.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
-alibuild-1.17.34a1.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
-alibuild-1.17.34a1.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+alibuild-1.17.36.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
+alibuild-1.17.36.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
+alibuild-1.17.36.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
+alibuild-1.17.36.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
+alibuild-1.17.36.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
+alibuild-1.17.36.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
 alibuild_helpers/__init__.py,sha256=ZAhyhRxOkiTA1fMzwEKACY8Eo8MdWp1MawVicFlvQWk,736
-alibuild_helpers/_version.py,sha256=VocJRnTsefVv_jIsw3e8gzjVm9rnZdAYPfyfpLQ8nig,716
-alibuild_helpers/analytics.py,sha256=fuiOagDngFnodGo7upMWeY-RjTTncDRz5Kwz8zxUr9o,4579
-alibuild_helpers/args.py,sha256=T0nOOMCpJZdJkEPZENz7nOsaYIfeZ7qHfAR1Vx4-T2Y,31694
-alibuild_helpers/build.py,sha256=VJj0KwRkbPs5gCj-Ey2MWhl2NTLZWql6DGwp8AO3tTA,57055
-alibuild_helpers/build_template.sh,sha256=yx1YEQN5tdfQNmZfsEnn-FxbzBIpvYwYRQkQLKmm8uo,14011
-alibuild_helpers/clean.py,sha256=-LeQUYDwxihzGJi4rCiuALu051T44-0cV8S6-l_lCaQ,3250
-alibuild_helpers/cmd.py,sha256=5tdxtyrHDzmdSVIA0pzxBoici1GZDS0fUStbX85r6ao,5906
-alibuild_helpers/deps.py,sha256=nHLyNqVuTUfW5bqfzCDxAaVVsklv5wHMl4FMMfTQF-8,4909
-alibuild_helpers/doctor.py,sha256=CSvfwmD28NRmvSnmZRTHWaf11pAoSIlMxJ1yW00Xh9c,9685
+alibuild_helpers/_version.py,sha256=7YOMYiZjmL0E_RF1eyvrcHHewMhpFYPcPSSKjeCvW00,708
+alibuild_helpers/analytics.py,sha256=9rayt7cSGffVf9gbowdFOw81Tqn6AgEoEOCLcPuf_B4,4593
+alibuild_helpers/args.py,sha256=CbxzJ8uW-wQ8e2R9WRrAspn2mBCUHuQ1ZreUHLX0T3I,31883
+alibuild_helpers/build.py,sha256=1AQe6NMp-x7PhEbStchmiYXY_1VC46-M9zGxaMdv9iI,59395
+alibuild_helpers/build_template.sh,sha256=h2iY6UkhE5KDEnqFrG2OAR3fLyKPIDTGIB1_4nZKe4A,14638
+alibuild_helpers/clean.py,sha256=-G_N3pEMp8ecTQS7TceFT1p0_j1QABFbZb-4XVMF0po,3233
+alibuild_helpers/cmd.py,sha256=KYyGktQlMffu7HnIs0aaBwNzQDPXytkjjNI37n3XNU8,5783
+alibuild_helpers/deps.py,sha256=YPY9QUyvz_Dw3qWP4B4CsmWpyuUvh2MQq74OBzpYQkM,4891
+alibuild_helpers/doctor.py,sha256=gqSeUmEGncMjSXWTHyCrG7LiC8uQK0c8LByF7FkJ2mU,9684
 alibuild_helpers/git.py,sha256=20JDRZX0wbJdsK__AI_nnS2rQmgElrMMD-OT6TDHCUU,4015
 alibuild_helpers/init.py,sha256=x7OAErHzn34ceNqg-0GuHudYigh18Mk-P3RhN2P5mEI,5088
-alibuild_helpers/log.py,sha256=OEflXNcGNgvVYLZbvVwd2Inyt12tnEw5RgkrsiAT2c0,4700
-alibuild_helpers/scm.py,sha256=pZfEnTgr_ILmtRT3BXeoYVJGq9rjigLXOLAGJMsnDko,1019
-alibuild_helpers/sl.py,sha256=Aw3-Lvq3bQ2s_KTw6PXgqcjSoY-s8_0A55GRPKks4x0,2915
-alibuild_helpers/sync.py,sha256=vfny1ZF_YahzlSSEtYOq1KFvQLj_ce7MZlV2KDk1-xg,32296
+alibuild_helpers/log.py,sha256=zdSUDDxiKkC3lr_XIp2eDACx9kbjN6wswP-gBGIu0sk,4704
+alibuild_helpers/scm.py,sha256=hjVASxDVuZg_eUGMyXg5icdt2X9RnuLZLGUOCC_fn7g,1011
+alibuild_helpers/sl.py,sha256=erAP5uzsszo5Lk5Fhd4_SnWiczhuTxWEU9MiBG1UM94,2905
+alibuild_helpers/sync.py,sha256=-2BJc1_pxuipxpyCbmTp81s_7mU9vv1A5Sk9QHRHcy8,32709
 alibuild_helpers/templating_plugin.py,sha256=TWHdMQtDfX6Vqp5w9Huyh4ZEgLv5vYxAtPtX68xTOlk,662
-alibuild_helpers/utilities.py,sha256=nb0UC0qn2_rIJ-5GDnx-GoRAbF8tn1ELjZS-prUz9eo,26131
-alibuild_helpers/workarea.py,sha256=dYGZ7OOCg87W-njZMqX7Yu72800KZjx9v5Hg-T43juY,7442
+alibuild_helpers/utilities.py,sha256=7o1RupCbGOwib3TFaiRZMzcYTrW3wrlBrse9JrZ_NP0,26074
+alibuild_helpers/workarea.py,sha256=qYYIVyc8x5PrFpYmscr_ytI4znEVth82GVz1-dT_0JQ,7535
 debian/changelog,sha256=N-9FA5VD4VmD_tAwFfgqPqG7KUw1Jktyz14zP6aLxZs,300
 debian/compat,sha256=kX3zMg13jduqXFx3QrxARr-APDbtKwUPMIRO0gZ4NGk,3
 debian/control,sha256=UL8ZCLiCnNH75oVtldYPfrBO8DH7VxvjXPIdTCvXgPc,476
@@ -41,8 +41,8 @@ docs/docs/user.md,sha256=5o150ssZnN1Tow35OWA6Gfw3PjlhJb27ip1740hasV8,20476
 docs/docs/stylesheets/extra.css,sha256=NAFcBZQe8gh2CTpJFwyv93FvblnF5RaEjtsHxtlFD-w,215
 templates/alibuild_to_please.jnj,sha256=48SfIwq55zlb5_5lu6WAHSznXE0EfUNcHmFrmzMUSns,1723
 tests/test_analytics.py,sha256=IlxATGj-MU0sTVqpi2-EKrIhyV9C48K5IZ39kWFz-Os,1942
-tests/test_args.py,sha256=8d8BybESxbIDvEOOSHmmd2rCTgNxI_vF-sgbDojI-Fg,8867
-tests/test_build.py,sha256=5WtCmrvcG7U2i5jwBdPhMJzINsYQ6WaySEFu-TNnZHc,19017
+tests/test_args.py,sha256=2CHYis9H9eS6XhEr7-dib-TO_U-yP93Dil1bh9Q34WA,8866
+tests/test_build.py,sha256=G0DQmv0ci_lFDFoJK2n_b-U2IjIMs7k5Tl5ptEhqXwk,19272
 tests/test_clean.py,sha256=Zm3gjtO8Pgl27xUzQIHeGqpe05YMVXZp6Sua59prvcE,7492
 tests/test_cmd.py,sha256=SsWWasMrhbIu9Lqyr_wpuvDjg72ACJ1H_zDlTnybBuE,5049
 tests/test_deps.py,sha256=bLDFuqLRJiCW4U71dzXYM0Niv-skQXSsKGb6LXGVsZ0,2113
@@ -52,10 +52,10 @@ tests/test_hashing.py,sha256=oAggZlZp-rZz5MRj4RBD5UZUxV0uNQOtVw47y-LHwt4,2941
 tests/test_init.py,sha256=y1n16H5JoYAyIihqQglVmPrIsz7VVqyjRz_XdDs4XZM,4281
 tests/test_log.py,sha256=5eA0lfFHyX4KOMkfQSsbNw9wAbh7t-KuOfvaFMaM0qg,1884
 tests/test_packagelist.py,sha256=MlVParqXn7zQXX3OTjHhY7sFvfgAoH-jWBMJlmsB5ls,8755
-tests/test_parseRecipe.py,sha256=Ar1SWWd-NLC6ZAs180RcHC3UPyWc1ItzIP9S57ADNM4,4982
+tests/test_parseRecipe.py,sha256=dKnKixGWSqKjigOh3Hth7l24q9Dry1npLAYdWdopj94,4966
 tests/test_sync.py,sha256=ispdYLvTIvoG_EnsNZWb-gI-hzt7cgjxns3ghpraepE,14014
-tests/test_utilities.py,sha256=VfAu0oEWkO6YmOG4nZxA4YC3KViLGJZ79EJiapk88Rg,20497
-tests/test_workarea.py,sha256=RIbo9b4hckkf9jmsS2NwfdcRU20QRUF_Kjjc-IlK2GU,4897
+tests/test_utilities.py,sha256=PXZ-An-CxOwEgs87uSpO7Vi605xxTcPSCNjbdyVojuQ,20457
+tests/test_workarea.py,sha256=BoEmOyIbo6CBtq8S5eJTbUpGWhegMwQCs4gQKmjNKcQ,6280
 tests/testdist/broken1.sh,sha256=zdbBCVA9ThnK14Lu9Nm6Firw2EcnRF7budMA3xrcYEg,7
 tests/testdist/broken2.sh,sha256=9S1xEQPVCkN4MMb7zQT7S6tJoPgvbSbRx5HG6EiN0JA,4
 tests/testdist/broken3.sh,sha256=1Zs7ajCIndFPYCQdSjg913x5gNBYakUehTUXLpMQSEU,18
@@ -67,7 +67,7 @@ tests/testdist/clobber-initdotsh.sh,sha256=K4L8hiEgNg0hI2WAiEA65rWU5sp-fwOYkubpV
 tests/testdist/defaults-o2.sh,sha256=IJWVMYjQYz876twos1bj-5VnPv7WTdM0X-fd09j4xxM,325
 tests/testdist/delete-etc.sh,sha256=NFMApyWMLQu3HJMsx0x8ZEveCaXbosO6XzJk8KDRJdg,63
 tests/testdist/tracking-env.sh,sha256=3cJszuzJ5dxNYvHO4ydUOWIXwmMS7wfeb-JBCDK21O4,119
-alibuild-1.17.34a1.dist-info/METADATA,sha256=OuTpzuSDMKM7ef1OpQAOCZwkpNkMlO9VD9XjD_dPjQ0,2718
-alibuild-1.17.34a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alibuild-1.17.34a1.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
-alibuild-1.17.34a1.dist-info/RECORD,,
+alibuild-1.17.36.dist-info/METADATA,sha256=sAhP4xWSWPvLzesPTCKKHt03VSo4uRoqFJjWZBIcapQ,2709
+alibuild-1.17.36.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+alibuild-1.17.36.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
+alibuild-1.17.36.dist-info/RECORD,,

{alibuild-1.17.34a1.dist-info → alibuild-1.17.36.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

alibuild_helpers/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.34a1'
-__version_tuple__ = version_tuple = (1, 17, 34, 'a1')
+__version__ = version = '1.17.36'
+__version_tuple__ = version_tuple = (1, 17, 36)
 
 __commit_id__ = commit_id = None

alibuild_helpers/analytics.py

@@ -72,7 +72,7 @@ def report(eventType, **metadata):
   ostype = "Macintosh" if architecture.startswith("osx") else "Linux"
   osversion, osprocessor = architecture.split("_", 1)
   args = ["curl", "--max-time", "5",
-          "--user-agent", "aliBuild/%s (%s; %s %s) Python/%s" % (
+          "--user-agent", "aliBuild/{} ({}; {} {}) Python/{}".format(
                                                     os.environ["ALIBUILD_VERSION"],
                                                     ostype,
                                                     osprocessor,
@@ -89,7 +89,7 @@ def report(eventType, **metadata):
            "https://www.google-analytics.com/collect"]
   try:
     subprocess.Popen(args)
-  except:
+  except Exception:
     pass
 
 def report_event(category, action, label = "", value = None):

alibuild_helpers/args.py

@@ -206,6 +206,8 @@ def doParseArgs():
                            help=("Assume we're not building %(metavar)s and all its (unique) dependencies. "
                                  "You can specify this option multiple times or separate multiple arguments "
                                  "with commas."))
+  deps_parser.add_argument("-e", dest="environment", action="append", default=[],
+                           help="KEY=VALUE binding to add to the environment. May be specified multiple times.")
 
   deps_graph = deps_parser.add_argument_group(title="Customise graph output")
   deps_graph.add_argument("--neat", dest="neat", action="store_true",
@@ -482,7 +484,7 @@ def finaliseArgs(args, parser):
       else:
         args.develPrefix = basename(dirname(abspath(args.configDir)))
     if getattr(args, "docker", False):
-      args.develPrefix = "%s-%s" % (args.develPrefix, args.architecture) if "develPrefix" in args else args.architecture
+      args.develPrefix = f"{args.develPrefix}-{args.architecture}" if "develPrefix" in args else args.architecture
 
   if args.action == "init":
     args.configDir = args.configDir % {"prefix": args.develPrefix + "/"}

alibuild_helpers/build.py

@@ -1,5 +1,6 @@
 from os.path import abspath, exists, basename, dirname, join, realpath
 from os import makedirs, unlink, readlink, rmdir
+from pathlib import Path
 from alibuild_helpers import __version__
 from alibuild_helpers.analytics import report_event
 from alibuild_helpers.log import debug, info, banner, warning
@@ -19,7 +20,6 @@ from alibuild_helpers.sync import remote_from_url
 from alibuild_helpers.workarea import logged_scm, updateReferenceRepoSpec, checkout_sources
 from alibuild_helpers.log import ProgressPrint, log_current_package
 from glob import glob
-from textwrap import dedent
 from collections import OrderedDict
 from shlex import quote
 import tempfile
@@ -31,6 +31,7 @@ import socket
 import os
 import re
 import shutil
+import sys
 import time
 
 
@@ -43,7 +44,7 @@ def writeAll(fn, txt) -> None:
 def readHashFile(fn):
   try:
     return open(fn).read().strip("\n")
-  except IOError:
+  except OSError:
     return "0"
 
 
@@ -55,11 +56,9 @@ def update_git_repos(args, specs, buildOrder):
     """
 
     def update_repo(package, git_prompt):
-        specs[package]["scm"] = Git()
-        if specs[package]["is_devel_pkg"]:
-            specs[package]["source"] = os.path.join(os.getcwd(), specs[package]["package"])
-            if exists(os.path.join(specs[package]["source"], ".sl")) or exists(os.path.join(specs[package]["source"], ".git/sl")):
-                specs[package]["scm"] = Sapling()
+        # Note: spec["scm"] should already be initialized before this is called
+        # This function just updates the repository and fetches refs
+        assert "scm" in specs[package], f"specs[{package!r}] has no scm key"
         updateReferenceRepoSpec(args.referenceSources, package, specs[package],
                                 fetch=args.fetchRepos, allowGitPrompt=git_prompt)
 
@@ -195,7 +194,7 @@ def storeHashes(package, specs, considerRelocation):
       # spec["env"] is of type OrderedDict[str, str].
       # spec["*_path"] are of type OrderedDict[str, list[str]].
       assert isinstance(spec[key], OrderedDict), \
-        "spec[%r] was of type %r" % (key, type(spec[key]))
+        f"spec[{key!r}] was of type {type(spec[key])!r}"
 
       # Python 3.12 changed the string representation of OrderedDicts from
       # OrderedDict([(key, value)]) to OrderedDict({key: value}), so to remain
@@ -204,7 +203,7 @@ def storeHashes(package, specs, considerRelocation):
       h_all(", ".join(
         # XXX: We still rely on repr("str") being "'str'",
         # and on repr(["a", "b"]) being "['a', 'b']".
-        "(%r, %r)" % (key, value)
+        f"({key!r}, {value!r})"
         for key, value in spec[key].items()
       ))
       h_all("])")
@@ -272,7 +271,7 @@ def hash_local_changes(spec):
   h = Hasher()
   if "track_env" in spec:
     assert isinstance(spec["track_env"], OrderedDict), \
-        "spec[%r] was of type %r" % ("track_env", type(spec["track_env"]))
+        "spec[{!r}] was of type {!r}".format("track_env", type(spec["track_env"]))
 
     # Python 3.12 changed the string representation of OrderedDicts from
     # OrderedDict([(key, value)]) to OrderedDict({key: value}), so to remain
@@ -281,7 +280,7 @@ def hash_local_changes(spec):
     h(", ".join(
         # XXX: We still rely on repr("str") being "'str'",
         # and on repr(["a", "b"]) being "['a', 'b']".
-        "(%r, %r)" % (key, value) for key, value in spec["track_env"].items()))
+        f"({key!r}, {value!r})" for key, value in spec["track_env"].items()))
     h("])")
   def hash_output(msg, args):
     lines = msg % args
@@ -365,6 +364,7 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
       commit_hash=quote(spec["commit_hash"]),
     ) for line in (
       'export {bigpackage}_ROOT="$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/{package}/{version}-{revision}',
+      'export RECC_PREFIX_MAP="${bigpackage}_ROOT=/recc/{bigpackage}_ROOT:$RECC_PREFIX_MAP"',
       "export {bigpackage}_VERSION={version}",
       "export {bigpackage}_REVISION={revision}",
       "export {bigpackage}_HASH={hash}",
@@ -380,12 +380,12 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
     # First, output a sensible error message if types are wrong.
     for key in ("env", "append_path", "prepend_path"):
       dieOnError(not isinstance(spec.get(key, {}), dict),
-                 "Tag `%s' in %s should be a dict." % (key, package))
+                 f"Tag `{key}' in {package} should be a dict.")
 
     # Set "env" variables.
     # We only put the values in double-quotes, so that they can refer to other
     # shell variables or do command substitution (e.g. $(brew --prefix ...)).
-    lines.extend('export {}="{}"'.format(key, value)
+    lines.extend(f'export {key}="{value}"'
                  for key, value in spec.get("env", {}).items()
                  if key != "DYLD_LIBRARY_PATH")
 
@@ -402,7 +402,7 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
     # By default we add the .../bin directory to PATH and .../lib to LD_LIBRARY_PATH.
     # Prepend to these paths, so that our packages win against system ones.
     for key, value in (("PATH", "bin"), ("LD_LIBRARY_PATH", "lib")):
-      prepend_path.setdefault(key, []).insert(0, "${}_ROOT/{}".format(bigpackage, value))
+      prepend_path.setdefault(key, []).insert(0, f"${bigpackage}_ROOT/{value}")
     lines.extend('export {key}="{value}${{{key}+:${key}}}"'
                  .format(key=key, value=":".join(value))
                  for key, value in prepend_path.items()
@@ -482,12 +482,17 @@ def doBuild(args, parser):
 
   makedirs(join(workDir, "SPECS"), exist_ok=True)
 
-  # If the alidist workdir contains a .sl directory, we use Sapling as SCM.
-  # Otherwise, we default to git (without checking for the actual presence of
-  # .git). We mustn't check for a .git directory, because some tests use a
-  # subdirectory of the alibuild source tree as the "alidist" checkout, and
-  # that won't have a .git directory.
-  scm = exists("%s/.sl" % args.configDir) and Sapling() or Git()
+  # If the alidist workdir contains a .sl directory (or .git/sl for git repos
+  # with Sapling enabled), we use Sapling as SCM. Otherwise, we default to git
+  # (without checking for the actual presence of .git). We mustn't check for a
+  # .git directory, because some tests use a subdirectory of the alibuild source
+  # tree as the "alidist" checkout, and that won't have a .git directory.
+  config_path = Path(args.configDir)
+  has_sapling = (config_path / ".sl").exists() or (config_path / ".git" / "sl").exists()
+  if has_sapling and shutil.which("sl"):
+    scm = Sapling()
+  else:
+    scm = Git()
   try:
     checkedOutCommitName = scm.checkedOutCommitName(directory=args.configDir)
   except SCMError:
@@ -563,13 +568,13 @@ def doBuild(args, parser):
     del develCandidates, develCandidatesUpper, develPkgsUpper
 
   if buildOrder:
-    if args.onlyDeps: 
+    if args.onlyDeps:
       builtPackages = buildOrder[:-1]
     else:
       builtPackages = buildOrder
     if len(builtPackages) > 1:
       banner("Packages will be built in the following order:\n - %s",
-             "\n - ".join(x+" (development package)" if x in develPkgs else "%s@%s" % (x, specs[x]["tag"])
+             "\n - ".join(x+" (development package)" if x in develPkgs else "{}@{}".format(x, specs[x]["tag"])
                           for x in builtPackages if x != "defaults-release"))
     else:
       banner("No dependencies of package %s to build.", buildOrder[-1])
@@ -587,11 +592,18 @@ def doBuild(args, parser):
 
   for pkg, spec in specs.items():
     spec["is_devel_pkg"] = pkg in develPkgs
-    spec["scm"] = Git()
     if spec["is_devel_pkg"]:
-      spec["source"] = os.path.join(os.getcwd(), pkg)
-    if "source" in spec and exists(os.path.join(spec["source"], ".sl")):
-      spec["scm"] = Sapling()
+      spec["source"] = str(Path.cwd() / pkg)
+
+    # Only initialize Sapling if it's in PATH and the repo uses it
+    use_sapling = False
+    if "source" in spec:
+        source_path = Path(spec["source"])
+        has_sapling = ( (source_path / ".sl").exists() or (source_path / ".git" / "sl").exists() )
+        if has_sapling and shutil.which("sl"):
+            use_sapling = True
+    spec["scm"] = Sapling() if use_sapling else Git()
+
     reference_repo = join(os.path.abspath(args.referenceSources), pkg.lower())
     if exists(reference_repo):
       spec["reference"] = reference_repo
@@ -817,7 +829,7 @@ def doBuild(args, parser):
       develPrefix = possibleDevelPrefix
 
     if possibleDevelPrefix:
-      spec["build_family"] = "%s-%s" % (possibleDevelPrefix, args.defaults)
+      spec["build_family"] = f"{possibleDevelPrefix}-{args.defaults}"
     else:
       spec["build_family"] = args.defaults
     if spec["package"] == mainPackage:
@@ -937,7 +949,7 @@ def doBuild(args, parser):
 
     # Now that we have all the information about the package we want to build, let's
     # check if it wasn't built / unpacked already.
-    hashPath= "%s/%s/%s/%s-%s" % (workDir,
+    hashPath= "{}/{}/{}/{}-{}".format(workDir,
                                   args.architecture,
                                   spec["package"],
                                   spec["version"],
@@ -980,12 +992,12 @@ def doBuild(args, parser):
           unlink(join(buildWorkDir, "BUILD", spec["package"] + "-latest"))
           if "develPrefix" in args:
             unlink(join(buildWorkDir, "BUILD", spec["package"] + "-latest-" + args.develPrefix))
-        except:
+        except Exception:
           pass
         try:
           rmdir(join(buildWorkDir, "BUILD"))
           rmdir(join(workDir, "INSTALLROOT"))
-        except:
+        except Exception:
           pass
       continue
 
@@ -1008,15 +1020,10 @@ def doBuild(args, parser):
 
     # The actual build script.
     debug("spec = %r", spec)
-
-    cmd_raw = ""
-    try:
-      fp = open(dirname(realpath(__file__))+'/build_template.sh', 'r')
-      cmd_raw = fp.read()
-      fp.close()
-    except:
-      from pkg_resources import resource_string
-      cmd_raw = resource_string("alibuild_helpers", 'build_template.sh')
+    
+    fp = open(dirname(realpath(__file__))+'/build_template.sh')
+    cmd_raw = fp.read()
+    fp.close()
 
     if args.docker:
       cachedTarball = re.sub("^" + workDir, "/sw", spec["cachedTarball"])
@@ -1030,7 +1037,7 @@ def doBuild(args, parser):
                      spec["version"] + "-" + spec["revision"])
 
     makedirs(scriptDir, exist_ok=True)
-    writeAll("%s/%s.sh" % (scriptDir, spec["package"]), spec["recipe"])
+    writeAll("{}/{}.sh".format(scriptDir, spec["package"]), spec["recipe"])
     writeAll("%s/build.sh" % scriptDir, cmd_raw % {
       "provenance": create_provenance_info(spec["package"], specs, args),
       "initdotsh_deps": generate_initdotsh(p, specs, args.architecture, post_build=False),
@@ -1093,7 +1100,7 @@ def doBuild(args, parser):
         scriptDir=quote(scriptDir),
         extraArgs=" ".join(map(quote, args.docker_extra_args)),
         additionalEnv=" ".join(
-          "-e {}={}".format(var, quote(value)) for var, value in buildEnvironment),
+          f"-e {var}={quote(value)}" for var, value in buildEnvironment),
         # Used e.g. by O2DPG-sim-tests to find the O2DPG repository.
         develVolumes=" ".join(
           '-v "$PWD/$(readlink {pkg} || echo {pkg})":/{pkg}:rw'.format(pkg=quote(spec["package"]))
@@ -1105,12 +1112,14 @@ def doBuild(args, parser):
       )
     else:
       os.environ.update(buildEnvironment)
-      build_command = "%s -e -x %s/build.sh 2>&1" % (BASH, quote(scriptDir))
+      build_command = f"{BASH} -e -x {quote(scriptDir)}/build.sh 2>&1"
 
     debug("Build command: %s", build_command)
+    progress_msg = "Unpacking %s@%s" if cachedTarball else "Compiling %s@%s"
+    if not cachedTarball and not args.debug:
+      progress_msg += " (use --debug for full output)"
     progress = ProgressPrint(
-      ("Unpacking %s@%s" if cachedTarball else
-       "Compiling %s@%s (use --debug for full output)") %
+      progress_msg %
       (spec["package"],
        args.develPrefix if "develPrefix" in args and spec["is_devel_pkg"] else spec["version"])
     )
@@ -1127,51 +1136,100 @@ def doBuild(args, parser):
     if spec["is_devel_pkg"]:
       updatablePkgs.append(spec["package"])
 
-    buildErrMsg = dedent("""\
-    Error while executing {sd}/build.sh on `{h}'.
-    Log can be found in {w}/BUILD/{p}-latest{devSuffix}/log
-    Please upload it to CERNBox/Dropbox if you intend to request support.
-    Build directory is {w}/BUILD/{p}-latest{devSuffix}/{p}.
-    """).format(
-      h=socket.gethostname(),
-      sd=scriptDir,
-      w=buildWorkDir,
-      p=spec["package"],
-      devSuffix="-" + args.develPrefix
-      if "develPrefix" in args and spec["is_devel_pkg"]
-      else "",
-    )
-    if updatablePkgs:
-      buildErrMsg += dedent("""
-      Note that you have packages in development mode.
-      Devel sources are not updated automatically, you must do it by hand.\n
-      This problem might be due to one or more outdated devel sources.
-      To update all development packages required for this build it is usually sufficient to do:
-      """)
-      buildErrMsg += "".join("\n  ( cd %s && git pull --rebase )" % dp for dp in updatablePkgs)
+    # Determine paths
+    devSuffix = "-" + args.develPrefix if "develPrefix" in args and spec["is_devel_pkg"] else ""
+    log_path = f"{buildWorkDir}/BUILD/{spec['package']}-latest{devSuffix}/log"
+    build_dir = f"{buildWorkDir}/BUILD/{spec['package']}-latest{devSuffix}/{spec['package']}"
+
+    # Use relative paths if we're inside the work directory
+    try:
+      from os.path import relpath
+      log_path = relpath(log_path, os.getcwd())
+      build_dir = relpath(build_dir, os.getcwd())
+    except (ValueError, OSError):
+      pass  # Keep absolute paths if relpath fails
+
+    # Color codes for error message (if TTY)
+    bold = "\033[1m" if sys.stderr.isatty() else ""
+    red = "\033[31m" if sys.stderr.isatty() else ""
+    reset = "\033[0m" if sys.stderr.isatty() else ""
+
+    # Build the error message
+    devel_note = " (development package)" if spec["is_devel_pkg"] else ""
+    buildErrMsg = f"{red}{bold}BUILD FAILED:{reset} {spec['package']}@{spec['version']}{devel_note}\n"
+    buildErrMsg += "=" * 70 + "\n\n"
+
+    buildErrMsg += f"{bold}Log File:{reset}\n"
+    buildErrMsg += f"  {log_path}\n\n"
+
+    buildErrMsg += f"{bold}Build Directory:{reset}\n"
+    buildErrMsg += f"  {build_dir}\n"
 
     # Gather build info for the error message
     try:
+      detected_arch = detectArch()
+
+      # Only show safe arguments (no tokens/secrets) in CLI-usable format
       safe_args = {
         "pkgname", "defaults", "architecture", "forceUnknownArch",
         "develPrefix", "jobs", "noSystem", "noDevel", "forceTracked", "plugin",
         "disable", "annotate", "onlyDeps", "docker"
-          }
-      args_str = " ".join(f"--{k}={v}" for k, v in vars(args).items() if v and k in safe_args)
-      detected_arch = detectArch()
-      buildErrMsg += dedent(f"""
-      Build info:
-      OS: {detected_arch}
-      Using aliBuild from alibuild@{__version__ or "unknown"} recipes in alidist@{os.environ["ALIBUILD_ALIDIST_HASH"][:10]}
-      Build arguments: {args_str}
-      """)
+      }
+      
+      cli_args = []
+      for k, v in vars(args).items():
+        if not v or k not in safe_args:
+          continue
+        
+        # Format based on type for CLI usage
+        if isinstance(v, bool):
+          if v:  # Only show if True
+            cli_args.append(f"--{k}")
+        elif isinstance(v, list):
+          if v:  # Only show non-empty lists
+            # For lists, use multiple --flag value or --flag=val1,val2
+            for item in v:
+              cli_args.append(f"--{k}={quote(str(item))}")
+        else:
+          # Quote if needed
+          cli_args.append(f"--{k}={quote(str(v))}")
+      
+      args_str = " ".join(cli_args)
+
+      buildErrMsg += f"\n{bold}Environment:{reset}\n"
+      buildErrMsg += f"  OS: {detected_arch}\n"
+      buildErrMsg += f"  aliBuild: {__version__ or 'unknown'} (alidist@{os.environ['ALIBUILD_ALIDIST_HASH'][:10]})\n"
 
       if detected_arch.startswith("osx"):
-        buildErrMsg += f'XCode version: {getstatusoutput("xcodebuild -version")[1]}'
+        xcode_info = getstatusoutput("xcodebuild -version")[1]
+        # Combine XCode version lines into one
+        xcode_lines = xcode_info.strip().split('\n')
+        if len(xcode_lines) >= 2:
+          xcode_str = f"{xcode_lines[0]} ({xcode_lines[1]})"
+        else:
+          xcode_str = xcode_lines[0] if xcode_lines else "Unknown"
+        buildErrMsg += f"  XCode: {xcode_str}\n"
+
+      buildErrMsg += f"  Arguments: {args_str}\n"
 
     except Exception as exc:
       warning("Failed to gather build info", exc_info=exc)
 
+    # Add note about development packages if applicable
+    if updatablePkgs:
+      buildErrMsg += f"\n{bold}Development Packages:{reset}\n"
+      buildErrMsg += "  Development sources are not updated automatically.\n"
+      buildErrMsg += "  This may be due to outdated sources. To update:\n"
+      buildErrMsg += "".join(f"\n    ( cd {dp} && git pull --rebase )" for dp in updatablePkgs)
+      buildErrMsg += "\n"
+
+    # Add Next Steps section
+    buildErrMsg += f"\n{bold}Next Steps:{reset}\n"
+    buildErrMsg += f"  • View error log:          cat {log_path}\n"
+    if not args.debug:
+      buildErrMsg += f"  • Rebuild with debug:      aliBuild build {spec['package']} --debug\n"
+    buildErrMsg += f"  • Please upload the full log to CERNBox/Dropbox if you intend to request support.\n"
+
 
     dieOnError(err, buildErrMsg.strip())
 

alibuild_helpers/build_template.sh

@@ -71,6 +71,16 @@ export BUILDROOT="$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGHASH"
 export SOURCEDIR="$WORK_DIR/SOURCES/$PKGNAME/$PKGVERSION/$COMMIT_HASH"
 export BUILDDIR="$BUILDROOT/$PKGNAME"
 
+# All caching for RECC should happen relative to $WORK_DIR
+export RECC_PROJECT_ROOT=$WORK_DIR
+export RECC_WORKING_DIR_PREFIX=$WORK_DIR
+# Moreover we allow caching stuff across different builds of the same
+# package, but not across packages.
+export RECC_PREFIX_MAP=$BUILDDIR=/recc/BUILDDIR-$PKGNAME:$INSTALLROOT=/recc/INSTALLROOT-$PKGNAME:$SOURCEDIR=/recc/SOURCEDIR-$PKGNAME
+#export RECC_PREFIX_MAP=$RECC_PREFIX_MAP:$(readlink $BUILDDIR)=/recc/BUILDDIR-$PKGNAME:$(readlink $INSTALLROOT)=/recc/INSTALLROOT-$PKGNAME:$(readlink $SOURCEDIR)=/recc/SOURCEDIR-$PKGNAME
+# No point in mixing packages
+export RECC_ACTION_SALT="$PKGNAME"
+
 rm -fr "$WORK_DIR/INSTALLROOT/$PKGHASH"
 # We remove the build directory only if we are not in incremental mode.
 if [[ "$INCREMENTAL_BUILD_HASH" == 0 ]] && ! rm -rf "$BUILDROOT"; then

alibuild_helpers/clean.py

@@ -43,13 +43,13 @@ def decideClean(workDir, architecture, aggressiveCleanup):
   # we do not need the actual tarballs after they have been built.
   toDelete = ["%s/TMP" % workDir, "%s/INSTALLROOT" % workDir]
   if aggressiveCleanup:
-    toDelete += ["%s/TARS/%s/store" % (workDir, architecture),
+    toDelete += [f"{workDir}/TARS/{architecture}/store",
                  "%s/SOURCES" % (workDir)]
   allBuildStuff = glob.glob("%s/BUILD/*" % workDir)
   toDelete += [x for x in allBuildStuff
                if not path.islink(x) and basename(x) not in symlinksBuild]
-  installGlob ="%s/%s/*/" % (workDir, architecture)
-  installedPackages = set([dirname(x) for x in glob.glob(installGlob)])
+  installGlob =f"{workDir}/{architecture}/*/"
+  installedPackages = {dirname(x) for x in glob.glob(installGlob)}
   symlinksInstall = []
   for x in installedPackages:
     symlinksInstall += [path.realpath(y) for y in glob.glob(x + "/latest*")]

alibuild_helpers/cmd.py

@@ -6,7 +6,7 @@ from textwrap import dedent
 from subprocess import TimeoutExpired
 from shlex import quote
 
-from alibuild_helpers.log import debug, warning, dieOnError
+from alibuild_helpers.log import debug, error, dieOnError
 
 def decode_with_fallback(data):
   """Try to decode DATA as utf-8; if that doesn't work, fall back to latin-1.
@@ -29,7 +29,7 @@ def getoutput(command, timeout=None):
   try:
     stdout, stderr = proc.communicate(timeout=timeout)
   except TimeoutExpired:
-    warning("Process %r timed out; terminated", command)
+    error("Process %r timed out; terminated", command)
     proc.terminate()
     stdout, stderr = proc.communicate()
   dieOnError(proc.returncode, "Command %s failed with code %d: %s" %
@@ -43,7 +43,7 @@ def getstatusoutput(command, timeout=None, cwd=None):
   try:
     merged_output, _ = proc.communicate(timeout=timeout)
   except TimeoutExpired:
-    warning("Process %r timed out; terminated", command)
+    error("Process %r timed out; terminated", command)
     proc.terminate()
     merged_output, _ = proc.communicate()
   merged_output = decode_with_fallback(merged_output)
@@ -88,14 +88,8 @@ class DockerRunner:
   def __enter__(self):
     if self._docker_image:
       # "sleep inf" pauses forever, until we kill it.
-      envOpts = []
-      volumes = []
-      for env in self._extra_env.items():
-        envOpts.append("-e")
-        envOpts.append(f"{env[0]}={env[1]}")
-      for v in self._extra_volumes:
-        volumes.append("-v")
-        volumes.append(v)
+      envOpts = [opt for k, v in self._extra_env.items() for opt in ("-e", f"{k}={v}")]
+      volumes = [opt for v in self._extra_volumes for opt in ("-v", v)]
       cmd = ["docker", "run", "--detach"] + envOpts + volumes + ["--rm", "--entrypoint="]
       cmd += self._docker_run_args
       cmd += [self._docker_image, "sleep", "inf"]
@@ -105,13 +99,13 @@ class DockerRunner:
       if self._container is None:
         command_prefix=""
         if self._extra_env:
-          command_prefix="env " + " ".join("{}={}".format(k, quote(v)) for (k,v) in self._extra_env.items()) + " "
-        return getstatusoutput("{}{} -c {}".format(command_prefix, BASH, quote(cmd))
+          command_prefix="env " + " ".join(f"{k}={quote(v)}" for (k,v) in self._extra_env.items()) + " "
+        return getstatusoutput(f"{command_prefix}{BASH} -c {quote(cmd)}"
                              , cwd=cwd)
       envOpts = []
       for env in self._extra_env.items():
         envOpts.append("-e")
-        envOpts.append("{}={}".format(env[0], env[1]))
+        envOpts.append(f"{env[0]}={env[1]}")
       exec_cmd = ["docker", "container", "exec"] + envOpts + [self._container, "bash", "-c", cmd]
       return getstatusoutput(exec_cmd, cwd=cwd)
 

alibuild_helpers/deps.py

@@ -83,18 +83,18 @@ def doDeps(args, parser):
       assert color, "This should not happen (happened for %s)" % k
 
     # Node definition
-    dot += '"%s" [shape=box, style="rounded,filled", fontname="helvetica", fillcolor=%s]\n' % (k,color)
+    dot += f'"{k}" [shape=box, style="rounded,filled", fontname="helvetica", fillcolor={color}]\n'
 
     # Connections (different whether it's a build dependency or a runtime one)
     for dep in spec["build_requires"]:
-     dot += '"%s" -> "%s" [color=grey70]\n' % (k, dep)
+     dot += f'"{k}" -> "{dep}" [color=grey70]\n'
     for dep in spec["runtime_requires"]:
-     dot += '"%s" -> "%s" [color=dodgerblue3]\n' % (k, dep)
+     dot += f'"{k}" -> "{dep}" [color=dodgerblue3]\n'
 
   dot += "}\n"
 
   if args.outdot:
-    fp = open(args.outdot, "wt")
+    fp = open(args.outdot, "w")
   else:
     fp = NamedTemporaryFile(delete=False, mode="wt")
   fp.write(dot)

alibuild_helpers/doctor.py

@@ -33,7 +33,7 @@ def checkPreferSystem(spec, cmd, homebrew_replacement, getstatusoutput_docker):
     warning("Package %s cannot be picked up from the system and will be built by aliBuild.\n"
             "This is due to the fact the following script fails:\n\n%s\n\n"
             "with the following output:\n\n%s\n",
-            spec["package"], cmd, "\n".join("%s: %s" % (spec["package"], x) for x in out.split("\n")))
+            spec["package"], cmd, "\n".join("{}: {}".format(spec["package"], x) for x in out.split("\n")))
     return (err, "")
 
 def checkRequirements(spec, cmd, homebrew_replacement, getstatusoutput_docker):
@@ -53,7 +53,7 @@ def checkRequirements(spec, cmd, homebrew_replacement, getstatusoutput_docker):
           "This is due to the fact that the following script fails:\n\n%s\n"
           "with the following output:\n\n%s\n%s\n",
           spec["package"], cmd,
-          "\n".join("%s: %s" % (spec["package"], x) for x in out.split("\n")),
+          "\n".join("{}: {}".format(spec["package"], x) for x in out.split("\n")),
           spec.get("system_requirement_missing"))
     return (err, "")
 
@@ -125,7 +125,7 @@ def doDoctor(args, parser):
   packages = []
   exitcode = 0
   for p in args.packages:
-    path = "%s/%s.sh" % (args.configDir, p.lower())
+    path = f"{args.configDir}/{p.lower()}.sh"
     if not exists(path):
       error("Cannot find recipe %s for package %s.", path, p)
       exitcode = 1
@@ -166,7 +166,7 @@ def doDoctor(args, parser):
                      taps                    = taps,
                      log                     = info)
 
-  alwaysBuilt = set(x for x in specs) - fromSystem - own - failed
+  alwaysBuilt = {x for x in specs} - fromSystem - own - failed
   if alwaysBuilt:
     banner("The following packages will be built by aliBuild because\n"
            " usage of a system version of it is not allowed or supported, by policy:\n\n- %s",

alibuild_helpers/log.py

@@ -105,7 +105,7 @@ class ProgressPrint:
       return
     self.erase()
     if msg:
-      sys.stderr.write(": %s%s\033[m" % ("\033[31m" if error else "\033[32m", msg))
+      sys.stderr.write(": {}{}\033[m".format("\033[31m" if error else "\033[32m", msg))
     sys.stderr.write("\n")
     sys.stderr.flush()
 

alibuild_helpers/scm.py

@@ -2,7 +2,7 @@ class SCMError(Exception):
   """Signal that an SCM-related error occurred."""
 
 
-class SCM(object):
+class SCM:
   def checkedOutCommitName(self, directory):
     raise NotImplementedError
   def branchOrRef(self, directory):

alibuild_helpers/sl.py

@@ -28,7 +28,7 @@ class Sapling(SCM):
         directory=quote(directory),
     ), timeout=SL_COMMAND_TIMEOUT_SEC)
     if err > 1:
-        raise SCMError("Error {} from sl bookmark -r . : {}".format(err, output))
+        raise SCMError(f"Error {err} from sl bookmark -r . : {output}")
     # We use "none" to indicate there are no bookmarks. This means
     # that a devel package will act as a single branch, regardless of where we are.
     if not output.strip():

alibuild_helpers/sync.py

@@ -114,7 +114,7 @@ class HttpRemoteSync:
           s3Request = re.match("https://s3.cern.ch/swift/v1[/]+([^/]*)/(.*)$", url)
           if s3Request:
             [bucket, prefix] = s3Request.groups()
-            url = "https://s3.cern.ch/swift/v1/%s/?prefix=%s" % (bucket, prefix.lstrip("/"))
+            url = "https://s3.cern.ch/swift/v1/{}/?prefix={}".format(bucket, prefix.lstrip("/"))
             resp = get(url, verify=not self.insecure, timeout=self.httpTimeoutSec)
             if resp.status_code == 404:
               # No need to retry any further
@@ -136,7 +136,7 @@ class HttpRemoteSync:
         if dest:
           try:
             os.unlink(dest+".tmp")
-          except:
+          except Exception:
             pass
     return None
 
@@ -165,7 +165,7 @@ class HttpRemoteSync:
       # Find the first tarball that matches any possible hash and fetch it.
       for pkg_hash in spec["remote_hashes"]:
         store_path = resolve_store_path(self.architecture, pkg_hash)
-        tarballs = self.getRetry("%s/%s/" % (self.remoteStore, store_path),
+        tarballs = self.getRetry(f"{self.remoteStore}/{store_path}/",
                                  session=session)
         if tarballs:
           use_tarball = tarballs[0]["name"]
@@ -203,7 +203,7 @@ class HttpRemoteSync:
     with requests.Session() as session:
       # Fetch manifest file with initial symlinks. This file is updated
       # regularly; we use it to avoid many small network requests.
-      manifest = self.getRetry("%s/%s.manifest" % (self.remoteStore, links_path),
+      manifest = self.getRetry(f"{self.remoteStore}/{links_path}.manifest",
                                returnResult=True, session=session)
       symlinks = {
         linkname.decode("utf-8"): target.decode("utf-8")
@@ -214,7 +214,7 @@ class HttpRemoteSync:
       # Now add any remaining symlinks that aren't in the manifest yet. There
       # should always be relatively few of these, as the separate network
       # requests are a bit expensive.
-      for link in self.getRetry("%s/%s/" % (self.remoteStore, links_path),
+      for link in self.getRetry(f"{self.remoteStore}/{links_path}/",
                                 session=session):
         linkname = link["name"]
         if linkname in symlinks:
@@ -502,12 +502,23 @@ class Boto3RemoteSync:
     # have to install it in the first place.
     try:
       import boto3
+      from botocore.config import Config
     except ImportError:
       error("boto3 must be installed to use %s", Boto3RemoteSync)
       sys.exit(1)
 
     try:
-      self.s3 = boto3.client("s3", endpoint_url="https://s3.cern.ch",
+      try:
+        config = Config(
+          request_checksum_calculation='WHEN_REQUIRED',
+          response_checksum_validation='WHEN_REQUIRED',
+        )
+      except TypeError:
+        # Older boto3 versions don't support these parameters (<1.36.0)
+        config = None
+      self.s3 = boto3.client("s3",
+                             **({"config": config} if config else {}),
+                             endpoint_url="https://s3.cern.ch",
                              aws_access_key_id=os.environ["AWS_ACCESS_KEY_ID"],
                              aws_secret_access_key=os.environ["AWS_SECRET_ACCESS_KEY"])
     except KeyError:

alibuild_helpers/utilities.py

@@ -261,7 +261,7 @@ def detectArch():
     with open("/etc/os-release") as osr:
       osReleaseLines = osr.readlines()
     hasOsRelease = True
-  except (IOError,OSError):
+  except OSError:
     osReleaseLines = []
     hasOsRelease = False
   try:
@@ -270,7 +270,7 @@ def detectArch():
         return "osx_x86-64"
       else:
         return "osx_arm64"
-  except:
+  except Exception:
     pass
   try:
     import distro
@@ -280,7 +280,7 @@ def detectArch():
     if not platformProcessor or " " in platformProcessor:
       platformProcessor = platform.machine()
     return doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, platformProcessor)
-  except:
+  except Exception:
     return doDetectArch(hasOsRelease, osReleaseLines, ["unknown", "", ""], "", "")
 
 def filterByArchitectureDefaults(arch, defaults, requires):
@@ -314,7 +314,7 @@ def readDefaults(configDir, defaults, error, architecture):
   if err:
     error(err)
     sys.exit(1)
-  archDefaults = "%s/defaults-%s.sh" % (configDir, architecture)
+  archDefaults = f"{configDir}/defaults-{architecture}.sh"
   archMeta = {}
   archBody = ""
   if exists(archDefaults):
@@ -336,20 +336,20 @@ def getRecipeReader(url:str , dist=None):
     return FileReader(url)
 
 # Read a recipe from a file
-class FileReader(object):
+class FileReader:
   def __init__(self, url) -> None:
     self.url = url
   def __call__(self):
     return open(self.url).read()
 
 # Read a recipe from a git repository using git show.
-class GitReader(object):
+class GitReader:
   def __init__(self, url, configDir) -> None:
     self.url, self.configDir = url, configDir
   def __call__(self):
     m = re.search(r'^dist:(.*)@([^@]+)$', self.url)
     fn, gh = m.groups()
-    err, d = git(("show", "{gh}:{fn}.sh".format(gh=gh, fn=fn.lower())),
+    err, d = git(("show", f"{gh}:{fn.lower()}.sh"),
                  directory=self.configDir)
     if err:
       raise RuntimeError("Cannot read recipe {fn} from reference {gh}.\n"
@@ -377,7 +377,7 @@ def yamlDump(s):
       k = dumper.represent_data(k)
       v = dumper.represent_data(v)
       rep.append((k, v))
-    return yaml.nodes.MappingNode(u'tag:yaml.org,2002:map', rep)
+    return yaml.nodes.MappingNode('tag:yaml.org,2002:map', rep)
   YamlOrderedDumper.add_representer(OrderedDict, represent_ordereddict)
   return yaml.dump(s, Dumper=YamlOrderedDumper)
 
@@ -391,14 +391,14 @@ def parseRecipe(reader):
     validateSpec(spec)
   except RuntimeError as e:
     err = str(e)
-  except IOError as e:
+  except OSError as e:
     err = str(e)
   except SpecError as e:
-    err = "Malformed header for %s\n%s" % (reader.url, str(e))
+    err = f"Malformed header for {reader.url}\n{str(e)}"
   except yaml.scanner.ScannerError as e:
-    err = "Unable to parse %s\n%s" % (reader.url, str(e))
+    err = f"Unable to parse {reader.url}\n{str(e)}"
   except yaml.parser.ParserError as e:
-    err = "Unable to parse %s\n%s" % (reader.url, str(e))
+    err = f"Unable to parse {reader.url}\n{str(e)}"
   except ValueError:
     err = "Unable to parse %s. Header missing." % reader.url
   return err, spec, recipe
@@ -476,7 +476,7 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
 
     filename, pkgdir = resolveFilename(taps, pkg_filename, configDir)
 
-    dieOnError(not filename, "Package %s not found in %s" % (p, configDir))
+    dieOnError(not filename, f"Package {p} not found in {configDir}")
     assert(filename is not None)
 
     err, spec, recipe = parseRecipe(getRecipeReader(filename, configDir))
@@ -486,7 +486,7 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
     assert(spec is not None)
     assert(recipe is not None)
     dieOnError(spec["package"].lower() != pkg_filename,
-               "%s.sh has different package field: %s" % (p, spec["package"]))
+               "{}.sh has different package field: {}".format(p, spec["package"]))
     spec["pkgdir"] = pkgdir
 
     if p == "defaults-release":
@@ -502,7 +502,7 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
       recipe = ""
 
     dieOnError(spec["package"] != p,
-               "%s should be spelt %s." % (p, spec["package"]))
+               "{} should be spelt {}.".format(p, spec["package"]))
 
     # If an override fully matches a package, we apply it. This means
     # you can have multiple overrides being applied for a given package.
@@ -522,7 +522,7 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
     try:
       systemREMatches = re.match(systemRE, architecture)
     except TypeError:
-      dieOnError(True, "Malformed entry prefer_system: %s in %s" % (systemRE, spec["package"]))
+      dieOnError(True, "Malformed entry prefer_system: {} in {}".format(systemRE, spec["package"]))
 
     noSystemList = []
     if noSystem == "*":
@@ -536,7 +536,7 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
       key = spec["package"] + env
       if key not in trackingEnvCache:
         status, out = performPreferCheck(spec, trackingCode)
-        dieOnError(status, "Error while executing track_env for {}: {} => {}".format(key, trackingCode, out))
+        dieOnError(status, f"Error while executing track_env for {key}: {trackingCode} => {out}")
         trackingEnvCache[key] = out
       spec["track_env"][env] = trackingEnvCache[key]
 

alibuild_helpers/workarea.py

@@ -7,7 +7,7 @@ import tempfile
 from collections import OrderedDict
 
 from alibuild_helpers.log import dieOnError, debug, error
-from alibuild_helpers.utilities import call_ignoring_oserrors, symlink, short_commit_hash
+from alibuild_helpers.utilities import call_ignoring_oserrors, symlink, short_commit_hash, asList
 
 FETCH_LOG_NAME = "fetch-log.txt"
 
@@ -113,7 +113,8 @@ def updateReferenceRepo(referenceSources, p, spec,
     cmd = scm.cloneReferenceCmd(spec["source"], referenceRepo, usePartialClone)
     logged_scm(scm, p, referenceSources, cmd, ".", allowGitPrompt)
   elif fetch:
-    cmd = scm.fetchCmd(spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*")
+    ref_match_rule = asList(spec.get("ref_match_rule", ["+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*"]))
+    cmd = scm.fetchCmd(spec["source"], *ref_match_rule)
     logged_scm(scm, p, referenceSources, cmd, referenceRepo, allowGitPrompt)
 
   return referenceRepo  # reference is read-write
@@ -123,7 +124,7 @@ def is_writeable(dirpath):
   try:
     with tempfile.NamedTemporaryFile(dir=dirpath):
       return True
-  except:
+  except Exception:
     return False
 
 

tests/test_args.py

@@ -16,7 +16,7 @@ BUILD_MISSING_PKG_ERROR = "the following arguments are required: PACKAGE"
 ANALYTICS_MISSING_STATE_ERROR = "the following arguments are required: state"
 
 # A few errors we should handle, together with the expected result
-ARCHITECTURE_ERROR = u"Unknown / unsupported architecture: foo.\n\n.*"
+ARCHITECTURE_ERROR = "Unknown / unsupported architecture: foo.\n\n.*"
 PARSER_ERRORS = {
   "build --force-unknown-architecture": BUILD_MISSING_PKG_ERROR,
   "build --force-unknown-architecture zlib --foo": 'unrecognized arguments: --foo',

tests/test_build.py

@@ -167,7 +167,7 @@ def dummy_open(x, mode="r", encoding=None, errors=None):
             result = None
         TIMES_ASKED[x] = TIMES_ASKED.get(x, 0) + 1
         if not result:
-            raise IOError
+            raise OSError
         return result
     return DEFAULT
 
@@ -191,17 +191,22 @@ def dummy_readlink(x):
 
 
 def dummy_exists(x):
-    if x.endswith("alibuild_helpers/.git"):
+    # Convert Path objects to strings for comparison
+    path_str = str(x) if hasattr(x, '__fspath__') else x
+    if path_str.endswith("alibuild_helpers/.git"):
+        return False
+    # Return False for any sapling-related paths
+    if ".sl" in path_str or path_str.endswith("/sl"):
         return False
     return {
         "/alidist": True,
         "/alidist/.git": True,
-        "/alidist/.sl": False,
         "/sw": True,
         "/sw/SPECS": False,
         "/sw/MIRROR/root": True,
+        "/sw/MIRROR/root/.git": True,
         "/sw/MIRROR/zlib": False,
-    }.get(x, DEFAULT)
+    }.get(path_str, DEFAULT)
 
 
 # A few errors we should handle, together with the expected result

tests/test_parseRecipe.py

@@ -50,13 +50,13 @@ found unexpected end of stream
     
     ^"""
 
-class Recoder(object):
+class Recoder:
   def __init__(self) -> None:
     self.buffer = ""
   def __call__(self, s, *a) -> None:
     self.buffer += s % a
 
-class BufferReader(object):
+class BufferReader:
   def __init__(self, filename, recipe) -> None:
     self.url = filename
     self.buffer = recipe

tests/test_utilities.py

@@ -1,5 +1,3 @@
-# vim: set fileencoding=utf-8 :
-
 import unittest
 
 # Assuming you are using the mock library to ... mock things
@@ -253,8 +251,8 @@ class TestUtilities(unittest.TestCase):
     h1 = Hasher()
     h2 = Hasher()
     h3 = Hasher()
-    h1(u'\ua000')
-    h2(u'\ua001')
+    h1('\ua000')
+    h2('\ua001')
     h3(b'foo')
     self.assertEqual(h1.hexdigest(), "2af8e41129115eb231a0af76ec5465d3a9184fc4")
     self.assertEqual(h2.hexdigest(), "1619bcdbeff6828138ad9b6e43cc17e856457603")
@@ -466,7 +464,7 @@ class TestTopologicalSort(unittest.TestCase):
             "B": {"package": "B", "requires": []},
             "C": {"package": "C", "requires": []}
         }))
-        self.assertEqual(set(["A", "B", "C"]), set(result))
+        self.assertEqual({"A", "B", "C"}, set(result))
         self.assertEqual(3, len(result))
 
 if __name__ == '__main__':

tests/test_workarea.py

@@ -61,6 +61,29 @@ class WorkareaTestCase(unittest.TestCase):
         ], directory="%s/sw/MIRROR/aliroot" % getcwd(), check=False, prompt=True)
         self.assertEqual(spec.get("reference"), "%s/sw/MIRROR/aliroot" % getcwd())
 
+    @patch("os.path.exists")
+    @patch("os.makedirs")
+    @patch("codecs.open")
+    @patch("alibuild_helpers.git.git")
+    @patch("alibuild_helpers.workarea.is_writeable", new=MagicMock(return_value=True))
+    def test_reference_sources_updated_custom_refspec(self, mock_git, mock_open, mock_makedirs, mock_exists):
+        """Check mirrors are updated with custom refspec when provided."""
+        mock_exists.return_value = True
+        mock_git.return_value = 0, "sentinel output"
+        mock_open.return_value = MagicMock(
+            __enter__=lambda *args, **kw: MagicMock(
+                write=lambda output: self.assertEqual(output, "sentinel output")))
+        spec = MOCK_SPEC.copy()
+        spec["ref_match_rule"] = ["+refs/heads/master:refs/heads/master"]
+        updateReferenceRepoSpec(referenceSources="sw/MIRROR", p="AliRoot",
+                                spec=spec, fetch=True)
+        mock_exists.assert_called_with("%s/sw/MIRROR/aliroot" % getcwd())
+        mock_makedirs.assert_called_with("%s/sw/MIRROR" % getcwd(), exist_ok=True)
+        mock_git.assert_called_once_with([
+            "fetch", "-f", "--prune", "--filter=blob:none", spec["source"], "+refs/heads/master:refs/heads/master",
+        ], directory="%s/sw/MIRROR/aliroot" % getcwd(), check=False, prompt=True)
+        self.assertEqual(spec.get("reference"), "%s/sw/MIRROR/aliroot" % getcwd())
+
     @patch("os.path.exists")
     @patch("os.makedirs")
     @patch("alibuild_helpers.git")