alibuild 1.17.27__tar.gz → 1.17.29__tar.gz

{alibuild-1.17.27 → alibuild-1.17.29}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.27
+Version: 1.17.29
 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>
-License-Expression: GPL-3.0-only
 Project-URL: homepage, https://alisw.github.io/alibuild
 Keywords: HEP,ALICE
 Classifier: Development Status :: 5 - Production/Stable

{alibuild-1.17.27 → alibuild-1.17.29}/alibuild.egg-info/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.27
+Version: 1.17.29
 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>
-License-Expression: GPL-3.0-only
 Project-URL: homepage, https://alisw.github.io/alibuild
 Keywords: HEP,ALICE
 Classifier: Development Status :: 5 - Production/Stable

{alibuild-1.17.27 → alibuild-1.17.29}/alibuild_helpers/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.27'
-__version_tuple__ = version_tuple = (1, 17, 27)
+__version__ = version = '1.17.29'
+__version_tuple__ = version_tuple = (1, 17, 29)
 
-__commit_id__ = commit_id = 'gd0b6a7065'
+__commit_id__ = commit_id = 'g0c5711562'

{alibuild-1.17.27 → alibuild-1.17.29}/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)
@@ -148,9 +150,6 @@ def doDoctor(args, parser):
   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)
     fromSystem, own, failed, validDefaults = \
       getPackageList(packages                = packages,
                      specs                   = specs,
@@ -160,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-1.17.27 → alibuild-1.17.29}/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-1.17.27 → alibuild-1.17.29}/pyproject.toml

@@ -8,8 +8,7 @@ name = 'alibuild'
 dynamic = ['readme', 'version']
 description = 'ALICE Build Tool'
 keywords = ['HEP', 'ALICE']
-license = "GPL-3.0-only"
-license-files = ["LICENSE[.]md"]
+license = { file = 'LICENSE' }
 authors = [
   {name = 'Giulio Eulisse', email = 'giulio.eulisse@cern.ch'},
   {name = 'Timo Wilken', email = 'timo.wilken@cern.ch'},

{alibuild-1.17.27 → alibuild-1.17.29}/tests/test_build.py

@@ -101,7 +101,7 @@ GIT_SET_URL_ZLIB_ARGS = ("remote", "set-url", "--push", "origin", "https://githu
 GIT_CHECKOUT_ZLIB_ARGS = ("checkout", "-f", "master"), \
     "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
 
-GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "--filter=blob:none", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
+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
 GIT_CLONE_SRC_ROOT_ARGS = ("clone", "-n", "https://github.com/root-mirror/root",
                            "/sw/SOURCES/ROOT/v6-08-30/f7b3366117",

{alibuild-1.17.27 → alibuild-1.17.29}/tests/test_workarea.py

@@ -57,7 +57,7 @@ class WorkareaTestCase(unittest.TestCase):
         mock_exists.assert_has_calls([])
         mock_makedirs.assert_called_with("%s/sw/MIRROR" % getcwd(), exist_ok=True)
         mock_git.assert_called_once_with([
-            "fetch", "-f", "--filter=blob:none", spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*",
+            "fetch", "-f", "--prune", "--filter=blob:none", spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*",
         ], directory="%s/sw/MIRROR/aliroot" % getcwd(), check=False, prompt=True)
         self.assertEqual(spec.get("reference"), "%s/sw/MIRROR/aliroot" % getcwd())