alibuild 1.17.12__tar.gz → 1.17.14__tar.gz

{alibuild-1.17.12 → alibuild-1.17.14}/.github/workflows/pr-check.yml

@@ -30,6 +30,7 @@ jobs:
           - '3.10.6'  # ubuntu2204 container
           - '3.11'
           - '3.12'
+          - '3.13'
 
     steps:
       - uses: actions/checkout@v4
@@ -60,13 +61,13 @@ jobs:
 
       - name: Upload coverage information
         if: ${{ always() && github.event.repository.owner.login == 'alisw' }}
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           files: coverage.json
 
   mac-unittest:
     name: mac-python${{ matrix.python-version }}
-    runs-on: macos-latest
+    runs-on: macos-14
 
     strategy:
       fail-fast: false   # continue executing other checks if one fails
@@ -75,15 +76,18 @@ jobs:
           - '3.11'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install test dependencies
         run: |
+          # Hack to remove whatever the CI default image brings now, as it
+          # conflicts with the one in o2-full-deps [O2-5580]
+          brew uninstall --ignore-dependencies --force pkg-config@0.29.2 
           brew install modules alisw/system-deps/o2-full-deps sapling
           python3 -m pip install --upgrade tox tox-gh-actions coverage
 
@@ -102,7 +106,7 @@ jobs:
 
       - name: Upload coverage information
         if: ${{ always() && github.event.repository.owner.login == 'alisw' }}
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           files: coverage.json
 
@@ -111,10 +115,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
 

{alibuild-1.17.12 → alibuild-1.17.14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: alibuild
-Version: 1.17.12
+Version: 1.17.14
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -18,13 +18,18 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3
+Requires-Dist: boto3==1.23.10
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
 
 .. image:: https://badge.fury.io/py/alibuild.svg
 .. image:: https://github.com/alisw/alibuild/actions/workflows/pr-check.yml/badge.svg?branch=master&event=push

{alibuild-1.17.12 → alibuild-1.17.14}/alfaBuild

@@ -57,7 +57,7 @@ def doMain(args, parser):
       error(e.message)
       exit(1)
 
-  if args.action == "version":
+  if args.action == "version" or args.action == None:
     print("aliBuild version: {version} ({arch})".format(
       version=__version__ or "unknown", arch=args.architecture or "unknown"))
     sys.exit(0)

{alibuild-1.17.12 → alibuild-1.17.14}/aliBuild

@@ -57,7 +57,7 @@ def doMain(args, parser):
       error(e.message)
       exit(1)
 
-  if args.action == "version":
+  if args.action == "version" or args.action == None:
     print("aliBuild version: {version} ({arch})".format(
       version=__version__ or "unknown", arch=args.architecture or "unknown"))
     sys.exit(0)

{alibuild-1.17.12 → alibuild-1.17.14}/alibuild.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: alibuild
-Version: 1.17.12
+Version: 1.17.14
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -18,13 +18,18 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3
+Requires-Dist: boto3==1.23.10
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
 
 .. image:: https://badge.fury.io/py/alibuild.svg
 .. image:: https://github.com/alisw/alibuild/actions/workflows/pr-check.yml/badge.svg?branch=master&event=push

{alibuild-1.17.12 → alibuild-1.17.14}/alibuild.egg-info/requires.txt

@@ -2,4 +2,4 @@ pyyaml
 requests
 distro
 jinja2
-boto3
+boto3==1.23.10

{alibuild-1.17.12 → alibuild-1.17.14}/alibuild_helpers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.12'
-__version_tuple__ = version_tuple = (1, 17, 12)
+__version__ = version = '1.17.14'
+__version_tuple__ = version_tuple = (1, 17, 14)

{alibuild-1.17.12 → alibuild-1.17.14}/alibuild_helpers/build.py

@@ -4,8 +4,8 @@ from alibuild_helpers import __version__
 from alibuild_helpers.analytics import report_event
 from alibuild_helpers.log import debug, info, banner, warning
 from alibuild_helpers.log import dieOnError
-from alibuild_helpers.cmd import execute, DockerRunner, BASH, install_wrapper_script
-from alibuild_helpers.utilities import prunePaths, symlink, call_ignoring_oserrors, topological_sort
+from alibuild_helpers.cmd import execute, DockerRunner, BASH, install_wrapper_script, getstatusoutput
+from alibuild_helpers.utilities import prunePaths, symlink, call_ignoring_oserrors, topological_sort, detectArch
 from alibuild_helpers.utilities import resolve_store_path
 from alibuild_helpers.utilities import parseDefaults, readDefaults
 from alibuild_helpers.utilities import getPackageList, asList
@@ -1112,6 +1112,29 @@ def doBuild(args, parser):
       """)
       buildErrMsg += "".join("\n  ( cd %s && git pull --rebase )" % dp for dp in updatablePkgs)
 
+    # Gather build info for the error message
+    try:
+      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}
+      """)
+
+      if detected_arch.startswith("osx"):
+        buildErrMsg += f'XCode version: {getstatusoutput("xcodebuild -version")[1]}'
+
+    except Exception as exc:
+      warning("Failed to gather build info", exc_info=exc)
+
+
     dieOnError(err, buildErrMsg.strip())
 
     # We need to create 2 sets of links, once with the full requires,

{alibuild-1.17.12 → alibuild-1.17.14}/alibuild_helpers/utilities.py

@@ -493,27 +493,28 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
             if re.match(replacement_matcher, key):
               replacement = spec["prefer_system_replacement_specs"][replacement_matcher]
               break
-          dieOnError(replacement is None, "Could not find named replacement spec for "
-                     "%s: %s" % (spec["package"], key))
-          assert(replacement)
-          # We must keep the package name the same, since it is used to
-          # specify dependencies.
-          replacement["package"] = spec["package"]
-          # The version is required for all specs. What we put there will
-          # influence the package's hash, so allow the user to override it.
-          replacement.setdefault("version", requested_version)
-          spec = replacement
-          # Allows generalising the version based on the actual key provided
-          spec["version"] = spec["version"].replace("%(key)s", key)
-          recipe = replacement.get("recipe", "")
-          # If there's an explicitly-specified recipe, we're still building
-          # the package. If not, aliBuild will still "build" it, but it's
-          # basically instantaneous, so report to the user that we're taking
-          # it from the system.
-          if recipe:
-            ownPackages.add(spec["package"])
+          if replacement:
+            # We must keep the package name the same, since it is used to
+            # specify dependencies.
+            replacement["package"] = spec["package"]
+            # The version is required for all specs. What we put there will
+            # influence the package's hash, so allow the user to override it.
+            replacement.setdefault("version", requested_version)
+            spec = replacement
+            # Allows generalising the version based on the actual key provided
+            spec["version"] = spec["version"].replace("%(key)s", key)
+            recipe = replacement.get("recipe", "")
+            # If there's an explicitly-specified recipe, we're still building
+            # the package. If not, aliBuild will still "build" it, but it's
+            # basically instantaneous, so report to the user that we're taking
+            # it from the system.
+            if recipe:
+              ownPackages.add(spec["package"])
+            else:
+              systemPackages.add(spec["package"])
           else:
-            systemPackages.add(spec["package"])
+            warning(f"Could not find named replacement spec for {spec['package']}: {key}, "
+                    "falling back to building the package ourselves.")
 
     dieOnError(("system_requirement" in spec) and recipe.strip("\n\t "),
                "System requirements %s cannot have a recipe" % spec["package"])

{alibuild-1.17.12 → alibuild-1.17.14}/docs/docs/reference.md

@@ -33,7 +33,7 @@ An example recipe for `zlib` is the following:
 ```yaml
 package: zlib
 version: v1.2.8
-source: https://github.com/star-externals/zlib
+source: https://github.com/madler/zlib
 tag: v1.2.8
 ---
 #!/bin/bash -ex

{alibuild-1.17.12 → alibuild-1.17.14}/docs/docs/troubleshooting.md

@@ -318,7 +318,7 @@ Then, configure git to use SSH to authenticate with CERN GitLab using the follow
 git config --global 'url.ssh://git@gitlab.cern.ch:7999/.insteadof' 'https://gitlab.cern.ch/'
 ```
 
-[gitlab-ssh-key]: https://gitlab.cern.ch/-/profile/keys
+[gitlab-ssh-key]: https://gitlab.cern.ch/-/user_settings/ssh_keys
 
 #### Caching passwords
 

{alibuild-1.17.12 → alibuild-1.17.14}/pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
     'Programming Language :: Python :: 3.10',  # ubuntu2204
     'Programming Language :: Python :: 3.11',  # MacOS
     'Programming Language :: Python :: 3.12',  # MacOS
+    'Programming Language :: Python :: 3.13',  # MacOS
 ]
 
 dependencies = [
@@ -31,7 +32,7 @@ dependencies = [
   'requests',
   'distro',
   'jinja2',
-  'boto3',
+  'boto3==1.23.10',
 ]
 
 [project.urls]

alibuild-1.17.14/requirements.txt

@@ -0,0 +1,7 @@
+requests
+pyyaml
+distro
+jinja2
+# https://github.com/boto/boto3/issues/4398
+# This version is the last compatible with python 3.6.8
+boto3==1.23.10; python_version >= '3.6'

{alibuild-1.17.12 → alibuild-1.17.14}/setup.py

@@ -19,7 +19,7 @@ install_requires = ['pyyaml', 'requests', 'distro', 'jinja2']
 # Old setuptools versions (which pip2 uses) don't support range comparisons
 # (like :python_version >= "3.6") in extras_require, so do this ourselves here.
 if sys.version_info >= (3, 6):
-    install_requires.append('boto3')
+    install_requires.append('boto3==1.23.10')
 
 setup(
     name='alibuild',

{alibuild-1.17.12 → alibuild-1.17.14}/tests/test_args.py

@@ -8,6 +8,7 @@ from alibuild_helpers.args import doParseArgs, matchValidArch, finaliseArgs, DEF
 import sys
 import os
 import os.path
+import re
 
 import unittest
 import shlex
@@ -16,18 +17,18 @@ 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 = [call(u"Unknown / unsupported architecture: foo.\n\n{table}Alternatively, you can use the `--force-unknown-architecture' option.".format(table=ARCHITECTURE_TABLE))]
+ARCHITECTURE_ERROR = u"Unknown / unsupported architecture: foo.\n\n.*"
 PARSER_ERRORS = {
-  "build --force-unknown-architecture": [call(BUILD_MISSING_PKG_ERROR)],
-  "build --force-unknown-architecture zlib --foo": [call('unrecognized arguments: --foo')],
-  "init --docker-image": [call('unrecognized arguments: --docker-image')],
-  "builda --force-unknown-architecture zlib" : [call("argument action: invalid choice: 'builda' (choose from 'analytics', 'architecture', 'build', 'clean', 'deps', 'doctor', 'init', 'version')")],
-  "build --force-unknown-architecture zlib --no-system --always-prefer-system" : [call('argument --always-prefer-system: not allowed with argument --no-system')],
+  "build --force-unknown-architecture": BUILD_MISSING_PKG_ERROR,
+  "build --force-unknown-architecture zlib --foo": 'unrecognized arguments: --foo',
+  "init --docker-image": 'unrecognized arguments: --docker-image',
+  "builda --force-unknown-architecture zlib" : "argument action: invalid choice: 'builda'.*",
+  "build --force-unknown-architecture zlib --no-system --always-prefer-system" : 'argument --always-prefer-system: not allowed with argument --no-system',
   "build zlib --architecture foo": ARCHITECTURE_ERROR,
-  "build --force-unknown-architecture zlib --remote-store rsync://test1.local/::rw --write-store rsync://test2.local/::rw ": [call('cannot specify ::rw and --write-store at the same time')],
-  "build zlib -a osx_x86-64 --docker-image foo": [call('cannot use `-a osx_x86-64` and --docker')],
-  "build zlib -a slc7_x86-64 --annotate foobar": [call("--annotate takes arguments of the form PACKAGE=COMMENT")],
-  "analytics": [call(ANALYTICS_MISSING_STATE_ERROR)]
+  "build --force-unknown-architecture zlib --remote-store rsync://test1.local/::rw --write-store rsync://test2.local/::rw ": 'cannot specify ::rw and --write-store at the same time',
+  "build zlib -a osx_x86-64 --docker-image foo": 'cannot use `-a osx_x86-64` and --docker',
+  "build zlib -a slc7_x86-64 --annotate foobar": "--annotate takes arguments of the form PACKAGE=COMMENT",
+  "analytics": ANALYTICS_MISSING_STATE_ERROR
 }
 
 # A few valid archs
@@ -97,11 +98,17 @@ class ArgsTestCase(unittest.TestCase):
   @mock.patch('alibuild_helpers.args.argparse.ArgumentParser.error')
   def test_failingParsing(self, mock_print):
     mock_print.side_effect = FakeExit("raised")
-    for (cmd, calls) in PARSER_ERRORS.items():
+    for (cmd, pattern) in PARSER_ERRORS.items():
       mock_print.mock_calls = []
       with patch.object(sys, "argv", ["alibuild"] + shlex.split(cmd)):
         self.assertRaises(FakeExit, doParseArgs)
-        self.assertEqual(mock_print.mock_calls, calls)
+        for mock_call in mock_print.mock_calls:
+          args = mock_call[1]
+          print(args)
+          self.assertTrue(
+                re.match(pattern, args[0]),
+                f"Expected '{args[0]}' matching '{pattern}' but it's not the case."
+            )
 
   def test_validArchitectures(self):
     for arch in VALID_ARCHS:

{alibuild-1.17.12 → alibuild-1.17.14}/tests/test_build.py

@@ -25,7 +25,7 @@ TEST_DEFAULT_RELEASE_BUILD_HASH = "27ce49698e818e8efb56b6eff6dd785e503df341"
 TEST_ZLIB_RECIPE = """\
 package: zlib
 version: v1.2.3
-source: https://github.com/star-externals/zlib
+source: https://github.com/madler/zlib
 tag: master
 ---
 ./configure
@@ -92,12 +92,12 @@ baad\trefs/tags/v3"""
 TEST_EXTRA_BUILD_HASH = ("5afae57bfc6a374e74c1c4427698ab5edebce0bc")
 
 
-GIT_CLONE_REF_ZLIB_ARGS = ("clone", "--bare", "https://github.com/star-externals/zlib",
+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/star-externals/zlib",
+GIT_CLONE_SRC_ZLIB_ARGS = ("clone", "-n", "https://github.com/madler/zlib",
                            "/sw/SOURCES/zlib/v1.2.3/8822efa61f",
                            "--dissociate", "--reference", "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
-GIT_SET_URL_ZLIB_ARGS = ("remote", "set-url", "--push", "origin", "https://github.com/star-externals/zlib"), \
+GIT_SET_URL_ZLIB_ARGS = ("remote", "set-url", "--push", "origin", "https://github.com/madler/zlib"), \
     "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
 GIT_CHECKOUT_ZLIB_ARGS = ("checkout", "-f", "master"), \
     "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False

{alibuild-1.17.12 → alibuild-1.17.14}/tests/test_packagelist.py

@@ -154,17 +154,20 @@ class ReplacementTestCase(unittest.TestCase):
         self.assertNotIn("with-replacement-recipe", systemPkgs)
         self.assertIn("with-replacement-recipe", ownPkgs)
 
-    @mock.patch("alibuild_helpers.utilities.dieOnError")
-    def test_missing_replacement_spec(self, mock_dieOnError):
-        """Check an error is thrown when the replacement spec is not found."""
-        assert_msg = "Could not find named replacement spec for missing-spec: missing_tag"
-        # Change the behaviour from sys.exit to a regular exception. Without it
-        # we don't stop execution properly and other asserts might trigger
-        mock_dieOnError.side_effect = lambda cond, _: (_ for _ in ()).throw(Exception("dieOnError called")) if cond else None
-        with self.assertRaises(Exception, msg=assert_msg) as context:
-            specs, systemPkgs, ownPkgs, failedReqs, validDefaults = \
-                getPackageListWithDefaults(["missing-spec"])
-        self.assertEqual(str(context.exception), "dieOnError called", msg=assert_msg)
+    @mock.patch("alibuild_helpers.utilities.warning")
+    def test_missing_replacement_spec(self, mock_warning):
+        """Check a warning is displayed when the replacement spec is not found."""
+        warning_msg = "falling back to building the package ourselves"
+        warning_exists = False
+        def side_effect(msg, *args, **kwargs):
+            nonlocal warning_exists
+            if warning_msg in str(msg):
+              warning_exists = True
+        mock_warning.side_effect = side_effect
+        specs, systemPkgs, ownPkgs, failedReqs, validDefaults = \
+            getPackageListWithDefaults(["missing-spec"])
+        self.assertTrue(warning_exists)
+
 
 
 @mock.patch("alibuild_helpers.utilities.getRecipeReader", new=MockReader)

{alibuild-1.17.12 → alibuild-1.17.14}/tox.ini

@@ -74,7 +74,7 @@ commands =
 
     coverage run --source={toxinidir} -a -m unittest discover {toxinidir}/tests
 
-    git clone -b O2-v1.3.0 --depth 1 https://github.com/alisw/alidist
+    git clone -b alibuild_CI --depth 1 https://github.com/alisw/alidist
 
     coverage run --source={toxinidir} -a {toxinidir}/aliBuild -a {env:ARCHITECTURE} -z test-init init zlib
     # This command is expected to fail, but run it for the coverage anyway.

alibuild-1.17.12/requirements.txt

@@ -1,9 +0,0 @@
-requests
-pyyaml
-distro
-jinja2
-boto3; python_version >= '3.6'
-futures; python_version == '2.7'
-futures; python_version == '2.6'
-argparse; python_version == '2.6'
-ordereddict; python_version == '2.6'