alibuild 1.17.19__py3-none-any.whl → 1.17.33__py3-none-any.whl

{alibuild-1.17.19.dist-info → alibuild-1.17.33.dist-info}/METADATA

@@ -1,7 +1,9 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.19
+Version: 1.17.33
 Summary: ALICE Build Tool
+Home-page: https://alisw.github.io/alibuild
+Author: Giulio Eulisse
 Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>, Sergio Garcia <sergio.garcia@cern.ch>
 Project-URL: homepage, https://alisw.github.io/alibuild
 Keywords: HEP,ALICE
@@ -22,6 +24,8 @@ Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
 Requires-Dist: mkdocs-redirects; extra == "docs"
+Dynamic: author
+Dynamic: home-page
 Dynamic: license-file
 
 .. image:: https://badge.fury.io/py/alibuild.svg
@@ -52,14 +56,22 @@ Pre-requisites
 If you are using aliBuild directly from git clone, you should make sure
 you have the dependencies installed. The easiest way to do this is to run::
 
+    # Optional, make a venv so the dependencies are not installed globally
+    python -m venv .venv
+    source .venv/bin/activate
     pip install -e .
 
 
-For developers
-==============
+Contributing
+============
+
 
 If you want to contribute to aliBuild, you can run the tests with::
 
+    # Optional, make a venv so the dependencies are not installed globally
+    python -m venv .venv
+    source .venv/bin/activate
+
     pip install -e .[test] # Only needed once
     tox
 
@@ -73,6 +85,13 @@ You can also run only the unit tests (it's a lot faster than the full suite) wit
 
 To run the documentation locally, you can use::
 
+    # Optional, make a venv so the dependencies are not installed globally
+    python -m venv .venv
+    source .venv/bin/activate
+
+    # Install dependencies for the docs, check pyproject.toml for more info
     pip install -e .[docs]
+
+    # Run the docs
     cd docs
     mkdocs serve

{alibuild-1.17.19.dist-info → alibuild-1.17.33.dist-info}/RECORD

@@ -1,27 +1,27 @@
-alibuild-1.17.19.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
-alibuild-1.17.19.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
-alibuild-1.17.19.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
-alibuild-1.17.19.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
-alibuild-1.17.19.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
-alibuild-1.17.19.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+alibuild-1.17.33.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
+alibuild-1.17.33.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
+alibuild-1.17.33.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
+alibuild-1.17.33.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
+alibuild-1.17.33.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
+alibuild-1.17.33.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
 alibuild_helpers/__init__.py,sha256=ZAhyhRxOkiTA1fMzwEKACY8Eo8MdWp1MawVicFlvQWk,736
-alibuild_helpers/_version.py,sha256=DlzvboYmrZFVgEwyvqyRPPIN-bpatfcSZy5avk6c45Q,515
+alibuild_helpers/_version.py,sha256=aocBG_OE5hC31Qts18qEBqT2J_scMmIDImpzF42ytV8,708
 alibuild_helpers/analytics.py,sha256=fuiOagDngFnodGo7upMWeY-RjTTncDRz5Kwz8zxUr9o,4579
-alibuild_helpers/args.py,sha256=LrZ85hH6dhOt-UCK41BVpjDfcOnD-4PWC1oCFJfzRh8,31490
-alibuild_helpers/build.py,sha256=1Ue4iWOhPFWFkj6ARVqR3mY8XwJJYmBRkMXOTfaf1mw,56893
-alibuild_helpers/build_template.sh,sha256=irbJFYEFn5KKy5wMK0WaUQOPfTzA6MJnbWxRj3cpIXQ,13508
+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=cK33xiBI2ENAWSueW_yqj3Y9aOhTOdKkzsLdNUx9KdU,5899
-alibuild_helpers/deps.py,sha256=L1NrXSmuZE2fpVvUn_t19SrFLPu6rvJd5GG3MPiiJ0w,4805
-alibuild_helpers/doctor.py,sha256=s3IHGilf5iRSs3GOQgvZdws7SoXtLYp_ynCnCnTSbPI,9327
-alibuild_helpers/git.py,sha256=_GjLIxprHnCfUdQ908xfza1rwhqag1_df7_gcC_8sgw,4004
-alibuild_helpers/init.py,sha256=GmVLXqMS-aXqPnCk5dgAONMQFe7MqjlEtXtcQ1a-0qY,5009
-alibuild_helpers/log.py,sha256=C6nneUPrPrqxIqzqsHMWkqZ_Tks2e4RIMn5sZaQwSE0,4505
+alibuild_helpers/cmd.py,sha256=5tdxtyrHDzmdSVIA0pzxBoici1GZDS0fUStbX85r6ao,5906
+alibuild_helpers/deps.py,sha256=nHLyNqVuTUfW5bqfzCDxAaVVsklv5wHMl4FMMfTQF-8,4909
+alibuild_helpers/doctor.py,sha256=CSvfwmD28NRmvSnmZRTHWaf11pAoSIlMxJ1yW00Xh9c,9685
+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=EdHs5Se6xpR9rhmhSJd_6f3Rfkxc8jl-97ZT1lG2T28,2356
-alibuild_helpers/sync.py,sha256=g93S_eXmD1Zb9HptX3lICo5hWYH0cl0YQ-yr7wyliGQ,31060
+alibuild_helpers/sl.py,sha256=Aw3-Lvq3bQ2s_KTw6PXgqcjSoY-s8_0A55GRPKks4x0,2915
+alibuild_helpers/sync.py,sha256=vfny1ZF_YahzlSSEtYOq1KFvQLj_ce7MZlV2KDk1-xg,32296
 alibuild_helpers/templating_plugin.py,sha256=TWHdMQtDfX6Vqp5w9Huyh4ZEgLv5vYxAtPtX68xTOlk,662
-alibuild_helpers/utilities.py,sha256=NFNoaed0i7VIC6r2s7So6UhMJG5kUbVWolML9AyD26s,26129
+alibuild_helpers/utilities.py,sha256=nb0UC0qn2_rIJ-5GDnx-GoRAbF8tn1ELjZS-prUz9eo,26131
 alibuild_helpers/workarea.py,sha256=dYGZ7OOCg87W-njZMqX7Yu72800KZjx9v5Hg-T43juY,7442
 debian/changelog,sha256=N-9FA5VD4VmD_tAwFfgqPqG7KUw1Jktyz14zP6aLxZs,300
 debian/compat,sha256=kX3zMg13jduqXFx3QrxARr-APDbtKwUPMIRO0gZ4NGk,3
@@ -29,34 +29,33 @@ debian/control,sha256=UL8ZCLiCnNH75oVtldYPfrBO8DH7VxvjXPIdTCvXgPc,476
 debian/copyright,sha256=wOLKnTq7-L1OZZoXu-FOojSdqt2nb9aEwVqVZGAxanE,470
 debian/files,sha256=u9Y63SK26643_rgHm6lvcr4OtZKlCM-FcW4wwiJ4FMY,55
 debian/rules,sha256=V4agtbpfdaM9h7oNrgNzEShthUASwMfhgTmFvZKLNMI,131
-docs/README.md,sha256=-2EVG9RlHchf-TYJIxwZf8zSHc49ujCdTzZmWrxj4aQ,64
 docs/SUPPORT,sha256=j8Ikz-9B8OkoZwtd7WU5fc_qRQ_MWy2qjWcgsXY3XyQ,150
 docs/mkdocs.yml,sha256=FQWSVZC75WnuCs6icnSRauBgIJ4hrVut5Rt9X4zxy-w,931
 docs/docs/alice_logo.png,sha256=w8Jpk9mHdGF5sN0pO0i6PuVyI-ntDNsvbx7DChVIZQQ,65824
 docs/docs/deps.png,sha256=VY_WJOzWOm_JqAwuzFBd6C7NhrzTDDireNh739NwAow,261802
 docs/docs/index.md,sha256=pU3PRsZvV5M_W1-GEZ169ECAD4C5eQc0l2V_kN_j7yU,3571
 docs/docs/quick.md,sha256=PTKHAmt6vrEc3QbaRAS7rZICZ-LcvdqLxgaNcXo63Sw,2967
-docs/docs/reference.md,sha256=g516_jCRnFOFy1kgw4d7Bin7OH1UBT4V34JVeDf_kBA,18033
-docs/docs/troubleshooting.md,sha256=SvNT68iCVXFu3RMKjLQZrMwxBxaOSJ-QeSJe8Q3N4Oc,15440
-docs/docs/user.md,sha256=3Ys1cwNuDTBQl7zZZisChZ4mt9KrLduH1bLUHXK5Jws,18704
+docs/docs/reference.md,sha256=sBH8diOwyOFkgDsAhWexvtpuAwZaNzJaE-dplEnOXdU,18049
+docs/docs/troubleshooting.md,sha256=fcAoLyi46yxMztqbYMY-5Z4_mwLZOJW8Q3M3jEb-Zdc,15458
+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=m8PXSRpejJYTeabTOgvu6C77_jqGWq11Ko4uO74ybJw,18503
+tests/test_build.py,sha256=5WtCmrvcG7U2i5jwBdPhMJzINsYQ6WaySEFu-TNnZHc,19017
 tests/test_clean.py,sha256=Zm3gjtO8Pgl27xUzQIHeGqpe05YMVXZp6Sua59prvcE,7492
-tests/test_cmd.py,sha256=iMpfLKqvi-qaSP6EM7PoJnGSZ9Qf4sj5669o2kcD8_I,3820
-tests/test_deps.py,sha256=Ae7YPZ6jrWTeXeLaIj0C7J1Lt5fwdsRzMsiHv6GF1fE,2072
-tests/test_doctor.py,sha256=LnNijwCtTN2ltX-FMSYRuLEgbCMfG0VpkqSJe3Wh1X4,4233
+tests/test_cmd.py,sha256=SsWWasMrhbIu9Lqyr_wpuvDjg72ACJ1H_zDlTnybBuE,5049
+tests/test_deps.py,sha256=bLDFuqLRJiCW4U71dzXYM0Niv-skQXSsKGb6LXGVsZ0,2113
+tests/test_doctor.py,sha256=Z7X1d6XqCqmoYAEkRllXf-6HWvfnzGOFd_ghh4gmWYQ,4270
 tests/test_git.py,sha256=fh3sBkW7FwFQQZ3x6Rp3C4wBqM7I9CcX75e6u2oaSKg,1963
 tests/test_hashing.py,sha256=oAggZlZp-rZz5MRj4RBD5UZUxV0uNQOtVw47y-LHwt4,2941
-tests/test_init.py,sha256=Mpj_IB9UNYQgekjLS4c0yBHQe5M3J7-YOHlwMHxSu_8,4227
+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_sync.py,sha256=2CyZcC4gKCFo85pfJYn4r196eet0TG5bolL8EofGqFQ,14014
-tests/test_utilities.py,sha256=mg0AlBT-hr74jVJwDAGzBscBvoYULyXTA0mgD7tSors,17688
-tests/test_workarea.py,sha256=iFA1vv6Kdyd4BPk_nrNk11YUZOrAyYYYA-L0f5-As3o,4886
+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/testdist/broken1.sh,sha256=zdbBCVA9ThnK14Lu9Nm6Firw2EcnRF7budMA3xrcYEg,7
 tests/testdist/broken2.sh,sha256=9S1xEQPVCkN4MMb7zQT7S6tJoPgvbSbRx5HG6EiN0JA,4
 tests/testdist/broken3.sh,sha256=1Zs7ajCIndFPYCQdSjg913x5gNBYakUehTUXLpMQSEU,18
@@ -68,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.19.dist-info/METADATA,sha256=ogbnT-bNVLWBSCytmXY7KLfI70wdBM3DlxoqT7WlM2o,2129
-alibuild-1.17.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alibuild-1.17.19.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
-alibuild-1.17.19.dist-info/RECORD,,
+alibuild-1.17.33.dist-info/METADATA,sha256=0riqP6LrOo5K2bEefvmo6XRIxzbL2K9G63MmFHvbPZI,2716
+alibuild-1.17.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alibuild-1.17.33.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
+alibuild-1.17.33.dist-info/RECORD,,

alibuild_helpers/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.19'
-__version_tuple__ = version_tuple = (1, 17, 19)
+__version__ = version = '1.17.33'
+__version_tuple__ = version_tuple = (1, 17, 33)
+
+__commit_id__ = commit_id = None

alibuild_helpers/args.py

@@ -254,6 +254,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."))
+  doctor_parser.add_argument("-e", dest="environment", action="append", default=[],
+                            help="KEY=VALUE binding to add to the build environment. May be specified multiple times.")
 
   doctor_system = doctor_parser.add_mutually_exclusive_group()
   doctor_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",

alibuild_helpers/build.py

@@ -58,7 +58,7 @@ def update_git_repos(args, specs, buildOrder):
         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")):
+            if exists(os.path.join(specs[package]["source"], ".sl")) or exists(os.path.join(specs[package]["source"], ".git/sl")):
                 specs[package]["scm"] = Sapling()
         updateReferenceRepoSpec(args.referenceSources, package, specs[package],
                                 fetch=args.fetchRepos, allowGitPrompt=git_prompt)
@@ -501,7 +501,10 @@ def doBuild(args, parser):
 
   install_wrapper_script("git", workDir)
 
-  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env={"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
+  extra_env = {"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}
+  extra_env.update(dict([e.partition('=')[::2] for e in args.environment]))
+
+  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env=extra_env, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
     def performPreferCheckWithTempDir(pkg, cmd):
       with tempfile.TemporaryDirectory(prefix=f"alibuild_prefer_check_{pkg['package']}_") as temp_dir:
         return getstatusoutput_docker(cmd, cwd=temp_dir)

alibuild_helpers/build_template.sh

@@ -1,7 +1,18 @@
 #!/bin/bash
-
+ALIBUILD_START_TIMESTAMP=$(date +%%s)
 # Automatically generated build script
 unset DYLD_LIBRARY_PATH
+echo "aliBuild: start building $PKGNAME-$PKGVERSION-$PKGREVISION at $ALIBUILD_START_TIMESTAMP"
+
+cleanup() {
+  local exit_code=$?
+  ALIBUILD_END_TIMESTAMP=$(date +%%s)
+  ALIBUILD_DELTA_TIME=$(($ALIBUILD_END_TIMESTAMP - $ALIBUILD_START_TIMESTAMP))
+  echo "aliBuild: done building $PKGNAME-$PKGVERSION-$PKGREVISION at $ALIBUILD_START_TIMESTAMP (${ALIBUILD_DELTA_TIME} s)"
+  exit $exit_code
+}
+
+trap cleanup EXIT
 
 # Cleanup variables which should not be exposed to user code
 unset AWS_ACCESS_KEY_ID
@@ -103,9 +114,9 @@ unset DYLD_LIBRARY_PATH
 EOF
 
 cd "$BUILDROOT"
-ln -snf $PKGHASH "${BUILDROOT}-latest"
+ln -snf "$PKGHASH" "$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGNAME-latest"
 if [[ $DEVEL_PREFIX ]]; then
-  ln -snf $PKGHASH "${BUILDROOT}-latest-$DEVEL_PREFIX"
+  ln -snf "$PKGHASH" "$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGNAME-latest-$DEVEL_PREFIX"
 fi
 
 cd "$BUILDDIR"

alibuild_helpers/cmd.py

@@ -105,7 +105,7 @@ class DockerRunner:
       if self._container is None:
         command_prefix=""
         if self._extra_env:
-          command_prefix="env " + " ".join("{}={}".format(k, v) for (k,v) in self._extra_env.items()) + " "
+          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))
                              , cwd=cwd)
       envOpts = []

alibuild_helpers/deps.py

@@ -16,7 +16,11 @@ def doDeps(args, parser):
   specs = {}
   defaultsReader = lambda: readDefaults(args.configDir, args.defaults, parser.error, args.architecture)
   (err, overrides, taps) = parseDefaults(args.disable, defaultsReader, debug)
-  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env={"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else path.abspath(args.configDir)}, extra_volumes=[f"{path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
+
+  extra_env = {"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else path.abspath(args.configDir)}
+  extra_env.update(dict([e.partition('=')[::2] for e in args.environment]))
+  
+  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env=extra_env, extra_volumes=[f"{path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
     def performCheck(pkg, cmd):
       return getstatusoutput_docker(cmd)
     

alibuild_helpers/doctor.py

@@ -22,7 +22,8 @@ def checkPreferSystem(spec, cmd, homebrew_replacement, getstatusoutput_docker):
       debug("Package %s can only be managed via alibuild.", spec["package"])
       return (1, "")
     cmd = homebrew_replacement + cmd
-    err, out = getstatusoutput_docker(cmd)
+    with tempfile.TemporaryDirectory(prefix=f"alibuild_prefer_check_{spec['package']}_") as temp_dir:
+        err, out = getstatusoutput_docker(cmd, cwd=temp_dir)
     if not err:
       success("Package %s will be picked up from the system.", spec["package"])
       for x in out.split("\n"):
@@ -40,7 +41,8 @@ def checkRequirements(spec, cmd, homebrew_replacement, getstatusoutput_docker):
       debug("Package %s is not a system requirement.", spec["package"])
       return (0, "")
     cmd = homebrew_replacement + cmd
-    err, out = getstatusoutput_docker(cmd)
+    with tempfile.TemporaryDirectory(prefix=f"alibuild_prefer_check_{spec['package']}_") as temp_dir:
+        err, out = getstatusoutput_docker(cmd, cwd=temp_dir)
     if not err:
       success("Required package %s will be picked up from the system.", spec["package"])
       debug("%s", cmd)
@@ -83,7 +85,11 @@ def doDoctor(args, parser):
   # Decide if we can use homebrew. If not, we replace it with "true" so
   # that we do not get spurious messages on linux
   homebrew_replacement = ""
-  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env={"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
+
+  extra_env = {"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}
+  extra_env.update(dict([e.partition('=')[::2] for e in args.environment]))
+
+  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env=extra_env, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
     err, output = getstatusoutput_docker("type c++")
   if err:
     warning("Unable to find system compiler.\n"
@@ -140,10 +146,10 @@ def doDoctor(args, parser):
       error("%s", msg)
     return (ok,msg,valid)
 
-  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env={"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
-    def performPreferCheckWithTempDir(pkg, cmd):
-      with tempfile.TemporaryDirectory(prefix=f"alibuild_prefer_check_{pkg['package']}_") as temp_dir:
-        return getstatusoutput_docker(cmd, cwd=temp_dir)
+  extra_env = {"ALIBUILD_CONFIG_DIR": "/alidist" if args.docker else os.path.abspath(args.configDir)}
+  extra_env.update(dict([e.partition('=')[::2] for e in args.environment]))
+  
+  with DockerRunner(args.dockerImage, args.docker_extra_args, extra_env=extra_env, extra_volumes=[f"{os.path.abspath(args.configDir)}:/alidist:ro"] if args.docker else []) as getstatusoutput_docker:
     fromSystem, own, failed, validDefaults = \
       getPackageList(packages                = packages,
                      specs                   = specs,
@@ -153,8 +159,8 @@ def doDoctor(args, parser):
                      architecture            = args.architecture,
                      disable                 = args.disable,
                      defaults                = args.defaults,
-                     performPreferCheck      = performPreferCheckWithTempDir,
-                     performRequirementCheck = performPreferCheckWithTempDir,
+                     performPreferCheck      = lambda pkg, cmd: checkPreferSystem(pkg, cmd, homebrew_replacement, getstatusoutput_docker),
+                     performRequirementCheck = lambda pkg, cmd: checkRequirements(pkg, cmd, homebrew_replacement, getstatusoutput_docker),
                      performValidateDefaults = performValidateDefaults,
                      overrides               = overrides,
                      taps                    = taps,

alibuild_helpers/git.py

@@ -68,7 +68,7 @@ class Git(SCM):
     return ["checkout", "-f", tag]
 
   def fetchCmd(self, remote, *refs):
-    return ["fetch", "-f"] + clone_speedup_options() + [remote, *refs]
+    return ["fetch", "-f", "--prune"] + clone_speedup_options() + [remote, *refs]
 
   def setWriteUrlCmd(self, url):
     return ["remote", "set-url", "--push", "origin", url]

alibuild_helpers/init.py

@@ -3,6 +3,7 @@ from alibuild_helpers.utilities import getPackageList, parseDefaults, readDefaul
 from alibuild_helpers.log import debug, error, warning, banner, info
 from alibuild_helpers.log import dieOnError
 from alibuild_helpers.workarea import updateReferenceRepoSpec
+from alibuild_helpers.cmd import getstatusoutput
 
 from os.path import join
 import os.path as path
@@ -54,7 +55,7 @@ def doInit(args):
                                          architecture="",
                                          disable=[],
                                          defaults=args.defaults,
-                                         performPreferCheck=lambda *x, **y: (1, ""),
+                                         performPreferCheck=lambda pkg, cmd: getstatusoutput(["bash", "-c", cmd]),
                                          performRequirementCheck=lambda *x, **y: (0, ""),
                                          performValidateDefaults=lambda spec : validateDefaults(spec, args.defaults),
                                          overrides=overrides,

alibuild_helpers/log.py

@@ -53,14 +53,21 @@ def log_current_package(package, main_package, specs, devel_prefix) -> None:
 
 
 class ProgressPrint:
-  def __init__(self, begin_msg="") -> None:
+  def __init__(self, begin_msg="", min_interval=0.) -> None:
     self.count = -1
     self.lasttime = 0
     self.STAGES = ".", "..", "...", "....", ".....", "....", "...", ".."
     self.begin_msg = begin_msg
     self.percent = -1
+    self.min_interval = min_interval
+    self.last_update = 0
 
   def __call__(self, txt, *args) -> None:
+    now = time.time()
+    if (now - self.last_update) < self.min_interval:
+      return
+    self.last_update = now
+
     if logger.level <= logging.DEBUG or not sys.stdout.isatty():
       debug(txt, *args)
       return

alibuild_helpers/sl.py

@@ -20,9 +20,22 @@ class Sapling(SCM):
     return sapling(("whereami", ), directory)
 
   def branchOrRef(self, directory):
-    # Format is <hash>[+] <branch>
-    identity = sapling(("identify", ), directory)
-    return identity.split(" ")[-1]
+    # Format is * branch     ref or nothing
+    err, output = getstatusoutput("""\
+    set -e +x
+    sl -R {directory} bookmark -r . 2>/dev/null | grep -- "*"
+    """.format(
+        directory=quote(directory),
+    ), timeout=SL_COMMAND_TIMEOUT_SEC)
+    if err > 1:
+        raise SCMError("Error {} from sl bookmark -r . : {}".format(err, 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():
+      return "none"
+    # If a bookmark is there, we use it to determine that we should rebuild
+    # when we move to it
+    return output.split(" ")[2]
 
   def exec(self, *args, **kwargs):
     return sapling(*args, **kwargs)

alibuild_helpers/sync.py

@@ -7,7 +7,9 @@ import re
 import sys
 import time
 import requests
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from requests.exceptions import RequestException
+from urllib.parse import quote
 
 from alibuild_helpers.cmd import execute
 from alibuild_helpers.log import debug, info, error, dieOnError, ProgressPrint
@@ -59,6 +61,7 @@ class HttpRemoteSync:
 
   def getRetry(self, url, dest=None, returnResult=False, log=True, session=None, progress=debug):
     get = session.get if session is not None else requests.get
+    url = quote(url, safe=":/")
     for i in range(0, self.httpConnRetries):
       if i > 0:
         pauseSec = self.httpBackoff * (2 ** (i - 1))
@@ -178,7 +181,7 @@ class HttpRemoteSync:
       destPath = os.path.join(self.workdir, store_path, use_tarball)
       if not os.path.isfile(destPath):   # do not download twice
         progress = ProgressPrint("Downloading tarball for %s@%s" %
-                                 (spec["package"], spec["version"]))
+                                 (spec["package"], spec["version"]), min_interval=5.0)
         progress("[0%%] Starting download of %s", use_tarball)  # initialise progress bar
         self.getRetry("/".join((self.remoteStore, store_path, use_tarball)),
                       destPath, session=session, progress=progress)
@@ -357,7 +360,7 @@ class CVMFSRemoteSync:
       # Create the dummy tarball, if it does not exists
       test -f "{workDir}/{architecture}/store/${{pkg_hash:0:2}}/$pkg_hash/$tarball" && continue
       mkdir -p "{workDir}/INSTALLROOT/$pkg_hash/{architecture}/{package}"
-      find "{remote_store}/{cvmfs_architecture}/Packages/{package}/$full_version" ! -name etc -maxdepth 1 -mindepth 1 -exec ln -sf {} "{workDir}/INSTALLROOT/$pkg_hash/{architecture}/{package}/" \;
+      find "{remote_store}/{cvmfs_architecture}/Packages/{package}/$full_version" ! -name etc -maxdepth 1 -mindepth 1 -exec ln -sf {} "{workDir}/INSTALLROOT/$pkg_hash/{architecture}/{package}/" \\;
       cp -fr "{remote_store}/{cvmfs_architecture}/Packages/{package}/$full_version/etc" "{workDir}/INSTALLROOT/$pkg_hash/{architecture}/{package}/etc"
       mkdir -p "{workDir}/TARS/{architecture}/store/${{pkg_hash:0:2}}/$pkg_hash"
       tar -C "{workDir}/INSTALLROOT/$pkg_hash" -czf "{workDir}/TARS/{architecture}/store/${{pkg_hash:0:2}}/$pkg_hash/$tarball" .
@@ -551,7 +554,7 @@ class Boto3RemoteSync:
       for tarball in self._s3_listdir(store_path):
         debug("Fetching tarball %s", tarball)
         progress = ProgressPrint("Downloading tarball for %s@%s" %
-                                 (spec["package"], spec["version"]))
+                                 (spec["package"], spec["version"]), min_interval=5.0)
         progress("[0%%] Starting download of %s", tarball)   # initialise progress bar
         # Create containing directory locally. (exist_ok= is python3-specific.)
         os.makedirs(os.path.join(self.workdir, store_path), exist_ok=True)
@@ -679,15 +682,45 @@ class Boto3RemoteSync:
 
     # Second, upload dist symlinks. These should be in place before the main
     # tarball, to avoid races in the publisher.
-    for link_dir, symlinks in dist_symlinks.items():
-      for link_key, hash_path in symlinks:
-        self.s3.put_object(Bucket=self.writeStore,
-                           Key=link_key,
-                           Body=os.fsencode(hash_path),
-                           ACL="public-read",
-                           WebsiteRedirectLocation=hash_path)
-      debug("Uploaded %d dist symlinks to S3 from %s",
-            len(symlinks), link_dir)
+    start_time = time.time()
+    total_symlinks = 0
+
+    # Limit concurrency to avoid overwhelming S3 with too many simultaneous requests
+    max_workers = min(32, (len(dist_symlinks) * 10) or 1)
+
+    def _upload_single_symlink(link_key, hash_path):
+      self.s3.put_object(Bucket=self.writeStore,
+                         Key=link_key,
+                         Body=os.fsencode(hash_path),
+                         ACL="public-read",
+                         WebsiteRedirectLocation=hash_path)
+      return link_key
+
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+      future_to_info = {}
+      for link_dir, symlinks in dist_symlinks.items():
+        for link_key, hash_path in symlinks:
+          future = executor.submit(_upload_single_symlink, link_key, hash_path)
+          future_to_info[future] = (link_dir, link_key)
+          total_symlinks += 1
+
+      dir_counts = {link_dir: 0 for link_dir in dist_symlinks.keys()}
+      for future in as_completed(future_to_info):
+        link_dir, link_key = future_to_info[future]
+        try:
+          future.result()
+          dir_counts[link_dir] += 1
+        except Exception as e:
+          error("Failed to upload symlink %s: %s", link_key, e)
+          raise
+
+      for link_dir, count in dir_counts.items():
+        if count > 0:
+          debug("Uploaded %d dist symlinks to S3 from %s", count, link_dir)
+
+    end_time = time.time()
+    debug("Uploaded %d dist symlinks in %.2f seconds",
+          total_symlinks, end_time - start_time)
 
     self.s3.upload_file(Bucket=self.writeStore, Key=tar_path,
                         Filename=os.path.join(self.workdir, tar_path))

alibuild_helpers/utilities.py

@@ -216,7 +216,7 @@ def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, pl
   distribution = distribution.lower()
   # If platform.dist does not return something sensible,
   # let's try with /etc/os-release
-  if distribution not in ["ubuntu", "red hat enterprise linux", "redhat", "centos", "almalinux", "rockylinux"] and hasOsRelease:
+  if distribution not in ["ubuntu", "red hat enterprise linux", "redhat", "centos", "almalinux", "rocky linux"] and hasOsRelease:
     for x in osReleaseLines:
       key, is_prop, val = x.partition("=")
       if not is_prop:
@@ -236,7 +236,7 @@ def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, pl
     if version in debian_ubuntu:
       distribution = "ubuntu"
       version = debian_ubuntu[version]
-  elif distribution in ["redhat", "red hat enterprise linux", "centos", "almalinux", "rockylinux"]:
+  elif distribution in ["redhat", "red hat enterprise linux", "centos", "almalinux", "rocky linux"]:
     distribution = "slc"
 
   processor = platformProcessor

docs/docs/reference.md

@@ -79,13 +79,16 @@ The following entries are optional in the header:
   - `source`: URL of a Git repository from which the source is downloaded.
     It's good practice to make sure that they are already patched, so that you
     can easily point to the actual sources used by the software.
+
   - `write_repo`: in case the repository URL to be used for developing is
     different from the `source`, set this key. It is used by `aliBuild init`,
     which will initialise your local repository with the `upstream` remote
     pointing at this URL instead of the one in `source`.
+
   - `tag`: git reference in the above mentioned repository which points to the
     software to be built. This can be a tag name, a branch name or a commit
     hash.
+
   - `env`: dictionary whose key-value pairs are environment variables to be set
     after the recipe is built. The values are interpreted as the contents of a
     double-quoted shell string, so you can reference other environment variables
@@ -101,6 +104,7 @@ The following entries are optional in the header:
     intended to be used to point to build products of the current recipe. If you
     need to set an environment variable for use in the recipe, use
     `export VARIABLE=value` in the recipe body.
+
   - `prepend_path`: dictionary whose key-value pairs are an environment variable
     name and a path to be prepended to it, as it happens in `LD_LIBRARY_PATH`.
     This happens only after the package declaring the `prepend_path` in question
@@ -116,9 +120,11 @@ The following entries are optional in the header:
 
     will result in prepending `$FOO_ROOT/binexec/foobar` to `$PATH`, and both
     `$FOO_ROOT/sub/lib` and `lib64` to `LD_LIBRARY_PATH`.
+
   - `append_path`: same as `prepend_path` but paths are appended rather than
     prepended. Like `append_path` and `env`, this **does not** affect the
     environment of the current recipe.
+
   - `requires`: a list of run-time dependencies for the package, *e.g.*:
 
     ```yaml
@@ -145,17 +151,20 @@ The following entries are optional in the header:
 
     will make sure that `IgProf` is only built on platforms whose name does not
     begin with `osx`.
+
   - `build_requires`: a list of build-time dependencies for the package. Like
     `requires`, these packages will be built before the current package is
     built.
 
     Packages in this list are marked specially in the dependency graph
-    produced by `aliDeps`. Other tools treat these packages differently from
+    produced by `aliBuild deps`. Other tools treat these packages differently from
     `requires`: for instance, RPMs produced for a package won't depend on its
     `build_requires`, and `alibuild-generate-module` won't pull in build
     requirements' modulefiles.
+
   - `force_rebuild`: set it to `true` to force re-running the build recipe every
     time you invoke alibuild on it.
+
   - `prefer_system_check`: a script which is used to determine whether
     or not the system equivalent of the package can be used. See also
     `prefer_system`. If the `--no-system` option is specified, this key is not
@@ -170,6 +179,7 @@ The following entries are optional in the header:
     does not match, the check is skipped and the recipe is run. Using the switch
     `--always-prefer-system` runs the check always (even when the regular
     expression for the architecture does not match).
+
   - `relocate_paths`: a list of toplevel paths scanned recursively to perform
     relocation of executables and dynamic libraries **on macOS only**. If not
     specified, defaults to `bin`, `lib` and `lib64`.