alibuild 1.17.30__tar.gz → 1.17.32__tar.gz

{alibuild-1.17.30 → alibuild-1.17.32}/.github/workflows/pr-check.yml

@@ -30,6 +30,7 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.14'
 
     steps:
       - uses: actions/checkout@v4
@@ -75,6 +76,7 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.14'
 
     steps:
       - uses: actions/checkout@v4

{alibuild-1.17.30 → alibuild-1.17.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.30
+Version: 1.17.32
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -56,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
 
@@ -77,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.30 → alibuild-1.17.32}/README.rst

@@ -26,14 +26,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
 
@@ -47,6 +55,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.30 → alibuild-1.17.32}/alibuild.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.30
+Version: 1.17.32
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -56,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
 
@@ -77,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.30 → alibuild-1.17.32}/alibuild.egg-info/SOURCES.txt

@@ -50,7 +50,6 @@ debian/control
 debian/copyright
 debian/files
 debian/rules
-docs/README.md
 docs/SUPPORT
 docs/mkdocs.yml
 docs/docs/alice_logo.png

{alibuild-1.17.30 → alibuild-1.17.32}/alibuild_helpers/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.30'
-__version_tuple__ = version_tuple = (1, 17, 30)
+__version__ = version = '1.17.32'
+__version_tuple__ = version_tuple = (1, 17, 32)
 
-__commit_id__ = commit_id = 'gcc6423102'
+__commit_id__ = commit_id = 'g8fe3979a7'

{alibuild-1.17.30 → alibuild-1.17.32}/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

{alibuild-1.17.30 → alibuild-1.17.32}/alibuild_helpers/sync.py

@@ -7,6 +7,7 @@ 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
 
@@ -682,19 +683,44 @@ class Boto3RemoteSync:
     # Second, upload dist symlinks. These should be in place before the main
     # tarball, to avoid races in the publisher.
     start_time = time.time()
-    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)
+    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",
-          sum(len(symlinks) for _, symlinks in dist_symlinks.items()),
-          end_time - start_time)
+          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-1.17.30 → alibuild-1.17.32}/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`.

{alibuild-1.17.30 → alibuild-1.17.32}/docs/docs/troubleshooting.md

@@ -76,8 +76,9 @@ will tell you something like:
     We will build packages in the following order: defaults-release AliEn-CAs GMP UUID gSOAP ApMon-CPP GEANT4 boost MPFR MonALISA-gSOAP-client cgal XRootD fastjet xalienfs AliEn-Runtime ROOT vgm GEANT3 GEANT4_VMC AliRoot
 
 If you have a system package which you think should be used but it's not, you
-can run `aliDoctor <package-name>` to try to understand why that was the case
-(or you can [open a bug report](https://github.com/alisw/alidist/issues) with its output and we will look at it).
+can run `aliBuild doctor <package-name>` to try to understand why that was the
+case (or you can [open a bug report](https://github.com/alisw/alidist/issues)
+with its output and we will look at it).
 
 ### What is PIP ? How do I install it?
 
@@ -155,7 +156,7 @@ it means that aliBuild does not consider you system tool good enough to
 be compatible with the one provided by the recipe. You can verify what
 happens during the system tool detection by running:
 
-    aliDoctor <package name>
+    aliBuild doctor <package name>
 
 
 ### AliBuild fails with `cannot open file "AvailabilityMacros.h`
@@ -236,7 +237,7 @@ building unless one of the system dependencies is absolutely required
 tool, where simply installing them might be a better option. For this
 reason we suggest that users run:
 
-    aliDoctor AliPhysics
+    aliBuild doctor AliPhysics
 
 in the same path where their `alidist` folder is, before actually
 starting to build, so that they can get an overview of what will be

{alibuild-1.17.30 → alibuild-1.17.32}/docs/docs/user.md

@@ -11,7 +11,9 @@ For a quick start introduction, please look [here](quick.md).
 aliBuild build [-h] [--defaults DEFAULT]
                [-a ARCH] [--force-unknown-architecture]
                [-z [DEVELPREFIX]] [-e ENVIRONMENT] [-j JOBS] [-u]
-               [--no-local PKGLIST] [--disable PACKAGE]
+               [--no-local PKGLIST] [--force-tracked] [--disable PACKAGE]
+               [--force-rebuild PACKAGE] [--annotate PACKAGE=COMMENT]
+               [--only-deps] [--plugin PLUGIN]
                [--always-prefer-system | --no-system]
                [--docker] [--docker-image IMAGE] [--docker-extra-args ARGLIST] [-v VOLUMES]
                [--no-remote-store] [--remote-store STORE] [--write-store STORE] [--insecure] 
@@ -39,7 +41,18 @@ aliBuild build [-h] [--defaults DEFAULT]
   given.
 - `--no-local PKGLIST`: Do not pick up the following packages from a local
   checkout. `PKGLIST` is a comma-separated list.
+- `--force-tracked`: Do not pick up any packages from a local checkout.
 - `--disable PACKAGE`: Do not build `PACKAGE` and all its (unique) dependencies.
+- `--force-rebuild PACKAGE`: Always rebuild the specified packages from scratch,
+  even if they were built before. Has the same effect as adding
+  `force_rebuild: true` to the recipe. May be specified multiple times or
+  separate multiple arguments with commas.
+- `--annotate PACKAGE=COMMENT`: Store `COMMENT` in the build metadata for
+  `PACKAGE`. The comment will only be stored if the package is compiled or
+  downloaded during this run. May be specified multiple times.
+- `--only-deps`: Only build dependencies, not the main package. Useful for
+  populating a build cache.
+- `--plugin PLUGIN`: Plugin to use for the build. Default is `legacy`.
 - `--always-prefer-system`: Always use system packages when compatible.
 - `--no-system`: Never use system packages, even if compatible.
 
@@ -102,8 +115,8 @@ provides tarballs for the most common supported architectures.
 
 ## Using precompiled packages
 
-By running aliBuild with no special option on CentOS/Alma 7, 8 or 9, or on
-Ubuntu 20.04, 22.04 or 24.04, it will automatically try to
+By running aliBuild with no special option on CentOS/Alma 7, 8 or 9 (x86-64 or ARM),
+or on Ubuntu 20.04, 22.04 or 24.04 (x86-64), it will automatically try to
 use as many precompiled packages as possible by downloading them from a default
 central server. By using precompiled packages you lose the ability to pick some
 of them from your system. If you do not want to use precompiled packages and you
@@ -199,16 +212,30 @@ case the incremental recipe will always be executed.
 
 While alibuild does its best to find out which OS / distribution you are
 using, sometimes it might fail to do so, for example in the case you
-start using a new *buntu flavour or a bleeding edge version of Centos.
-In order to force the the correct architecture for the build you can use
+start using a new *buntu flavour or a bleeding edge version of a distribution.
+In order to force the correct architecture for the build you can use
 the `--architecture` (`-a`) flag with one of the supported options:
 
-- `slc5_x86-64`: Scientific Linux 5 and compatibles, on Intel / AMD x86-64.
-- `slc6_x86-64`: Scientific Linux 6 and compatibles, on Intel / AMD x86-64.
-- `slc7_x86-64`: CERN Centos 7 and compatibles, on Intel / AMD x86-64.
-- `ubuntu1404_x86-64`: Ubuntu 1404 and compatibles, on Intel / AMD x86-64.
-- `osx_x86-64`: OSX, on Intel / AMD x86-64.
-- `slc7_ppc64`: RHEL7 on POWER8 (LE only for now).
+On Linux, x86-64:
+- `slc6_x86-64`: RHEL6 / SLC6 compatible
+- `slc7_x86-64`: RHEL7 / CC7 compatible
+- `slc8_x86-64`: RHEL8 / CC8 compatible
+- `slc9_x86-64`: RHEL9 / ALMA9 compatible
+- `ubuntu2004_x86-64`: Ubuntu 20.04 compatible
+- `ubuntu2204_x86-64`: Ubuntu 22.04 compatible
+- `ubuntu2404_x86-64`: Ubuntu 24.04 compatible
+- `fedora33_x86-64`: Fedora 33 compatible
+- `fedora34_x86-64`: Fedora 34 compatible
+
+On Linux, ARM:
+- `slc9_aarch64`: RHEL9 / ALMA9 compatible
+
+On Linux, POWER8 / PPC64 (little endian):
+- `slc7_ppc64`: RHEL7 / CC7 compatible
+
+On Mac:
+- `osx_x86-64`: Intel
+- `osx_arm64`: Apple Silicon
 
 ### Running in Docker
 
@@ -234,27 +261,33 @@ option using the same syntax used by Docker.
 
 ## Defaults
 
-By default `aliBuild` is tuned to build the production version of ALICE
-Offline software, as deployed on the Grid, so some of the choices in
-terms of version of the packages and compilation flags are tweaked for
-that. For example, ROOT5 is used because that's what is what has been
-validated for datataking and the choice will not change until the end of
-RUN2 of LHC. In order to change that and use, for example, a more recent
-version of ROOT you can use the `--default root6` option which will
-enable ROOT6 based builds. For a more complete description of how defaults
-works please look at [the reference manual](reference.md#defaults).
+By default, `aliBuild` uses the `o2` defaults (`--defaults o2`), which are
+optimized for building the ALICE O2 software stack. The defaults system
+allows you to specify different sets of build configurations, compiler
+flags, and package versions through the `--defaults` option.
+
+Different defaults can be used to:
+- Use different package versions (e.g., different ROOT versions)
+- Apply specific compiler flags (e.g., debug builds, optimization levels)
+- Enable or disable certain features or packages
+
+To use a different set of defaults, use the `--defaults <name>` option,
+which will load settings from `CONFIGDIR/defaults-<name>.sh`. For example,
+`--defaults o2-epn` would use the `defaults-o2-epn.sh` file.
+
+For a more complete description of how the defaults system works and how to
+create custom defaults, please look at [the reference manual](reference.md#defaults).
 
 ## Disabling packages
 
 You can optionally disable certain packages by specifying them as a comma
 separated list with the `--disable` option.
 
-Moreover, starting from aliBuild 1.4.0, it will also be
-possible to disable packages by adding them to the `disable`
-keyword of your defaults file (see previous paragraph). See the
+It's also possible to disable packages by adding them to the `disable` keyword
+of your defaults file (see previous paragraph). See the
 [defaults-o2.sh](https://github.com/alisw/alidist/blob/master/defaults-o2.sh)
-file for an example of how to disable `AliEn-Runtime` and `AliRoot`
-when passing `--defaults o2`.
+file for an example of how to disable `mesos` and `MySQL` when
+passing `--defaults o2`.
 
 ## Controlling which system packages are picked up
 
@@ -294,15 +327,12 @@ installation area.
 
 ## Upgrading aliBuild
 
-aliBuild is installed via `pip`. In order to upgrade it on most laptops (in
-particular Macs) do:
+aliBuild can be installed either via `pip`, or by your OS package manager (more info [here](https://alice-doc.github.io/alice-analysis-tutorial/building/custom.html). 
 
-    pip install --upgrade alibuild
+The way to upgrade it depends on your installation method. If you installed it
+via `pip`, you can upgrade it by running:
 
-or in case you need to be root (_e.g._ on Ubuntu and most Linux distributions
-for convenience):
-
-    sudo pip install --upgrade alibuild
+    pip install --upgrade alibuild
 
 In general updating aliBuild is safe and it should never trigger a rebuild or
 break compilation of older versions of alidist (i.e. we do try to guarantee
@@ -315,10 +345,8 @@ when running the command.
 You can also upgrade / install a specific version of alibuild by specifying it on the 
 command line. E.g.:
 
-    pip install alibuild=1.5.5.rc1
+    pip install alibuild=1.17.23
     
-this is in particular required when you want to try out release candidates (rc) builds which
-are masked out by default.
 
 ## Rebuilding packages from branches instead of tags
 
@@ -339,11 +367,11 @@ server-side pull request checks).
 
 ## Generating a dependency graph
 
-It is possible to generating a PDF with a dependency graph using the `aliDeps`
+It is possible to generating a PDF with a dependency graph using the `aliBuild deps`
 tool. Assuming you run it from a directory containing `alidist`, and you have
 Graphviz installed on your system, you can simply run:
 
-    aliDeps O2 --outgraph graph.pdf
+    aliBuild deps O2 --outgraph graph.pdf
 
 The example above generates a dependency graph for the package `O2`, and saving
 the results to a PDF file named `graph.pdf`. This is what the graph looks like:
@@ -357,13 +385,25 @@ others (this can indicate an error in the recipes).
 Connections are color-coded as well: blue connections indicate a runtime
 dependency whereas a grey connection indicate a build dependency.
 
-By default, `aliDeps` runs the usual system checks to exclude packages that can
+By default, `aliBuild deps` runs the usual system checks to exclude packages that can
 be taken from the system. If you want to display the full list of dependencies,
 you may want to use:
 
-    aliDeps O2 --no-system --outgraph graph.pdf
+    aliBuild deps O2 --no-system --outgraph graph.pdf
+
+Additional useful options for `aliBuild deps` include:
+
+- `--neat`: Produce a graph with transitive reduction, removing edges that are
+  implied by other paths in the graph. This can make complex dependency graphs
+  easier to read.
+- `--outdot FILE`: Keep the intermediate Graphviz dot file in `FILE`. Useful if
+  you want to manually modify the graph or generate output in different formats.
+
+For example, to generate a simplified graph and keep the dot file:
+
+    aliBuild deps O2 --neat --outdot graph.dot --outgraph graph.pdf
 
-Please run `aliDeps --help` for further information.
+Please run `aliBuild deps --help` for further information.
 
 ## Using the packages you have built
 

{alibuild-1.17.30 → alibuild-1.17.32}/tests/test_build.py

@@ -1,6 +1,7 @@
 from argparse import Namespace
 import os
 import os.path
+import platform
 import re
 import sys
 import unittest
@@ -12,6 +13,19 @@ from collections import OrderedDict
 from alibuild_helpers.utilities import parseRecipe, resolve_tag
 from alibuild_helpers.build import doBuild, storeHashes, generate_initdotsh
 
+# Determine architecture based on platform
+def get_test_architecture():
+    if sys.platform == 'darwin':
+        machine = platform.machine()
+        if machine == 'arm64':
+            return 'osx_arm64'
+        else:
+            return 'osx_x86-64'
+    else:
+        return 'slc7_x86-64'
+
+TEST_ARCHITECTURE = os.environ.get('ARCHITECTURE', get_test_architecture())
+
 
 TEST_DEFAULT_RELEASE = """\
 package: defaults-release
@@ -23,7 +37,7 @@ TEST_DEFAULT_RELEASE_BUILD_HASH = "27ce49698e818e8efb56b6eff6dd785e503df341"
 
 TEST_ZLIB_RECIPE = """\
 package: zlib
-version: v1.2.3
+version: v1.3.1
 source: https://github.com/madler/zlib
 tag: master
 ---
@@ -32,7 +46,7 @@ make
 make install
 """
 TEST_ZLIB_GIT_REFS = "8822efa61f2a385e0bc83ca5819d608111b2168a\trefs/heads/master"
-TEST_ZLIB_BUILD_HASH = "8cd1f56c450f05ffbba3276bad08eae30f814999"
+TEST_ZLIB_BUILD_HASH = "4d6a75f214dc7931a2a7d5ba82ea0568e652cd84"
 
 TEST_ROOT_RECIPE = """\
 package: ROOT
@@ -71,7 +85,7 @@ TEST_ROOT_GIT_REFS = """\
 87b87c4322d2a3fad315c919cb2e2dd73f2154dc\trefs/heads/master
 f7b336611753f1f4aaa94222b0d620748ae230c0\trefs/heads/v6-08-00-patches
 f7b336611753f1f4aaa94222b0d620748ae230c0\trefs/tags/test-tag"""
-TEST_ROOT_BUILD_HASH = ("8ec3f41b6b585ef86a02e9c595eed67f34d63f08")
+TEST_ROOT_BUILD_HASH = ("1f3c771080f71b6c0d2e3d7a285698a20035da12")
 
 
 TEST_EXTRA_RECIPE = """\
@@ -88,18 +102,18 @@ f000\trefs/heads/master
 ba22\trefs/tags/v1
 ba22\trefs/tags/v2
 baad\trefs/tags/v3"""
-TEST_EXTRA_BUILD_HASH = ("5afae57bfc6a374e74c1c4427698ab5edebce0bc")
+TEST_EXTRA_BUILD_HASH = ("6e7bc4976abf77b558cf7faf575ec51670f8d0e5")
 
 
 GIT_CLONE_REF_ZLIB_ARGS = ("clone", "--bare", "https://github.com/madler/zlib",
                            "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
 GIT_CLONE_SRC_ZLIB_ARGS = ("clone", "-n", "https://github.com/madler/zlib",
-                           "/sw/SOURCES/zlib/v1.2.3/8822efa61f",
+                           "/sw/SOURCES/zlib/v1.3.1/8822efa61f",
                            "--dissociate", "--reference", "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
 GIT_SET_URL_ZLIB_ARGS = ("remote", "set-url", "--push", "origin", "https://github.com/madler/zlib"), \
-    "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
+    "/sw/SOURCES/zlib/v1.3.1/8822efa61f", False
 GIT_CHECKOUT_ZLIB_ARGS = ("checkout", "-f", "master"), \
-    "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
+    "/sw/SOURCES/zlib/v1.3.1/8822efa61f", False
 
 GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "--prune", "--filter=blob:none", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
                            "+refs/heads/*:refs/heads/*"), "/sw/MIRROR/root", False
@@ -143,9 +157,9 @@ def dummy_open(x, mode="r", encoding=None, errors=None):
                 "/sw/BUILD/%s/defaults-release/.build_succeeded" % TEST_DEFAULT_RELEASE_BUILD_HASH: (0, StringIO("0")),
                 "/sw/BUILD/%s/zlib/.build_succeeded" % TEST_ZLIB_BUILD_HASH: (0, StringIO("0")),
                 "/sw/BUILD/%s/ROOT/.build_succeeded" % TEST_ROOT_BUILD_HASH: (0, StringIO("0")),
-                "/sw/osx_x86-64/defaults-release/v1-1/.build-hash": (1, StringIO(TEST_DEFAULT_RELEASE_BUILD_HASH)),
-                "/sw/osx_x86-64/zlib/v1.2.3-local1/.build-hash": (1, StringIO(TEST_ZLIB_BUILD_HASH)),
-                "/sw/osx_x86-64/ROOT/v6-08-30-local1/.build-hash": (1, StringIO(TEST_ROOT_BUILD_HASH))
+                f"/sw/{TEST_ARCHITECTURE}/defaults-release/v1-1/.build-hash": (1, StringIO(TEST_DEFAULT_RELEASE_BUILD_HASH)),
+                f"/sw/{TEST_ARCHITECTURE}/zlib/v1.3.1-local1/.build-hash": (1, StringIO(TEST_ZLIB_BUILD_HASH)),
+                f"/sw/{TEST_ARCHITECTURE}/ROOT/v6-08-30-local1/.build-hash": (1, StringIO(TEST_ROOT_BUILD_HASH))
             }[x]
         except KeyError:
             return DEFAULT
@@ -163,17 +177,16 @@ def dummy_execute(x, **kwds):
     if re.match(".*ln -sfn.*TARS", s):
         return 0
     return {
-        "/bin/bash -e -x /sw/SPECS/osx_x86-64/defaults-release/v1-1/build.sh 2>&1": 0,
-        '/bin/bash -e -x /sw/SPECS/osx_x86-64/zlib/v1.2.3-local1/build.sh 2>&1': 0,
-        '/bin/bash -e -x /sw/SPECS/osx_x86-64/ROOT/v6-08-30-local1/build.sh 2>&1': 0,
+        f"/bin/bash -e -x /sw/SPECS/{TEST_ARCHITECTURE}/defaults-release/v1-1/build.sh 2>&1": 0,
+        f'/bin/bash -e -x /sw/SPECS/{TEST_ARCHITECTURE}/zlib/v1.3.1-local1/build.sh 2>&1': 0,
+        f'/bin/bash -e -x /sw/SPECS/{TEST_ARCHITECTURE}/ROOT/v6-08-30-local1/build.sh 2>&1': 0,
     }[s]
 
 
 def dummy_readlink(x):
     return {
-        "/sw/TARS/osx_x86-64/defaults-release/defaults-release-v1-1.osx_x86-64.tar.gz":
-        "../../osx_x86-64/store/%s/%s/defaults-release-v1-1.osx_x86-64.tar.gz" %
-        (TEST_DEFAULT_RELEASE_BUILD_HASH[:2], TEST_DEFAULT_RELEASE_BUILD_HASH)
+        f"/sw/TARS/{TEST_ARCHITECTURE}/defaults-release/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz":
+        f"../../{TEST_ARCHITECTURE}/store/{TEST_DEFAULT_RELEASE_BUILD_HASH[:2]}/{TEST_DEFAULT_RELEASE_BUILD_HASH}/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz"
     }[x]
 
 
@@ -224,13 +237,11 @@ class BuildTestCase(unittest.TestCase):
     @patch("os.listdir")
     @patch("alibuild_helpers.build.glob", new=lambda pattern: {
         "*": ["zlib"],
-        "/sw/TARS/osx_x86-64/store/%s/%s/*gz" % (TEST_DEFAULT_RELEASE_BUILD_HASH[:2],
-                                                 TEST_DEFAULT_RELEASE_BUILD_HASH): [],
-        "/sw/TARS/osx_x86-64/store/%s/%s/*gz" % (TEST_ZLIB_BUILD_HASH[:2], TEST_ZLIB_BUILD_HASH): [],
-        "/sw/TARS/osx_x86-64/store/%s/%s/*gz" % (TEST_ROOT_BUILD_HASH[:2], TEST_ROOT_BUILD_HASH): [],
-        "/sw/TARS/osx_x86-64/defaults-release/defaults-release-v1-1.osx_x86-64.tar.gz":
-        ["../../osx_x86-64/store/%s/%s/defaults-release-v1-1.osx_x86-64.tar.gz" %
-         (TEST_DEFAULT_RELEASE_BUILD_HASH[:2], TEST_DEFAULT_RELEASE_BUILD_HASH)],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/store/{TEST_DEFAULT_RELEASE_BUILD_HASH[:2]}/{TEST_DEFAULT_RELEASE_BUILD_HASH}/*gz": [],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/store/{TEST_ZLIB_BUILD_HASH[:2]}/{TEST_ZLIB_BUILD_HASH}/*gz": [],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/store/{TEST_ROOT_BUILD_HASH[:2]}/{TEST_ROOT_BUILD_HASH}/*gz": [],
+        f"/sw/TARS/{TEST_ARCHITECTURE}/defaults-release/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz":
+        [f"../../{TEST_ARCHITECTURE}/store/{TEST_DEFAULT_RELEASE_BUILD_HASH[:2]}/{TEST_DEFAULT_RELEASE_BUILD_HASH}/defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz"],
     }[pattern])
     @patch("alibuild_helpers.build.readlink", new=dummy_readlink)
     @patch("alibuild_helpers.build.banner", new=MagicMock(return_value=None))
@@ -243,9 +254,9 @@ class BuildTestCase(unittest.TestCase):
         mock_debug.side_effect = lambda *args: None
         mock_warning.side_effect = lambda *args: None
         mock_listdir.side_effect = lambda directory: {
-            "/sw/TARS/osx_x86-64/defaults-release": ["defaults-release-v1-1.osx_x86-64.tar.gz"],
-            "/sw/TARS/osx_x86-64/zlib": [],
-            "/sw/TARS/osx_x86-64/ROOT": [],
+            f"/sw/TARS/{TEST_ARCHITECTURE}/defaults-release": [f"defaults-release-v1-1.{TEST_ARCHITECTURE}.tar.gz"],
+            f"/sw/TARS/{TEST_ARCHITECTURE}/zlib": [],
+            f"/sw/TARS/{TEST_ARCHITECTURE}/ROOT": [],
         }.get(directory, DEFAULT)
         os.environ["ALIBUILD_NO_ANALYTICS"] = "1"
 
@@ -257,7 +268,7 @@ class BuildTestCase(unittest.TestCase):
             docker=False,
             dockerImage=None,
             docker_extra_args=["--network=host"],
-            architecture="osx_x86-64",
+            architecture=TEST_ARCHITECTURE,
             workDir="/sw",
             pkgname=["root"],
             configDir="/alidist",
@@ -319,7 +330,7 @@ class BuildTestCase(unittest.TestCase):
         doBuild(args, mock_parser)
         mock_warning.assert_called_with("%s.sh contains a recipe, which will be ignored", "defaults-release")
         mock_debug.assert_called_with("Everything done")
-        mock_listdir.assert_called_with("/sw/TARS/osx_x86-64/ROOT")
+        mock_listdir.assert_called_with(f"/sw/TARS/{TEST_ARCHITECTURE}/ROOT")
         # We can't compare directly against the list of calls here as they
         # might happen in any order.
         mock_git_git.assert_has_calls(common_calls + [
@@ -406,8 +417,8 @@ class BuildTestCase(unittest.TestCase):
         self.assertNotIn("Extra", complete_initdotsh)
 
         # Dependencies must be loaded both for this build and for subsequent ones.
-        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.2.3-1/etc/profile.d/init.sh', setup_initdotsh)
-        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.2.3-1/etc/profile.d/init.sh', complete_initdotsh)
+        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.3.1-1/etc/profile.d/init.sh', setup_initdotsh)
+        self.assertIn('. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/zlib/v1.3.1-1/etc/profile.d/init.sh', complete_initdotsh)
 
         # ROOT-specific variables must not be set during ROOT's build yet...
         self.assertNotIn("export ROOT_VERSION=", setup_initdotsh)

{alibuild-1.17.30 → alibuild-1.17.32}/tests/test_sync.py

@@ -16,19 +16,19 @@ GOOD_HASH = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
 BAD_HASH = "baadf00dbaadf00dbaadf00dbaadf00dbaadf00d"
 NONEXISTENT_HASH = "TRIGGERS_A_404"
 GOOD_SPEC = {    # fully present on the remote store
-    "package": PACKAGE, "version": "v1.2.3", "revision": "1",
+    "package": PACKAGE, "version": "v1.3.1", "revision": "1",
     "hash": GOOD_HASH,
     "remote_revision_hash": GOOD_HASH,
     "remote_hashes": [GOOD_HASH],
 }
 BAD_SPEC = {     # partially present on the remote store
-    "package": PACKAGE, "version": "v1.2.3", "revision": "2",
+    "package": PACKAGE, "version": "v1.3.1", "revision": "2",
     "hash": BAD_HASH,
     "remote_revision_hash": BAD_HASH,
     "remote_hashes": [BAD_HASH],
 }
 MISSING_SPEC = {    # completely absent from the remote store
-    "package": PACKAGE, "version": "v1.2.3", "revision": "3",
+    "package": PACKAGE, "version": "v1.3.1", "revision": "3",
     "hash": NONEXISTENT_HASH,
     "remote_revision_hash": NONEXISTENT_HASH,
     "remote_hashes": [NONEXISTENT_HASH],

{alibuild-1.17.30 → alibuild-1.17.32}/tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.20
-envlist = lint, py{37, 38, 39, 310, 311, 312, 313}, darwin
+envlist = lint, py{37, 38, 39, 310, 311, 312, 313, 314}, darwin
 
 [gh-actions]
 # The "lint" job is run separately.
@@ -12,6 +12,7 @@ python =
     3.11: py311
     3.12: py312
     3.13: py313
+    3.14: py314
 
 ; [testenv:lint]
 ; # Warning: This environment inherits settings from the main [testenv] section.
@@ -121,7 +122,7 @@ commands =
     darwin: sl clone https://github.com/alisw/alidist alidist-sapling
     darwin: coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} -c alidist-sapling --no-system --disable GCC-Toolchain build zlib
     darwin: rm -fr zlib
-    darwin: sl clone https://github.com/alisw/zlib
+    darwin: sl clone https://github.com/madler/zlib
     darwin: coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} --no-system --disable GCC-Toolchain build zlib
     touch zlib/foo
     darwin: coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} --no-system --disable GCC-Toolchain build zlib

alibuild-1.17.30/docs/README.md

@@ -1 +0,0 @@
-Read the documentation here: <http://alisw.github.io/alibuild/>