alibuild 1.17.25__tar.gz → 1.17.27__tar.gz

{alibuild-1.17.25 → alibuild-1.17.27}/.github/workflows/release.yml

@@ -49,7 +49,6 @@ jobs:
           sed -i.bak "
           s|^  url .*|  url \"$url\"|;
           s|^  sha256 .*|  sha256 \"$sha\"|;
-          s|^  version .*|  version \"${GITHUB_REF#refs/tags/v}\"|
           " "$(brew formula alibuild)"
           rm -f "$(brew formula alibuild).bak"
       - name: Regenerate alibuild formula

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

@@ -1,8 +1,11 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.25
+Version: 1.17.27
 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
@@ -22,6 +25,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.25 → alibuild-1.17.27}/alibuild.egg-info/PKG-INFO

@@ -1,8 +1,11 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.25
+Version: 1.17.27
 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
@@ -22,6 +25,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.25 → alibuild-1.17.27}/alibuild.egg-info/SOURCES.txt

@@ -14,6 +14,8 @@ alienv
 codecov.yml
 pb
 pyproject.toml
+requirements.txt
+setup.py
 tox.ini
 .github/workflows/documentation.yml
 .github/workflows/pr-check.yml

{alibuild-1.17.25 → alibuild-1.17.27}/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.25'
-__version_tuple__ = version_tuple = (1, 17, 25)
+__version__ = version = '1.17.27'
+__version_tuple__ = version_tuple = (1, 17, 27)
+
+__commit_id__ = commit_id = 'gd0b6a7065'

{alibuild-1.17.25 → alibuild-1.17.27}/alibuild_helpers/cmd.py

@@ -105,7 +105,7 @@ class DockerRunner:
       if self._container is None:
         command_prefix=""
         if self._extra_env:
-          command_prefix="env " + " ".join("{}={}".format(k, v) for (k,v) in self._extra_env.items()) + " "
+          command_prefix="env " + " ".join("{}={}".format(k, quote(v)) for (k,v) in self._extra_env.items()) + " "
         return getstatusoutput("{}{} -c {}".format(command_prefix, BASH, quote(cmd))
                              , cwd=cwd)
       envOpts = []

{alibuild-1.17.25 → alibuild-1.17.27}/pyproject.toml

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

alibuild-1.17.27/requirements.txt

@@ -0,0 +1,6 @@
+requests
+pyyaml
+distro
+jinja2
+# https://github.com/boto/boto3/issues/4398
+boto3<1.36.0

alibuild-1.17.27/setup.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+""" Package alibuild using setuptools
+"""
+
+# Always prefer setuptools over distutils
+from setuptools import setup, find_packages
+# To use a consistent encoding
+from codecs import open
+import os.path
+import sys
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+# Get the long description from the README file
+with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
+install_requires = ['pyyaml', 'requests', 'distro', 'jinja2', 'boto3<1.36.0']
+
+setup(
+    name='alibuild',
+
+    description='ALICE Build Tool',
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
+
+    # The project's main homepage.
+    url='https://alisw.github.io/alibuild',
+
+    # Author details
+    author='Giulio Eulisse',
+    author_email='giulio.eulisse@cern.ch',
+
+    # Choose your license
+    license='GPL',
+
+    # See https://pypi.org/classifiers/
+    classifiers=[
+        # How mature is this project?
+        'Development Status :: 5 - Production/Stable',
+
+        # Indicate who your project is intended for
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Build Tools',
+
+        # Pick your license as you wish (should match "license" above)
+        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 3.6',   # slc7, slc8, cs8
+        'Programming Language :: Python :: 3.8',   # ubuntu2004
+        'Programming Language :: Python :: 3.9',   # slc9
+        'Programming Language :: Python :: 3.10',  # ubuntu2204
+        'Programming Language :: Python :: 3.11',  # MacOS
+        'Programming Language :: Python :: 3.12',  # MacOS
+    ],
+
+    # What does your project relate to?
+    keywords='HEP ALICE',
+
+    # You can just specify the packages manually here if your project is
+    # simple. Or you can use find_packages().
+    packages=find_packages(exclude=['yaml']),
+
+    # Alternatively, if you want to distribute just a my_module.py, uncomment
+    # this:
+    #   py_modules=["my_module"],
+
+    # Single-source our package version using setuptools_scm. This makes it
+    # PEP440-compliant, and it always references the alibuild commit that
+    # aliBuild was built from.
+    use_scm_version={'write_to': 'alibuild_helpers/_version.py'},
+    setup_requires=[
+        # The 7.* series removed support for Python 3.6.
+        'setuptools_scm<7.0.0' if sys.version_info < (3, 7) else
+        'setuptools_scm'
+    ] + (['packaging<=23'] if sys.version_info <(3, 7) else []),
+
+    # List run-time dependencies here.  These will be installed by pip when
+    # your project is installed. For an analysis of "install_requires" vs pip's
+    # requirements files see:
+    # https://packaging.python.org/en/latest/requirements.html
+    install_requires=install_requires,
+
+    # If there are data files included in your packages that need to be
+    # installed, specify them here.  If using Python 2.6 or less, then these
+    # have to be included in MANIFEST.in as well.
+    include_package_data=True,
+    package_data={
+      'alibuild_helpers': ['build_template.sh'],
+    },
+
+    # To provide executable scripts, use entry points in preference to the
+    # "scripts" keyword. Entry points provide cross-platform support and allow
+    # pip to create the appropriate form of executable for the target platform.
+    scripts = ["aliBuild", "alienv", "aliDoctor", "aliDeps", "pb"]
+)

{alibuild-1.17.25 → alibuild-1.17.27}/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()