alibuild 1.17.16__tar.gz → 1.17.17__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.16
+Version: 1.17.17
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -30,6 +30,7 @@ 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.16 → alibuild-1.17.17}/alfaBuild

@@ -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.16 → alibuild-1.17.17}/aliBuild

@@ -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.16 → 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.16
+Version: 1.17.17
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -30,6 +30,7 @@ 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.16 → alibuild-1.17.17}/alibuild_helpers/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.16'
-__version_tuple__ = version_tuple = (1, 17, 16)
+__version__ = version = '1.17.17'
+__version_tuple__ = version_tuple = (1, 17, 17)

{alibuild-1.17.16 → 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")

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

@@ -50,7 +50,7 @@ def doInit(args):
                                          specs=specs,
                                          configDir=args.configDir,
                                          preferSystem=False,
-                                         noSystem=True,
+                                         noSystem="*",
                                          architecture="",
                                          disable=[],
                                          defaults=args.defaults,

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

@@ -4,8 +4,6 @@ import re
 import time
 import datetime
 
-debug, error, warning, info, success = (None, None, None, None, None)
-
 def dieOnError(err, msg) -> None:
   if err:
     error("%s", msg)

{alibuild-1.17.16 → alibuild-1.17.17}/alibuild_helpers/utilities.py

@@ -307,7 +307,7 @@ def readDefaults(configDir, defaults, error, architecture):
   return (defaultsMeta, defaultsBody)
 
 
-def getRecipeReader(url, dist=None):
+def getRecipeReader(url:str , dist=None):
   m = re.search(r'^dist:(.*)@([^@]+)$', url)
   if m and dist:
     return GitReader(url, dist)
@@ -454,6 +454,9 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
 
     filename, pkgdir = resolveFilename(taps, pkg_filename, configDir)
 
+    dieOnError(not filename, "Package %s not found in %s" % (p, configDir))
+    assert(filename is not None)
+
     err, spec, recipe = parseRecipe(getRecipeReader(filename, configDir))
     dieOnError(err, err)
     # Unless there was an error, both spec and recipe should be valid.
@@ -498,7 +501,14 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
       systemREMatches = re.match(systemRE, architecture)
     except TypeError:
       dieOnError(True, "Malformed entry prefer_system: %s in %s" % (systemRE, spec["package"]))
-    if not noSystem and (preferSystem or systemREMatches):
+
+    noSystemList = []
+    if noSystem == "*":
+      noSystemList = [spec["package"]]
+    elif noSystem is not None:
+      noSystemList = noSystem.split(",")
+    systemExcluded = (spec["package"] in noSystemList)
+    if (preferSystem or systemREMatches):
       requested_version = resolve_version(spec, defaults, "unavailable", "unavailable")
       cmd = "REQUESTED_VERSION={version}\n{check}".format(
         version=quote(requested_version),
@@ -513,12 +523,16 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
       else:
         # prefer_system_check succeeded; this means we should use the system package.
         match = re.search(r"^alibuild_system_replace:(?P<key>.*)$", output, re.MULTILINE)
-        if not match:
+        if not match and systemExcluded:
+          # No replacement spec name given. Fall back to old system package
+          # behaviour and just disable the package.
+          ownPackages.add(spec["package"])
+        elif not match and not systemExcluded:
           # No replacement spec name given. Fall back to old system package
           # behaviour and just disable the package.
           systemPackages.add(spec["package"])
           disable.append(spec["package"])
-        else:
+        elif match:
           # The check printed the name of a replacement; use it.
           key = match.group("key").strip()
           replacement = None

{alibuild-1.17.16 → alibuild-1.17.17}/tests/test_args.py

@@ -48,11 +48,11 @@ CORRECT_BEHAVIOR = [
   ((), "build --force-unknown-architecture -j 10 zlib --disable gcc --disable foo,bar" , [("disable", ["gcc", "foo", "bar"])]),
   ((), "init zlib --dist master"                                                       , [("dist", {"repo": "alisw/alidist", "ver": "master"})]),
   ((), "init zlib --dist ktf/alidist@dev"                                              , [("dist", {"repo": "ktf/alidist", "ver": "dev"})]),
-  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/"    , [("noSystem", True), ("remoteStore", "rsync://test.local/")]),
-  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/::rw", [("noSystem", True), ("remoteStore", "rsync://test.local/"), ("writeStore", "rsync://test.local/")]),
-  ((), "build --force-unknown-architecture zlib --no-remote-store --remote-store rsync://test.local/", [("noSystem", False), ("remoteStore", "")]),
-  ((), "build zlib --architecture slc7_x86-64"                                         , [("noSystem", True), ("preferSystem", False), ("remoteStore", "https://s3.cern.ch/swift/v1/alibuild-repo")]),
-  ((), "build zlib --architecture ubuntu1804_x86-64"                                   , [("noSystem", False), ("preferSystem", False), ("remoteStore", "")]),
+  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/"    , [("noSystem", "*"), ("remoteStore", "rsync://test.local/")]),
+  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/::rw", [("noSystem", "*"), ("remoteStore", "rsync://test.local/"), ("writeStore", "rsync://test.local/")]),
+  ((), "build --force-unknown-architecture zlib --no-remote-store --remote-store rsync://test.local/", [("noSystem", None), ("remoteStore", "")]),
+  ((), "build zlib --architecture slc7_x86-64"                                         , [("noSystem", "*"), ("preferSystem", False), ("remoteStore", "https://s3.cern.ch/swift/v1/alibuild-repo")]),
+  ((), "build zlib --architecture ubuntu1804_x86-64"                                   , [("noSystem", None), ("preferSystem", False), ("remoteStore", "")]),
   ((), "build zlib -a slc7_x86-64"                                                     , [("docker", False), ("dockerImage", None), ("docker_extra_args", ["--network=host"])]),
   ((), "build zlib -a slc7_x86-64 --docker-image registry.cern.ch/alisw/some-builder"  , [("docker", True), ("dockerImage", "registry.cern.ch/alisw/some-builder")]),
   ((), "build zlib -a slc7_x86-64 --docker"                                            , [("docker", True), ("dockerImage", "registry.cern.ch/alisw/slc7-builder")]),

{alibuild-1.17.16 → alibuild-1.17.17}/tests/test_build.py

@@ -268,7 +268,7 @@ class BuildTestCase(unittest.TestCase):
             jobs=2,
             annotate={},
             preferSystem=[],
-            noSystem=False,
+            noSystem=None,
             debug=True,
             dryRun=False,
             aggressiveCleanup=False,

{alibuild-1.17.16 → alibuild-1.17.17}/tests/test_deps.py

@@ -57,7 +57,7 @@ class DepsTestCase(unittest.TestCase):
                          dockerImage=None,
                          docker_extra_args=["--network=host"],
                          preferSystem=[],
-                         noSystem=True,
+                         noSystem="*",
                          architecture="slc7_x86-64",
                          disable=[],
                          neat=True,

{alibuild-1.17.16 → alibuild-1.17.17}/tests/test_doctor.py

@@ -80,7 +80,7 @@ class DoctorTestCase(unittest.TestCase):
                      docker_extra_args=["--network=host"],
                      debug=False,
                      preferSystem=[],
-                     noSystem=False,
+                     noSystem="*",
                      architecture="osx_x86-64",
                      disable=[],
                      defaults="release")

{alibuild-1.17.16 → alibuild-1.17.17}/tests/test_packagelist.py

@@ -89,10 +89,10 @@ def getPackageListWithDefaults(packages, force_rebuild=()):
         specs=specs,
         configDir="CONFIG_DIR",
         # Make sure getPackageList considers prefer_system_check.
-        # (Even with preferSystem=False + noSystem=False, it is sufficient
+        # (Even with preferSystem=False + noSystem=None, it is sufficient
         # if the prefer_system regex matches the architecture.)
         preferSystem=True,
-        noSystem=False,
+        noSystem=None,
         architecture="ARCH",
         disable=[],
         defaults="release",