alibuild 1.17.15__tar.gz → 1.17.17__tar.gz

{alibuild-1.17.15 → alibuild-1.17.17}/.github/workflows/documentation.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
+      - run: echo "cache_id=$(date --utc '+%V')" >> "$GITHUB_ENV" 
       - uses: actions/cache@v4
         with:
           key: mkdocs-material-${{ env.cache_id }}

{alibuild-1.17.15 → alibuild-1.17.17}/.github/workflows/pr-check.yml

@@ -74,6 +74,8 @@ jobs:
       matrix:
         python-version:
           - '3.11'
+          - '3.12'
+          - '3.13'
 
     steps:
       - uses: actions/checkout@v4
@@ -110,20 +112,21 @@ jobs:
         with:
           files: coverage.json
 
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Install dependencies
-        run: python -m pip install --upgrade tox tox-gh-actions
-
-      - name: Run linters
-        run: tox -e lint
+  # Temporarily disabled until we decide whether to follow PEP8 or not
+  # lint:
+  #   name: lint
+  #   runs-on: ubuntu-latest
+  #
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #
+  #     - name: Set up Python
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: 3.x
+  #
+  #     - name: Install dependencies
+  #       run: python -m pip install --upgrade tox tox-gh-actions
+  #
+  #     - name: Run linters
+  #       run: tox -e lint

{alibuild-1.17.15 → alibuild-1.17.17}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.15
+Version: 1.17.17
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -25,11 +25,12 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3==1.23.10
+Requires-Dist: boto3<1.36.0
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 
 .. 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.15 → alibuild-1.17.17}/alfaBuild

@@ -57,7 +57,7 @@ def doMain(args, parser):
       error(e.message)
       exit(1)
 
-  if args.action == "version" or args.action == None:
+  if args.action == "version" or args.action is None:
     print("aliBuild version: {version} ({arch})".format(
       version=__version__ or "unknown", arch=args.architecture or "unknown"))
     sys.exit(0)
@@ -111,8 +111,8 @@ if __name__ == "__main__":
   else:
     os.environ["ALIBUILD_ANALYTICS_USER_UUID"] = open(expanduser("~/.config/alibuild/analytics-uuid")).read().strip()
   try:
-    profiler = "--profile" in sys.argv
-    if profiler:
+    useProfiler = "--profile" in sys.argv
+    if useProfiler:
       print("profiler started")
       import cProfile, pstats
       from io import StringIO

{alibuild-1.17.15 → alibuild-1.17.17}/aliBuild

@@ -57,7 +57,7 @@ def doMain(args, parser):
       error(e.message)
       exit(1)
 
-  if args.action == "version" or args.action == None:
+  if args.action == "version" or args.action is None:
     print("aliBuild version: {version} ({arch})".format(
       version=__version__ or "unknown", arch=args.architecture or "unknown"))
     sys.exit(0)
@@ -111,8 +111,8 @@ if __name__ == "__main__":
   else:
     os.environ["ALIBUILD_ANALYTICS_USER_UUID"] = open(expanduser("~/.config/alibuild/analytics-uuid")).read().strip()
   try:
-    profiler = "--profile" in sys.argv
-    if profiler:
+    useProfiler = "--profile" in sys.argv
+    if useProfiler:
       print("profiler started")
       import cProfile, pstats
       from io import StringIO

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.15
+Version: 1.17.17
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -25,11 +25,12 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3==1.23.10
+Requires-Dist: boto3<1.36.0
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 
 .. 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.15 → alibuild-1.17.17}/alibuild.egg-info/requires.txt

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

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.15'
-__version_tuple__ = version_tuple = (1, 17, 15)
+__version__ = version = '1.17.17'
+__version_tuple__ = version_tuple = (1, 17, 17)

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/analytics.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
-import os, subprocess, sys
+import os
+import subprocess
+import sys
 from os.path import exists, expanduser
 from os import unlink
 
@@ -104,7 +106,7 @@ def report_exception(e):
     exd = e.__class__.__name__,
     exf = "1")
 
-def enable_analytics():
+def enable_analytics() -> None:
   if exists(expanduser("~/.config/alibuild/disable-analytics")):
     unlink(expanduser("~/.config/alibuild/disable-analytics"))
   if not exists(expanduser("~/.config/alibuild/analytics-uuid")):

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/args.py

@@ -176,8 +176,8 @@ def doParseArgs():
   build_system = build_parser.add_mutually_exclusive_group()
   build_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",
                             help="Always use system packages when compatible.")
-  build_system.add_argument("--no-system", dest="noSystem", action="store_true",
-                            help="Never use system packages, even if compatible.")
+  build_system.add_argument("--no-system", dest="noSystem", nargs="?", const="*", default=None, metavar="PACKAGES",
+                            help="Never use system packages for the provided, command separated, PACKAGES, even if compatible.")
 
   # Options for clean subcommand
   clean_parser.add_argument("-a", "--architecture", dest="architecture", metavar="ARCH", default=detectedArch,
@@ -237,8 +237,8 @@ def doParseArgs():
   deps_system = deps_parser.add_mutually_exclusive_group()
   deps_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",
                            help="Always use system packages when compatible.")
-  deps_system.add_argument("--no-system", dest="noSystem", action="store_true",
-                           help="Never use system packages, even if compatible.")
+  deps_system.add_argument("--no-system", dest="noSystem", nargs="?", const="*", default=None, metavar="PACKAGES",
+                           help="Never use system packages for PACKAGES, even if compatible.")
 
   # Options for the doctor subcommand
   doctor_parser.add_argument("packages", metavar="PACKAGE", nargs="+",
@@ -258,8 +258,8 @@ def doParseArgs():
   doctor_system = doctor_parser.add_mutually_exclusive_group()
   doctor_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",
                              help="Always use system packages when compatible.")
-  doctor_system.add_argument("--no-system", dest="noSystem", action="store_true",
-                             help="Never use system packages, even if compatible.")
+  doctor_system.add_argument("--no-system", dest="noSystem", nargs="?", const="*", default=None, metavar="PACKAGES",
+                             help="Never use system packages for the provided, command separated, PACKAGES, even if compatible.")
 
   doctor_docker = doctor_parser.add_argument_group(title="Use a Docker container", description="""\
   If you're planning to build inside a Docker container, e.g. using aliBuild
@@ -457,14 +457,14 @@ def finaliseArgs(args, parser):
 
     # On selected platforms, caching is active by default
     if args.architecture in S3_SUPPORTED_ARCHS and not args.preferSystem and not args.no_remote_store:
-      args.noSystem = True
+      args.noSystem = "*"
       if not args.remoteStore:
         args.remoteStore = "https://s3.cern.ch/swift/v1/alibuild-repo"
     elif args.no_remote_store:
       args.remoteStore = ""
 
     if args.remoteStore or args.writeStore:
-      args.noSystem = True
+      args.noSystem = "*"
 
     if args.remoteStore.endswith("::rw") and args.writeStore:
       parser.error("cannot specify ::rw and --write-store at the same time")
@@ -474,7 +474,7 @@ def finaliseArgs(args, parser):
       args.writeStore = args.remoteStore
 
   if args.action in ["build", "init"]:
-    if "develPrefix" in args and args.develPrefix == None:
+    if "develPrefix" in args and args.develPrefix is None:
       if "chdir" in args:
         args.develPrefix = basename(abspath(args.chdir))
       else:

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/build.py

@@ -11,7 +11,6 @@ from alibuild_helpers.utilities import parseDefaults, readDefaults
 from alibuild_helpers.utilities import getPackageList, asList
 from alibuild_helpers.utilities import validateDefaults
 from alibuild_helpers.utilities import Hasher
-from alibuild_helpers.utilities import yamlDump
 from alibuild_helpers.utilities import resolve_tag, resolve_version, short_commit_hash
 from alibuild_helpers.git import Git, git
 from alibuild_helpers.sl import Sapling
@@ -31,11 +30,10 @@ import socket
 import os
 import re
 import shutil
-import sys
 import time
 
 
-def writeAll(fn, txt):
+def writeAll(fn, txt) -> None:
   f = open(fn, "w")
   f.write(txt)
   f.close()
@@ -476,7 +474,7 @@ def doBuild(args, parser):
     checkedOutCommitName = scm.checkedOutCommitName(directory=args.configDir)
   except SCMError:
     dieOnError(True, "Cannot find SCM directory in %s." % args.configDir)
-  os.environ["ALIBUILD_ALIDIST_HASH"] = checkedOutCommitName # type: ignore
+  os.environ["ALIBUILD_ALIDIST_HASH"] = checkedOutCommitName
 
   debug("Building for architecture %s", args.architecture)
   debug("Number of parallel builds: %d", args.jobs)
@@ -512,9 +510,9 @@ def doBuild(args, parser):
              ("\n- ".join(sorted(failed)), args.defaults, " ".join(args.pkgname)))
 
   for x in specs.values():
-    x["requires"] = [r for r in x["requires"] if not r in args.disable]
-    x["build_requires"] = [r for r in x["build_requires"] if not r in args.disable]
-    x["runtime_requires"] = [r for r in x["runtime_requires"] if not r in args.disable]
+    x["requires"] = [r for r in x["requires"] if r not in args.disable]
+    x["build_requires"] = [r for r in x["build_requires"] if r not in args.disable]
+    x["runtime_requires"] = [r for r in x["runtime_requires"] if r not in args.disable]
 
   if systemPackages:
     banner("aliBuild can take the following packages from the system and will not build them:\n  %s",

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/clean.py

@@ -47,14 +47,14 @@ def decideClean(workDir, architecture, aggressiveCleanup):
                  "%s/SOURCES" % (workDir)]
   allBuildStuff = glob.glob("%s/BUILD/*" % workDir)
   toDelete += [x for x in allBuildStuff
-               if not path.islink(x) and not basename(x) in symlinksBuild]
+               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)])
   symlinksInstall = []
   for x in installedPackages:
     symlinksInstall += [path.realpath(y) for y in glob.glob(x + "/latest*")]
   toDelete += [x for x in glob.glob(installGlob+ "*")
-               if not path.islink(x) and not path.realpath(x) in symlinksInstall]
+               if not path.islink(x) and path.realpath(x) not in symlinksInstall]
   toDelete = [x for x in toDelete if path.exists(x)]
   return toDelete
 

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/cmd.py

@@ -78,7 +78,7 @@ class DockerRunner:
   instead.
   """
 
-  def __init__(self, docker_image, docker_run_args=()):
+  def __init__(self, docker_image, docker_run_args=()) -> None:
     self._docker_image = docker_image
     self._docker_run_args = docker_run_args
     self._container = None

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/deps.py

@@ -41,9 +41,9 @@ def doDeps(args, parser):
 
   for s in specs.values():
     # Remove disabled packages
-    s["requires"] = [r for r in s["requires"] if not r in args.disable and r != "defaults-release"]
-    s["build_requires"] = [r for r in s["build_requires"] if not r in args.disable and r != "defaults-release"]
-    s["runtime_requires"] = [r for r in s["runtime_requires"] if not r in args.disable and r != "defaults-release"]
+    s["requires"] = [r for r in s["requires"] if r not in args.disable and r != "defaults-release"]
+    s["build_requires"] = [r for r in s["build_requires"] if r not in args.disable and r != "defaults-release"]
+    s["runtime_requires"] = [r for r in s["runtime_requires"] if r not in args.disable and r != "defaults-release"]
 
   # Determine which pacakages are only build/runtime dependencies
   all_build   = set()
@@ -97,7 +97,7 @@ def doDeps(args, parser):
   # Check if we have dot in PATH
   try:
     execute(["dot", "-V"])
-  except Exception as e:
+  except Exception:
     dieOnError(True, "Could not find dot in PATH. Please install graphviz and add it to PATH.")
   try:
     if args.neat:

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/doctor.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
-import os, re, sys
+import os
+import re
+import sys
 from os.path import exists, abspath, expanduser
 import logging
 from alibuild_helpers.log import debug, error, banner, info, success, warning
@@ -7,9 +9,9 @@ from alibuild_helpers.log import logger
 from alibuild_helpers.utilities import getPackageList, parseDefaults, readDefaults, validateDefaults
 from alibuild_helpers.cmd import getstatusoutput, DockerRunner
 
-def prunePaths(workDir):
+def prunePaths(workDir) -> None:
   for x in ["PATH", "LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"]:
-    if not x in os.environ:
+    if x not in os.environ:
       continue
     workDirEscaped = re.escape("%s" % workDir) + "[^:]*:?"
     os.environ[x] = re.sub(workDirEscaped, "", os.environ[x])
@@ -52,7 +54,7 @@ def checkRequirements(spec, cmd, homebrew_replacement, getstatusoutput_docker):
           spec.get("system_requirement_missing"))
     return (err, "")
 
-def systemInfo():
+def systemInfo() -> None:
   _,out = getstatusoutput("env")
   debug("Environment:\n%s", out)
   _,out = getstatusoutput("uname -a")

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/git.py

@@ -96,7 +96,7 @@ def git(args, directory=".", check=True, prompt=True):
     directory=quote(directory),
     args=" ".join(map(quote, args)),
     # GIT_TERMINAL_PROMPT is only supported in git 2.3+.
-    prompt_var=f"GIT_TERMINAL_PROMPT=0" if not prompt else "",
+    prompt_var="GIT_TERMINAL_PROMPT=0" if not prompt else "",
     directory_safe_var=f"GIT_CONFIG_COUNT={lastGitOverride+2} GIT_CONFIG_KEY_{lastGitOverride}=safe.directory GIT_CONFIG_VALUE_{lastGitOverride}=$PWD GIT_CONFIG_KEY_{lastGitOverride+1}=gc.auto GIT_CONFIG_VALUE_{lastGitOverride+1}=0" if directory else "",
   ), timeout=GIT_CMD_TIMEOUTS.get(args[0] if len(args) else "*", GIT_COMMAND_TIMEOUT_SEC))
   if check and err != 0:

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/init.py

@@ -2,11 +2,12 @@ from alibuild_helpers.git import git, Git
 from alibuild_helpers.utilities import getPackageList, parseDefaults, readDefaults, validateDefaults
 from alibuild_helpers.log import debug, error, warning, banner, info
 from alibuild_helpers.log import dieOnError
-from alibuild_helpers.workarea import cleanup_git_log, updateReferenceRepoSpec
+from alibuild_helpers.workarea import updateReferenceRepoSpec
 
 from os.path import join
 import os.path as path
-import os, sys
+import os
+import sys
 
 def parsePackagesDefinition(pkgname):
   return [ dict(zip(["name","ver"], y.split("@")[0:2]))
@@ -49,7 +50,7 @@ def doInit(args):
                                          specs=specs,
                                          configDir=args.configDir,
                                          preferSystem=False,
-                                         noSystem=True,
+                                         noSystem="*",
                                          architecture="",
                                          disable=[],
                                          defaults=args.defaults,

{alibuild-1.17.15 → alibuild-1.17.17}/alibuild_helpers/log.py

@@ -4,15 +4,13 @@ import re
 import time
 import datetime
 
-debug, error, warning, info, success = (None, None, None, None, None)
-
-def dieOnError(err, msg):
+def dieOnError(err, msg) -> None:
   if err:
     error("%s", msg)
     sys.exit(1)
 
 class LogFormatter(logging.Formatter):
-  def __init__(self, fmtstr):
+  def __init__(self, fmtstr) -> None:
     self.fmtstr = fmtstr
     self.COLOR_RESET = "\033[m" if sys.stdout.isatty() else ""
     self.LEVEL_COLORS = { logging.WARNING:  "\033[4;33m",
@@ -35,7 +33,7 @@ class LogFormatter(logging.Formatter):
     } for x in record.msg.split("\n"))
 
 
-def log_current_package(package, main_package, specs, devel_prefix):
+def log_current_package(package, main_package, specs, devel_prefix) -> None:
   """Show PACKAGE as the one currently being processed in future log messages."""
   if logger_handler.level > logging.DEBUG:
     return
@@ -55,14 +53,14 @@ def log_current_package(package, main_package, specs, devel_prefix):
 
 
 class ProgressPrint:
-  def __init__(self, begin_msg=""):
+  def __init__(self, begin_msg="") -> None:
     self.count = -1
     self.lasttime = 0
     self.STAGES = ".", "..", "...", "....", ".....", "....", "...", ".."
     self.begin_msg = begin_msg
     self.percent = -1
 
-  def __call__(self, txt, *args):
+  def __call__(self, txt, *args) -> None:
     if logger.level <= logging.DEBUG or not sys.stdout.isatty():
       debug(txt, *args)
       return
@@ -88,7 +86,7 @@ class ProgressPrint:
     self.lasttime = time.time()
     sys.stderr.flush()
 
-  def erase(self):
+  def erase(self) -> None:
     nerase = len(self.STAGES[self.count]) if self.count > -1 else 0
     if self.percent > -1:
       nerase = nerase + 7