alibuild 1.17.1__tar.gz → 1.17.3__tar.gz

{alibuild-1.17.1 → alibuild-1.17.3}/.github/workflows/pr-check.yml

@@ -32,10 +32,10 @@ jobs:
           - '3.12'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

{alibuild-1.17.1 → alibuild-1.17.3}/.github/workflows/release.yml

@@ -15,9 +15,9 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - name: Checkout alibuild
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Install build dependencies   # needed by our setup.py

{alibuild-1.17.1/alibuild.egg-info → alibuild-1.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.17.1
+Version: 1.17.3
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.1 → alibuild-1.17.3}/alfaBuild

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import os
 import sys

{alibuild-1.17.1 → alibuild-1.17.3}/aliBuild

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import os
 import sys

{alibuild-1.17.1 → alibuild-1.17.3}/aliDeps

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 import os
 from os.path import dirname, join, abspath

{alibuild-1.17.1 → alibuild-1.17.3}/aliDoctor

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 import os
 from os.path import dirname, join, abspath

{alibuild-1.17.1 → alibuild-1.17.3/alibuild.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.17.1
+Version: 1.17.3
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.1'
-__version_tuple__ = version_tuple = (1, 17, 1)
+__version__ = version = '1.17.3'
+__version_tuple__ = version_tuple = (1, 17, 3)

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/analytics.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os, subprocess, sys
 from os.path import exists, expanduser
 from os import unlink

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/build.py

@@ -671,6 +671,10 @@ def doBuild(args, parser):
         spec[full_key].add(dep)
         # Runtime deps of build deps should count as build deps.
         spec[full_key] |= specs[dep]["full_requires" if key == "build_requires" else full_key]
+    # Propagate build deps of runtime deps, so that they are not added into
+    # the generated modulefile by alibuild-generate-module.
+    for dep in spec["runtime_requires"]:
+      spec["full_build_requires"] |= specs[dep]["full_build_requires"]
     # If something requires or runtime_requires a package, then it's not a
     # pure build_requires only anymore, so we drop it from the list.
     spec["full_build_requires"] -= spec["full_runtime_requires"]

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/deps.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 from alibuild_helpers.log import debug, error, info, dieOnError

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/doctor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os, re, sys
 from os.path import exists, abspath, expanduser
 import logging

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/git.py

@@ -84,12 +84,13 @@ def git(args, directory=".", check=True, prompt=True):
   err, output = getstatusoutput("""\
   set -e +x
   cd {directory} >/dev/null 2>&1
-  {prompt_var} git {args}
+  {prompt_var} {directory_safe_var} git {args}
   """.format(
     directory=quote(directory),
     args=" ".join(map(quote, args)),
     # GIT_TERMINAL_PROMPT is only supported in git 2.3+.
     prompt_var="GIT_TERMINAL_PROMPT=0" if not prompt else "",
+    directory_safe_var="GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=safe.directory GIT_CONFIG_VALUE_0=$PWD" if directory else "",
   ), timeout=GIT_COMMAND_TIMEOUT_SEC)
   if check and err != 0:
     raise SCMError("Error {} from git {}: {}".format(err, " ".join(args), output))

{alibuild-1.17.1 → alibuild-1.17.3}/alibuild_helpers/utilities.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import yaml
 from os.path import exists
 import hashlib

{alibuild-1.17.1 → alibuild-1.17.3}/pb

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 import os
 from os.path import dirname, join, abspath

{alibuild-1.17.1 → alibuild-1.17.3}/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Package alibuild using setuptools
 """