alibuild 1.17.22__py3-none-any.whl → 1.17.24__py3-none-any.whl

{alibuild-1.17.22.dist-info → alibuild-1.17.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.22
+Version: 1.17.24
 Summary: ALICE Build Tool
 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

{alibuild-1.17.22.dist-info → alibuild-1.17.24.dist-info}/RECORD

@@ -1,25 +1,25 @@
-alibuild-1.17.22.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
-alibuild-1.17.22.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
-alibuild-1.17.22.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
-alibuild-1.17.22.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
-alibuild-1.17.22.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
-alibuild-1.17.22.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+alibuild-1.17.24.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
+alibuild-1.17.24.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
+alibuild-1.17.24.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
+alibuild-1.17.24.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
+alibuild-1.17.24.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
+alibuild-1.17.24.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
 alibuild_helpers/__init__.py,sha256=ZAhyhRxOkiTA1fMzwEKACY8Eo8MdWp1MawVicFlvQWk,736
-alibuild_helpers/_version.py,sha256=IlOhh6Jv5Bxv0RskDIDOIzAuGZ4gb5AkkFaRKQClAQE,515
+alibuild_helpers/_version.py,sha256=BMmdgyQaMdw0N7R2yhrLit6MJM-AeFrTpq4AkOn2xpw,515
 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
-alibuild_helpers/build_template.sh,sha256=irbJFYEFn5KKy5wMK0WaUQOPfTzA6MJnbWxRj3cpIXQ,13508
+alibuild_helpers/build_template.sh,sha256=e7nh8ZhNH-z0LPkuETYVYlgM75EfhoCo__hn1QCIDak,13566
 alibuild_helpers/clean.py,sha256=-LeQUYDwxihzGJi4rCiuALu051T44-0cV8S6-l_lCaQ,3250
 alibuild_helpers/cmd.py,sha256=cK33xiBI2ENAWSueW_yqj3Y9aOhTOdKkzsLdNUx9KdU,5899
 alibuild_helpers/deps.py,sha256=nHLyNqVuTUfW5bqfzCDxAaVVsklv5wHMl4FMMfTQF-8,4909
 alibuild_helpers/doctor.py,sha256=bE5YOEl3abxhSNo6Zr3HQTfETe_1C4SmmQnzm1GF_x8,9532
 alibuild_helpers/git.py,sha256=_GjLIxprHnCfUdQ908xfza1rwhqag1_df7_gcC_8sgw,4004
 alibuild_helpers/init.py,sha256=GmVLXqMS-aXqPnCk5dgAONMQFe7MqjlEtXtcQ1a-0qY,5009
-alibuild_helpers/log.py,sha256=C6nneUPrPrqxIqzqsHMWkqZ_Tks2e4RIMn5sZaQwSE0,4505
+alibuild_helpers/log.py,sha256=OEflXNcGNgvVYLZbvVwd2Inyt12tnEw5RgkrsiAT2c0,4700
 alibuild_helpers/scm.py,sha256=pZfEnTgr_ILmtRT3BXeoYVJGq9rjigLXOLAGJMsnDko,1019
 alibuild_helpers/sl.py,sha256=EdHs5Se6xpR9rhmhSJd_6f3Rfkxc8jl-97ZT1lG2T28,2356
-alibuild_helpers/sync.py,sha256=0vMYsyQzNGgckZBh-55DE7yLX7gXTq0rQFRgu_U71q4,31061
+alibuild_helpers/sync.py,sha256=EllGKQwCHMn--k233xcOOgmDvNihi0GZQr5TKcR6bu0,31350
 alibuild_helpers/templating_plugin.py,sha256=TWHdMQtDfX6Vqp5w9Huyh4ZEgLv5vYxAtPtX68xTOlk,662
 alibuild_helpers/utilities.py,sha256=nb0UC0qn2_rIJ-5GDnx-GoRAbF8tn1ELjZS-prUz9eo,26131
 alibuild_helpers/workarea.py,sha256=dYGZ7OOCg87W-njZMqX7Yu72800KZjx9v5Hg-T43juY,7442
@@ -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.22.dist-info/METADATA,sha256=mCwcpTdGaKzEajtCeyClKe9W088gZaiRKuJbOHpzJ-8,2129
-alibuild-1.17.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alibuild-1.17.22.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
-alibuild-1.17.22.dist-info/RECORD,,
+alibuild-1.17.24.dist-info/METADATA,sha256=tkDHQXkb-jBOsKnCi1soDqut8SxYFNfP6s1npUTqbNk,2129
+alibuild-1.17.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alibuild-1.17.24.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
+alibuild-1.17.24.dist-info/RECORD,,

alibuild_helpers/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.22'
-__version_tuple__ = version_tuple = (1, 17, 22)
+__version__ = version = '1.17.24'
+__version_tuple__ = version_tuple = (1, 17, 24)

alibuild_helpers/build_template.sh

@@ -103,9 +103,9 @@ unset DYLD_LIBRARY_PATH
 EOF
 
 cd "$BUILDROOT"
-ln -snf $PKGHASH "${BUILDROOT}-latest"
+ln -snf "$PKGHASH" "$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGNAME-latest"
 if [[ $DEVEL_PREFIX ]]; then
-  ln -snf $PKGHASH "${BUILDROOT}-latest-$DEVEL_PREFIX"
+  ln -snf "$PKGHASH" "$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGNAME-latest-$DEVEL_PREFIX"
 fi
 
 cd "$BUILDDIR"

alibuild_helpers/log.py

@@ -53,14 +53,21 @@ def log_current_package(package, main_package, specs, devel_prefix) -> None:
 
 
 class ProgressPrint:
-  def __init__(self, begin_msg="") -> None:
+  def __init__(self, begin_msg="", min_interval=0.) -> None:
     self.count = -1
     self.lasttime = 0
     self.STAGES = ".", "..", "...", "....", ".....", "....", "...", ".."
     self.begin_msg = begin_msg
     self.percent = -1
+    self.min_interval = min_interval
+    self.last_update = 0
 
   def __call__(self, txt, *args) -> None:
+    now = time.time()
+    if (now - self.last_update) < self.min_interval:
+      return
+    self.last_update = now
+
     if logger.level <= logging.DEBUG or not sys.stdout.isatty():
       debug(txt, *args)
       return

alibuild_helpers/sync.py

@@ -8,6 +8,7 @@ import sys
 import time
 import requests
 from requests.exceptions import RequestException
+from urllib.parse import quote
 
 from alibuild_helpers.cmd import execute
 from alibuild_helpers.log import debug, info, error, dieOnError, ProgressPrint
@@ -178,7 +179,7 @@ class HttpRemoteSync:
       destPath = os.path.join(self.workdir, store_path, use_tarball)
       if not os.path.isfile(destPath):   # do not download twice
         progress = ProgressPrint("Downloading tarball for %s@%s" %
-                                 (spec["package"], spec["version"]))
+                                 (spec["package"], spec["version"]), min_interval=5.0)
         progress("[0%%] Starting download of %s", use_tarball)  # initialise progress bar
         self.getRetry("/".join((self.remoteStore, store_path, use_tarball)),
                       destPath, session=session, progress=progress)
@@ -225,7 +226,7 @@ class HttpRemoteSync:
         # This symlink isn't in the manifest yet, and we don't have it locally,
         # so download it individually.
         symlinks[linkname] = \
-            self.getRetry("/".join((self.remoteStore, links_path, linkname)),
+            self.getRetry("/".join((self.remoteStore, links_path, quote(linkname))),
                           returnResult=True, log=False, session=session) \
                 .decode("utf-8").rstrip("\r\n")
     for linkname, target in symlinks.items():
@@ -551,7 +552,7 @@ class Boto3RemoteSync:
       for tarball in self._s3_listdir(store_path):
         debug("Fetching tarball %s", tarball)
         progress = ProgressPrint("Downloading tarball for %s@%s" %
-                                 (spec["package"], spec["version"]))
+                                 (spec["package"], spec["version"]), min_interval=5.0)
         progress("[0%%] Starting download of %s", tarball)   # initialise progress bar
         # Create containing directory locally. (exist_ok= is python3-specific.)
         os.makedirs(os.path.join(self.workdir, store_path), exist_ok=True)
@@ -679,6 +680,7 @@ class Boto3RemoteSync:
 
     # Second, upload dist symlinks. These should be in place before the main
     # tarball, to avoid races in the publisher.
+    start_time = time.time()
     for link_dir, symlinks in dist_symlinks.items():
       for link_key, hash_path in symlinks:
         self.s3.put_object(Bucket=self.writeStore,
@@ -688,6 +690,10 @@ class Boto3RemoteSync:
                            WebsiteRedirectLocation=hash_path)
       debug("Uploaded %d dist symlinks to S3 from %s",
             len(symlinks), link_dir)
+    end_time = time.time()
+    debug("Uploaded %d dist symlinks in %.2f seconds",
+          sum(len(symlinks) for _, symlinks in dist_symlinks.items()),
+          end_time - start_time)
 
     self.s3.upload_file(Bucket=self.writeStore, Key=tar_path,
                         Filename=os.path.join(self.workdir, tar_path))