alibuild 1.17.26__py3-none-any.whl → 1.17.28__py3-none-any.whl

{alibuild-1.17.26.dist-info → alibuild-1.17.28.dist-info}/METADATA

@@ -1,7 +1,9 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.26
+Version: 1.17.28
 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>
 Project-URL: homepage, https://alisw.github.io/alibuild
 Keywords: HEP,ALICE
@@ -22,6 +24,8 @@ Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
 Requires-Dist: mkdocs-redirects; extra == "docs"
+Dynamic: author
+Dynamic: home-page
 Dynamic: license-file
 
 .. image:: https://badge.fury.io/py/alibuild.svg

{alibuild-1.17.26.dist-info → alibuild-1.17.28.dist-info}/RECORD

@@ -1,11 +1,11 @@
-alibuild-1.17.26.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
-alibuild-1.17.26.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
-alibuild-1.17.26.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
-alibuild-1.17.26.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
-alibuild-1.17.26.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
-alibuild-1.17.26.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+alibuild-1.17.28.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
+alibuild-1.17.28.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
+alibuild-1.17.28.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
+alibuild-1.17.28.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
+alibuild-1.17.28.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
+alibuild-1.17.28.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
 alibuild_helpers/__init__.py,sha256=ZAhyhRxOkiTA1fMzwEKACY8Eo8MdWp1MawVicFlvQWk,736
-alibuild_helpers/_version.py,sha256=2d5vthP1ynvgXnR866ndEisRMHAjfC0TkcxvmRmNyfU,515
+alibuild_helpers/_version.py,sha256=d9ZYjuIqOumGgXjyClc426mJxSn_0zHPtOI0JlJmdAk,708
 alibuild_helpers/analytics.py,sha256=fuiOagDngFnodGo7upMWeY-RjTTncDRz5Kwz8zxUr9o,4579
 alibuild_helpers/args.py,sha256=T0nOOMCpJZdJkEPZENz7nOsaYIfeZ7qHfAR1Vx4-T2Y,31694
 alibuild_helpers/build.py,sha256=FLeSwo-q_o6bPARbgKm1-pnwax1xe5ulc42bjSKqrog,56994
@@ -13,7 +13,7 @@ alibuild_helpers/build_template.sh,sha256=e7nh8ZhNH-z0LPkuETYVYlgM75EfhoCo__hn1Q
 alibuild_helpers/clean.py,sha256=-LeQUYDwxihzGJi4rCiuALu051T44-0cV8S6-l_lCaQ,3250
 alibuild_helpers/cmd.py,sha256=5tdxtyrHDzmdSVIA0pzxBoici1GZDS0fUStbX85r6ao,5906
 alibuild_helpers/deps.py,sha256=nHLyNqVuTUfW5bqfzCDxAaVVsklv5wHMl4FMMfTQF-8,4909
-alibuild_helpers/doctor.py,sha256=bE5YOEl3abxhSNo6Zr3HQTfETe_1C4SmmQnzm1GF_x8,9532
+alibuild_helpers/doctor.py,sha256=CSvfwmD28NRmvSnmZRTHWaf11pAoSIlMxJ1yW00Xh9c,9685
 alibuild_helpers/git.py,sha256=_GjLIxprHnCfUdQ908xfza1rwhqag1_df7_gcC_8sgw,4004
 alibuild_helpers/init.py,sha256=GmVLXqMS-aXqPnCk5dgAONMQFe7MqjlEtXtcQ1a-0qY,5009
 alibuild_helpers/log.py,sha256=OEflXNcGNgvVYLZbvVwd2Inyt12tnEw5RgkrsiAT2c0,4700
@@ -45,7 +45,7 @@ tests/test_analytics.py,sha256=IlxATGj-MU0sTVqpi2-EKrIhyV9C48K5IZ39kWFz-Os,1942
 tests/test_args.py,sha256=8d8BybESxbIDvEOOSHmmd2rCTgNxI_vF-sgbDojI-Fg,8867
 tests/test_build.py,sha256=_R577NEhNNr-qLy-TQItcOXeIJ3dGB7EIlS3bVQx0vc,18503
 tests/test_clean.py,sha256=Zm3gjtO8Pgl27xUzQIHeGqpe05YMVXZp6Sua59prvcE,7492
-tests/test_cmd.py,sha256=iMpfLKqvi-qaSP6EM7PoJnGSZ9Qf4sj5669o2kcD8_I,3820
+tests/test_cmd.py,sha256=SsWWasMrhbIu9Lqyr_wpuvDjg72ACJ1H_zDlTnybBuE,5049
 tests/test_deps.py,sha256=bLDFuqLRJiCW4U71dzXYM0Niv-skQXSsKGb6LXGVsZ0,2113
 tests/test_doctor.py,sha256=Z7X1d6XqCqmoYAEkRllXf-6HWvfnzGOFd_ghh4gmWYQ,4270
 tests/test_git.py,sha256=fh3sBkW7FwFQQZ3x6Rp3C4wBqM7I9CcX75e6u2oaSKg,1963
@@ -68,7 +68,7 @@ tests/testdist/clobber-initdotsh.sh,sha256=K4L8hiEgNg0hI2WAiEA65rWU5sp-fwOYkubpV
 tests/testdist/defaults-o2.sh,sha256=IJWVMYjQYz876twos1bj-5VnPv7WTdM0X-fd09j4xxM,325
 tests/testdist/delete-etc.sh,sha256=NFMApyWMLQu3HJMsx0x8ZEveCaXbosO6XzJk8KDRJdg,63
 tests/testdist/tracking-env.sh,sha256=3cJszuzJ5dxNYvHO4ydUOWIXwmMS7wfeb-JBCDK21O4,119
-alibuild-1.17.26.dist-info/METADATA,sha256=qvpDKJt0ipvsMmojCJJfnjnRrx29V8fSCUYgCNF5kh4,2129
-alibuild-1.17.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alibuild-1.17.26.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
-alibuild-1.17.26.dist-info/RECORD,,
+alibuild-1.17.28.dist-info/METADATA,sha256=j5qfH2ROl_kt-812pB2M5zQSE2VeMNoPz5OU98JRgQc,2231
+alibuild-1.17.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alibuild-1.17.28.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
+alibuild-1.17.28.dist-info/RECORD,,

alibuild_helpers/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.26'
-__version_tuple__ = version_tuple = (1, 17, 26)
+__version__ = version = '1.17.28'
+__version_tuple__ = version_tuple = (1, 17, 28)
+
+__commit_id__ = commit_id = None

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,

tests/test_cmd.py

@@ -68,6 +68,28 @@ class CmdTestCase(unittest.TestCase):
             getstatusoutput_docker("echo test")
             mock_getstatusoutput.assert_called_with("env TEST_VAR=test_value ANOTHER_VAR=another_value /bin/bash -c 'echo test'", cwd=None)
 
+    @mock.patch("alibuild_helpers.cmd.getoutput")
+    @mock.patch("alibuild_helpers.cmd.getstatusoutput")
+    def test_DockerRunner_multiline_env_var(self, mock_getstatusoutput, mock_getoutput):
+        multiline_value = "line1\nline2\nline3"
+        extra_env = {"MULTILINE_VAR": multiline_value}
+        
+        with DockerRunner("", extra_env=extra_env) as getstatusoutput_docker:
+            mock_getoutput.assert_not_called()
+            getstatusoutput_docker("echo test")
+            mock_getstatusoutput.assert_called_with("env MULTILINE_VAR='line1\nline2\nline3' /bin/bash -c 'echo test'", cwd=None)
+
+    @mock.patch("alibuild_helpers.cmd.getoutput")
+    @mock.patch("alibuild_helpers.cmd.getstatusoutput")
+    def test_DockerRunner_env_var_with_semicolon(self, mock_getstatusoutput, mock_getoutput):
+        semicolon_value = "value1;value2;value3"
+        extra_env = {"SEMICOLON_VAR": semicolon_value}
+        
+        with DockerRunner("", extra_env=extra_env) as getstatusoutput_docker:
+            mock_getoutput.assert_not_called()
+            getstatusoutput_docker("echo test")
+            mock_getstatusoutput.assert_called_with("env SEMICOLON_VAR='value1;value2;value3' /bin/bash -c 'echo test'", cwd=None)
+
 
 if __name__ == '__main__':
     unittest.main()