alibuild 1.17.11__tar.gz → 1.17.12__tar.gz

{alibuild-1.17.11 → alibuild-1.17.12}/PKG-INFO

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

{alibuild-1.17.11 → alibuild-1.17.12}/alfaBuild

@@ -15,7 +15,7 @@ from alibuild_helpers.init import doInit
 from alibuild_helpers.clean import doClean
 from alibuild_helpers.doctor import doDoctor
 from alibuild_helpers.deps import doDeps
-from alibuild_helpers.log import info, warning, debug, logger, error
+from alibuild_helpers.log import info, debug, logger, error
 from alibuild_helpers.utilities import detectArch
 from alibuild_helpers.build import doBuild
 
@@ -40,7 +40,6 @@ def doMain(args, parser):
     "LC_MONETARY": "C",
     "LC_NUMERIC": "C",
     "LC_TIME": "C",
-    "LC_ALL": "C",
     "GREP_OPTIONS": "",
     "BASH_ENV": "",
     "ALIBUILD_ARCHITECTURE": args.architecture
@@ -116,10 +115,7 @@ if __name__ == "__main__":
     if profiler:
       print("profiler started")
       import cProfile, pstats
-      try:
-        from StringIO import StringIO
-      except ImportError:
-        from io import StringIO
+      from io import StringIO
       pr = cProfile.Profile()
       pr.enable()
       def profiler():

{alibuild-1.17.11 → alibuild-1.17.12}/aliBuild

@@ -15,7 +15,7 @@ from alibuild_helpers.init import doInit
 from alibuild_helpers.clean import doClean
 from alibuild_helpers.doctor import doDoctor
 from alibuild_helpers.deps import doDeps
-from alibuild_helpers.log import info, warning, debug, logger, error
+from alibuild_helpers.log import info, debug, logger, error
 from alibuild_helpers.utilities import detectArch
 from alibuild_helpers.build import doBuild
 
@@ -40,7 +40,6 @@ def doMain(args, parser):
     "LC_MONETARY": "C",
     "LC_NUMERIC": "C",
     "LC_TIME": "C",
-    "LC_ALL": "C",
     "GREP_OPTIONS": "",
     "BASH_ENV": "",
     "ALIBUILD_ARCHITECTURE": args.architecture
@@ -116,10 +115,7 @@ if __name__ == "__main__":
     if profiler:
       print("profiler started")
       import cProfile, pstats
-      try:
-        from StringIO import StringIO
-      except ImportError:
-        from io import StringIO
+      from io import StringIO
       pr = cProfile.Profile()
       pr.enable()
       def profiler():

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild.egg-info/PKG-INFO

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

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@
 .pylintrc
 ANALYTICS.md
 DESIGN.md
-Jenkinsfile
 LICENSE.md
 MANIFEST.in
 PACKAGING.md
@@ -63,6 +62,7 @@ docs/docs/reference.md
 docs/docs/troubleshooting.md
 docs/docs/user.md
 docs/docs/stylesheets/extra.css
+templates/alibuild_to_please.jnj
 tests/test_analytics.py
 tests/test_args.py
 tests/test_build.py

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.11'
-__version_tuple__ = version_tuple = (1, 17, 11)
+__version__ = version = '1.17.12'
+__version_tuple__ = version_tuple = (1, 17, 12)

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/analytics.py

@@ -22,10 +22,7 @@ def askForAnalytics():
   banner("In order to improve user experience, aliBuild would like to gather "
          "analytics about your builds.\nYou can find all the details at:\n\n"
          "  https://github.com/alisw/alibuild/blob/master/ANALYTICS.md\n")
-  # raw_input and input are different between python 2 and 3
-  try: _input = raw_input
-  except NameError: _input = input
-  a = _input("Is that ok for you [YES/no]? ")
+  a = input("Is that ok for you [YES/no]? ")
   if a.strip() and a.strip().lower().startswith("n"):
     debug("User requsted disabling analytics.")
     return disable_analytics()

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/args.py

@@ -7,10 +7,7 @@ import re
 import os
 import shlex
 
-try:
-  import commands
-except ImportError:
-  import subprocess as commands
+import subprocess as commands
 from os.path import abspath, dirname, basename
 import sys
 
@@ -110,6 +107,8 @@ def doParseArgs():
                                   "in multiple packages. The comment will only be stored if "
                                   "PACKAGE is compiled or downloaded during this run; if it "
                                   "already exists, this does not happen."))
+  build_parser.add_argument("--only-deps", dest="onlyDeps", default=False, action="store_true",
+                            help="Only build dependencies, not the main package (e.g. for caching)")
 
   build_docker = build_parser.add_argument_group(title="Build inside a container", description="""\
   Builds can be done inside a Docker container, to make it easier to get a

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/build.py

@@ -17,19 +17,12 @@ from alibuild_helpers.git import Git, git
 from alibuild_helpers.sl import Sapling
 from alibuild_helpers.scm import SCMError
 from alibuild_helpers.sync import remote_from_url
-import yaml
 from alibuild_helpers.workarea import logged_scm, updateReferenceRepoSpec, checkout_sources
 from alibuild_helpers.log import ProgressPrint, log_current_package
 from glob import glob
 from textwrap import dedent
-try:
-  from collections import OrderedDict
-except ImportError:
-  from ordereddict import OrderedDict
-try:
-  from shlex import quote  # Python 3.3+
-except ImportError:
-  from pipes import quote  # Python 2.7
+from collections import OrderedDict
+from shlex import quote
 
 import concurrent.futures
 import importlib
@@ -193,10 +186,7 @@ def storeHashes(package, specs, considerRelocation):
       hasher(data)
 
   for key in ("env", "append_path", "prepend_path"):
-    if sys.version_info[0] < 3 and key in spec and isinstance(spec[key], OrderedDict):
-      # Python 2: use YAML dict order to prevent changing hashes
-      h_all(str(yaml.safe_load(yamlDump(spec[key]))))
-    elif key not in spec:
+    if key not in spec:
       h_all("none")
     else:
       # spec["env"] is of type OrderedDict[str, str].
@@ -486,7 +476,7 @@ def doBuild(args, parser):
     checkedOutCommitName = scm.checkedOutCommitName(directory=args.configDir)
   except SCMError:
     dieOnError(True, "Cannot find SCM directory in %s." % args.configDir)
-  os.environ["ALIBUILD_ALIDIST_HASH"] = checkedOutCommitName
+  os.environ["ALIBUILD_ALIDIST_HASH"] = checkedOutCommitName # type: ignore
 
   debug("Building for architecture %s", args.architecture)
   debug("Number of parallel builds: %d", args.jobs)
@@ -550,9 +540,17 @@ def doBuild(args, parser):
     del develCandidates, develCandidatesUpper, develPkgsUpper
 
   if buildOrder:
-    banner("Packages will be built in the following order:\n - %s",
-           "\n - ".join(x+" (development package)" if x in develPkgs else "%s@%s" % (x, specs[x]["tag"])
-                        for x in buildOrder if x != "defaults-release"))
+    if args.onlyDeps: 
+      builtPackages = buildOrder[:-1]
+    else:
+      builtPackages = buildOrder
+    if len(builtPackages) > 1:
+      banner("Packages will be built in the following order:\n - %s",
+             "\n - ".join(x+" (development package)" if x in develPkgs else "%s@%s" % (x, specs[x]["tag"])
+                          for x in builtPackages if x != "defaults-release"))
+    else:
+      banner("No dependencies of package %s to build.", buildOrder[-1])
+
 
   if develPkgs:
     banner("You have packages in development mode (%s).\n"
@@ -703,6 +701,12 @@ def doBuild(args, parser):
     deps=",".join(buildOrder[:-1]),
   ), args.architecture)
 
+  # If we are building only the dependencies, the last package in
+  # the build order can be considered done.
+  if args.onlyDeps and len(buildOrder) > 1:
+    mainPackage = buildOrder.pop()
+    warning("Not rebuilding %s because --only-deps option provided.", mainPackage)
+
   while buildOrder:
     p = buildOrder[0]
     spec = specs[p]
@@ -1122,14 +1126,19 @@ def doBuild(args, parser):
     if not spec["revision"].startswith("local"):
       syncHelper.upload_symlinks_and_tarball(spec)
 
-  banner("Build of %s successfully completed on `%s'.\n"
-         "Your software installation is at:"
-         "\n\n  %s\n\n"
-         "You can use this package by loading the environment:"
-         "\n\n  alienv enter %s/latest-%s",
-         mainPackage, socket.gethostname(),
-         abspath(join(args.workDir, args.architecture)),
-         mainPackage, mainBuildFamily)
+  if not args.onlyDeps:
+      banner("Build of %s successfully completed on `%s'.\n"
+             "Your software installation is at:"
+             "\n\n  %s\n\n"
+             "You can use this package by loading the environment:"
+             "\n\n  alienv enter %s/latest-%s",
+             mainPackage, socket.gethostname(),
+             abspath(join(args.workDir, args.architecture)),
+             mainPackage, mainBuildFamily)
+  else:
+      banner("Successfully built dependencies for package %s on `%s'.\n",
+             mainPackage, socket.gethostname()
+            )
   for spec in specs.values():
     if spec["is_devel_pkg"]:
       banner("Build directory for devel package %s:\n%s/BUILD/%s-latest%s/%s",

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/cmd.py

@@ -1,68 +1,37 @@
 import os
 import os.path
-import sys
 import time
 from subprocess import Popen, PIPE, STDOUT
 from textwrap import dedent
-try:
-  from subprocess import TimeoutExpired
-except ImportError:
-  class TimeoutExpired(Exception):
-    """Stub exception for Python 2."""
-try:
-  from shlex import quote  # Python 3.3+
-except ImportError:
-  from pipes import quote  # Python 2.7
+from subprocess import TimeoutExpired
+from shlex import quote
 
 from alibuild_helpers.log import debug, warning, dieOnError
 
-# Keep the linter happy
-if sys.version_info[0] >= 3:
-  basestring = str
-  unicode = None
-
-
-def is_string(s):
-  if sys.version_info[0] >= 3:
-    return isinstance(s, str)
-  return isinstance(s, basestring)
-
-
 def decode_with_fallback(data):
   """Try to decode DATA as utf-8; if that doesn't work, fall back to latin-1.
 
   This combination should cover every possible byte string, as latin-1 covers
   every possible single byte.
   """
-  if sys.version_info[0] >= 3:
-    if isinstance(data, bytes):
-      try:
-        return data.decode("utf-8")
-      except UnicodeDecodeError:
-        return data.decode("latin-1")
-    else:
-      return str(data)
-  elif isinstance(data, str):
-    return unicode(data, "utf-8")  # utf-8 is a safe assumption
-  elif not isinstance(data, unicode):
-    return unicode(str(data))
-  return data
+  if isinstance(data, bytes):
+    try:
+      return data.decode("utf-8")
+    except UnicodeDecodeError:
+      return data.decode("latin-1")
+  else:
+    return str(data)
 
 
 def getoutput(command, timeout=None):
   """Run command, check it succeeded, and return its stdout as a string."""
-  proc = Popen(command, shell=is_string(command), stdout=PIPE, stderr=PIPE)
+  proc = Popen(command, shell=isinstance(command, str), stdout=PIPE, stderr=PIPE)
   try:
     stdout, stderr = proc.communicate(timeout=timeout)
   except TimeoutExpired:
     warning("Process %r timed out; terminated", command)
     proc.terminate()
     stdout, stderr = proc.communicate()
-  except TypeError:
-    # On Python 2, we don't have the timeout= parameter. However, "regular"
-    # users shouldn't be running under Python 2 any more, so just don't timeout
-    # there and let the admins handle it manually.
-    stdout, stderr = proc.communicate()
   dieOnError(proc.returncode, "Command %s failed with code %d: %s" %
              (command, proc.returncode, decode_with_fallback(stderr)))
   return decode_with_fallback(stdout)
@@ -70,18 +39,13 @@ def getoutput(command, timeout=None):
 
 def getstatusoutput(command, timeout=None):
   """Run command and return its return code and output (stdout and stderr)."""
-  proc = Popen(command, shell=is_string(command), stdout=PIPE, stderr=STDOUT)
+  proc = Popen(command, shell=isinstance(command, str), stdout=PIPE, stderr=STDOUT)
   try:
     merged_output, _ = proc.communicate(timeout=timeout)
   except TimeoutExpired:
     warning("Process %r timed out; terminated", command)
     proc.terminate()
     merged_output, _ = proc.communicate()
-  except TypeError:
-    # On Python 2, we don't have the timeout= parameter. However, "regular"
-    # users shouldn't be running under Python 2 any more, so just don't timeout
-    # there and let the admins handle it manually.
-    merged_output, _ = proc.communicate()
   merged_output = decode_with_fallback(merged_output)
   # Strip a single trailing newline, if one exists, to match the behaviour of
   # subprocess.getstatusoutput.
@@ -91,7 +55,7 @@ def getstatusoutput(command, timeout=None):
 
 
 def execute(command, printer=debug, timeout=None):
-  popen = Popen(command, shell=is_string(command), stdout=PIPE, stderr=STDOUT)
+  popen = Popen(command, shell=isinstance(command, str), stdout=PIPE, stderr=STDOUT)
   start_time = time.time()
   for line in iter(popen.stdout.readline, b""):
     printer("%s", decode_with_fallback(line).strip("\n"))

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/git.py

@@ -46,8 +46,8 @@ class Git(SCM):
   def listRefsCmd(self, repository):
     return ["ls-remote", "--heads", "--tags", repository]
 
-  def cloneReferenceCmd(self, source, referenceRepo, usePartialClone):
-    cmd = ["clone", "--bare", source, referenceRepo]
+  def cloneReferenceCmd(self, spec, referenceRepo, usePartialClone):
+    cmd = ["clone", "--bare", spec, referenceRepo]
     if usePartialClone:
       cmd.extend(clone_speedup_options())
     return cmd
@@ -64,11 +64,11 @@ class Git(SCM):
       cmd.extend(clone_speedup_options())
     return cmd
 
-  def checkoutCmd(self, ref):
-    return ["checkout", "-f", ref]
+  def checkoutCmd(self, tag):
+    return ["checkout", "-f", tag]
 
-  def fetchCmd(self, source, *refs):
-    return ["fetch", "-f"] + clone_speedup_options() + [source, *refs]
+  def fetchCmd(self, remote, *refs):
+    return ["fetch", "-f"] + clone_speedup_options() + [remote, *refs]
 
   def setWriteUrlCmd(self, url):
     return ["remote", "set-url", "--push", "origin", url]

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/scm.py

@@ -21,7 +21,7 @@ class SCM(object):
     raise NotImplementedError
   def cloneReferenceCmd(self, spec, referenceRepo, usePartialClone):
     raise NotImplementedError
-  def cloneSourceCmd(self, spec, referenceRepo, usePartialClone):
+  def cloneSourceCmd(self, source, destination, referenceRepo, usePartialClone):
     raise NotImplementedError
   def setWriteUrlCmd(self, url):
     raise NotImplementedError

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/sync.py

@@ -373,7 +373,7 @@ class CVMFSRemoteSync:
     ))
 
   def upload_symlinks_and_tarball(self, spec):
-    dieOnError(self.writeStore, "CVMFS backend does not support uploading directly")
+    dieOnError(True, "CVMFS backend does not support uploading directly")
 
 class S3RemoteSync:
   """Sync package build directory from and to S3 using s3cmd.

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/utilities.py

@@ -10,14 +10,8 @@ import re
 import platform
 
 from datetime import datetime
-try:
-  from collections import OrderedDict
-except ImportError:
-  from ordereddict import OrderedDict
-try:
-  from shlex import quote  # Python 3.3+
-except ImportError:
-  from pipes import quote  # Python 2.7
+from collections import OrderedDict
+from shlex import quote
 
 from alibuild_helpers.cmd import getoutput
 from alibuild_helpers.git import git
@@ -430,6 +424,10 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
     filename = taps.get(pkg_filename, "%s/%s.sh" % (configDir, pkg_filename))
     err, spec, recipe = parseRecipe(getRecipeReader(filename, configDir))
     dieOnError(err, err)
+    # Unless there was an error, both spec and recipe should be valid.
+    # otherwise the error should have been caught above.
+    assert(spec is not None)
+    assert(recipe is not None)
     dieOnError(spec["package"].lower() != pkg_filename,
                "%s.sh has different package field: %s" % (p, spec["package"]))
 
@@ -490,28 +488,32 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
         else:
           # The check printed the name of a replacement; use it.
           key = match.group("key").strip()
-          try:
-            replacement = spec["prefer_system_replacement_specs"][key]
-          except KeyError:
-            dieOnError(True, "Could not find named replacement spec for "
-                       "%s: %s" % (spec["package"], key))
+          replacement = None
+          for replacement_matcher in spec["prefer_system_replacement_specs"]:
+            if re.match(replacement_matcher, key):
+              replacement = spec["prefer_system_replacement_specs"][replacement_matcher]
+              break
+          dieOnError(replacement is None, "Could not find named replacement spec for "
+                     "%s: %s" % (spec["package"], key))
+          assert(replacement)
+          # We must keep the package name the same, since it is used to
+          # specify dependencies.
+          replacement["package"] = spec["package"]
+          # The version is required for all specs. What we put there will
+          # influence the package's hash, so allow the user to override it.
+          replacement.setdefault("version", requested_version)
+          spec = replacement
+          # Allows generalising the version based on the actual key provided
+          spec["version"] = spec["version"].replace("%(key)s", key)
+          recipe = replacement.get("recipe", "")
+          # If there's an explicitly-specified recipe, we're still building
+          # the package. If not, aliBuild will still "build" it, but it's
+          # basically instantaneous, so report to the user that we're taking
+          # it from the system.
+          if recipe:
+            ownPackages.add(spec["package"])
           else:
-            # We must keep the package name the same, since it is used to
-            # specify dependencies.
-            replacement["package"] = spec["package"]
-            # The version is required for all specs. What we put there will
-            # influence the package's hash, so allow the user to override it.
-            replacement.setdefault("version", requested_version)
-            spec = replacement
-            recipe = replacement.get("recipe", "")
-            # If there's an explicitly-specified recipe, we're still building
-            # the package. If not, aliBuild will still "build" it, but it's
-            # basically instantaneous, so report to the user that we're taking
-            # it from the system.
-            if recipe:
-              ownPackages.add(spec["package"])
-            else:
-              systemPackages.add(spec["package"])
+            systemPackages.add(spec["package"])
 
     dieOnError(("system_requirement" in spec) and recipe.strip("\n\t "),
                "System requirements %s cannot have a recipe" % spec["package"])

{alibuild-1.17.11 → alibuild-1.17.12}/alibuild_helpers/workarea.py

@@ -4,10 +4,7 @@ import os
 import os.path
 import shutil
 import tempfile
-try:
-  from collections import OrderedDict
-except ImportError:
-  from ordereddict import OrderedDict
+from collections import OrderedDict
 
 from alibuild_helpers.log import dieOnError, debug, error
 from alibuild_helpers.utilities import call_ignoring_oserrors, symlink, short_commit_hash

{alibuild-1.17.11 → alibuild-1.17.12}/docs/mkdocs.yml

@@ -30,6 +30,7 @@ markdown_extensions:
       permalink: "#"
 
 plugins:
+  - search
   - redirects:
       redirect_maps:
         'o2-tutorial.html': 'https://alice-doc.github.io/alice-analysis-tutorial/building/'

{alibuild-1.17.11 → alibuild-1.17.12}/setup.py

@@ -76,8 +76,6 @@ setup(
     # aliBuild was built from.
     use_scm_version={'write_to': 'alibuild_helpers/_version.py'},
     setup_requires=[
-        # The 6.* series removed support for Python 2.7.
-        'setuptools_scm<6.0.0' if sys.version_info < (3, 0) else
         # The 7.* series removed support for Python 3.6.
         'setuptools_scm<7.0.0' if sys.version_info < (3, 7) else
         'setuptools_scm'

alibuild-1.17.12/templates/alibuild_to_please.jnj

@@ -0,0 +1,63 @@
+# A alibuild template to convert the alidist recipes to
+# the please build system. While not fully functional, it serves
+# as explanatory example on how one can use templates to
+# extract informations from alidist, without having to instrument
+# alibuild itself.
+#
+# Use with:
+#
+# cat alibuild_to_please.jnj | python3 alibuild/aliBuild build lz4 --defaults o2 --debug --no-system --plugin templating --no-system --no-local alibuild-recipe-tools > opendata/BUILD.plz
+#
+{% for name, spec in specs.items() %}
+
+{% if spec.source is defined %}
+# {{ spec.source is defined  }}
+new_http_archive(
+  name = "download_{{name}}",
+  urls = ["{{spec.source}}/archive/refs/tags/{{spec.tag}}.tar.gz"],
+  )
+{% endif %}
+
+genrule(
+    name = "build_{{name}}",
+    output_dirs = ["_out"],
+    outs = [
+{% if spec.tools is defined %}
+{% for tool in spec.tools%}
+      "_out/{{tool}}",
+{% endfor %}
+{% endif %}
+{% if spec.tools is defined %}
+{% for lib in spec.libs%}
+      "_out/{{lib}}",
+{% endfor %}
+{% endif %}
+    ],
+{% if spec.source is defined %}
+    srcs = [":download_{{name}}"],
+{% endif %}
+    deps = [
+{% for build_require_name in spec.build_requires %}
+      ":build_{{build_require_name}}",{% endfor %}
+    ],
+    cmd = """
+      PKGNAME="{{name}}"
+      PKGVERSION="{{spec.version}}"
+      PKGREVISION="{{spec.revision}}"
+      PKGHASH="{{spec.package_hash}}"
+{% if spec.source is defined %}
+      SOURCEDIR="$PWD/$SRCS/*"
+{% endif %}
+      INSTALLROOT="$PWD/_out"
+      BUILDDIR="$PWD/_build"
+      JOBS="10"
+      mkdir -p $BUILDDIR
+      pushd $BUILDDIR
+      set -e
+      {{ spec.recipe | replace('\$', '\\\\\\\\$')}}
+      mkdir -p $INSTALLROOT
+      touch $INSTALLROOT/.please-did-build
+      popd
+    """,
+  )
+{% endfor %}

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_args.py

@@ -1,11 +1,7 @@
 from __future__ import print_function
 # Assuming you are using the mock library to ... mock things
-try:
-    from unittest import mock
-    from unittest.mock import patch, call  # In Python 3, mock is built-in
-except ImportError:
-    import mock
-    from mock import patch, call  # Python 2
+from unittest import mock
+from unittest.mock import patch, call
 
 import alibuild_helpers.args
 from alibuild_helpers.args import doParseArgs, matchValidArch, finaliseArgs, DEFAULT_WORK_DIR, DEFAULT_CHDIR, ARCHITECTURE_TABLE
@@ -16,12 +12,8 @@ import os.path
 import unittest
 import shlex
 
-if (sys.version_info[0] >= 3):
-  BUILD_MISSING_PKG_ERROR = "the following arguments are required: PACKAGE"
-  ANALYTICS_MISSING_STATE_ERROR = "the following arguments are required: state"
-else:
-  BUILD_MISSING_PKG_ERROR = "too few arguments"
-  ANALYTICS_MISSING_STATE_ERROR = "too few arguments"
+BUILD_MISSING_PKG_ERROR = "the following arguments are required: PACKAGE"
+ANALYTICS_MISSING_STATE_ERROR = "the following arguments are required: state"
 
 # A few errors we should handle, together with the expected result
 ARCHITECTURE_ERROR = [call(u"Unknown / unsupported architecture: foo.\n\n{table}Alternatively, you can use the `--force-unknown-architecture' option.".format(table=ARCHITECTURE_TABLE))]

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_build.py

@@ -6,16 +6,9 @@ import re
 import sys
 import unittest
 # Assuming you are using the mock library to ... mock things
-try:
-    from unittest.mock import call, patch, MagicMock, DEFAULT  # In Python 3, mock is built-in
-    from io import StringIO
-except ImportError:
-    from mock import call, patch, MagicMock, DEFAULT  # Python 2
-    from StringIO import StringIO
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from unittest.mock import call, patch, MagicMock, DEFAULT
+from io import StringIO
+from collections import OrderedDict
 
 from alibuild_helpers.utilities import parseRecipe, resolve_tag
 from alibuild_helpers.build import doBuild, storeHashes, generate_initdotsh
@@ -79,8 +72,7 @@ TEST_ROOT_GIT_REFS = """\
 87b87c4322d2a3fad315c919cb2e2dd73f2154dc\trefs/heads/master
 f7b336611753f1f4aaa94222b0d620748ae230c0\trefs/heads/v6-08-00-patches
 f7b336611753f1f4aaa94222b0d620748ae230c0\trefs/tags/test-tag"""
-TEST_ROOT_BUILD_HASH = ("96cf657d1a5e2d41f16dfe42ced8c3522ab4e413" if sys.version_info.major < 3 else
-                        "8ec3f41b6b585ef86a02e9c595eed67f34d63f08")
+TEST_ROOT_BUILD_HASH = ("8ec3f41b6b585ef86a02e9c595eed67f34d63f08")
 
 
 TEST_EXTRA_RECIPE = """\
@@ -97,8 +89,7 @@ f000\trefs/heads/master
 ba22\trefs/tags/v1
 ba22\trefs/tags/v2
 baad\trefs/tags/v3"""
-TEST_EXTRA_BUILD_HASH = ("9f9eb8696b7722df52c4703f5fe7acc4b8000ba2" if sys.version_info.major < 3 else
-                         "5afae57bfc6a374e74c1c4427698ab5edebce0bc")
+TEST_EXTRA_BUILD_HASH = ("5afae57bfc6a374e74c1c4427698ab5edebce0bc")
 
 
 GIT_CLONE_REF_ZLIB_ARGS = ("clone", "--bare", "https://github.com/star-externals/zlib",
@@ -285,6 +276,7 @@ class BuildTestCase(unittest.TestCase):
             environment={},
             autoCleanup=False,
             noDevel=[],
+            onlyDeps=False,
             fetchRepos=False,
             forceTracked=False,
             plugin="legacy"

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_clean.py

@@ -1,10 +1,7 @@
 from __future__ import print_function
 from textwrap import dedent
 # Assuming you are using the mock library to ... mock things
-try:
-    from unittest.mock import patch, call  # In Python 3, mock is built-in
-except ImportError:
-    from mock import patch, call  # Python 2
+from unittest.mock import patch, call
 
 from alibuild_helpers.clean import decideClean, doClean
 

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_cmd.py

@@ -1,9 +1,6 @@
 from __future__ import print_function
 # Assuming you are using the mock library to ... mock things
-try:
-    from unittest import mock  # In Python 3, mock is built-in
-except ImportError:
-    import mock  # Python 2
+from unittest import mock
 
 from alibuild_helpers.cmd import execute, DockerRunner
 

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_deps.py

@@ -1,13 +1,5 @@
-try:
-    from unittest.mock import patch, call, MagicMock  # In Python 3, mock is built-in
-    from io import StringIO
-except ImportError:
-    from mock import patch, call, MagicMock  # Python 2
-    from StringIO import StringIO
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from unittest.mock import patch, MagicMock
+from io import StringIO
 
 from alibuild_helpers.deps import doDeps
 from argparse import Namespace

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_doctor.py

@@ -1,14 +1,6 @@
 from __future__ import print_function
-try:
-  from unittest.mock import patch, call, MagicMock  # In Python 3, mock is built-in
-  from io import StringIO
-except ImportError:
-  from mock import patch, call, MagicMock  # Python 2
-  from StringIO import StringIO
-try:
-  from collections import OrderedDict
-except ImportError:
-  from ordereddict import OrderedDict
+from unittest.mock import patch, MagicMock
+from io import StringIO
 
 from alibuild_helpers.doctor import doDoctor
 from argparse import Namespace

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_hashing.py

@@ -3,10 +3,7 @@ import os.path
 import re
 import unittest
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
 from alibuild_helpers.build import storeHashes
 

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_init.py

@@ -1,16 +1,9 @@
 from argparse import Namespace
 import os.path as path
 import unittest
-try:
-    from unittest.mock import MagicMock, call, patch  # In Python 3, mock is built-in
-    from io import StringIO
-except ImportError:
-    from mock import MagicMock, call, patch  # Python 2
-    from StringIO import StringIO
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from unittest.mock import call, patch  # In Python 3, mock is built-in
+from io import StringIO
+from collections import OrderedDict
 
 from alibuild_helpers.init import doInit, parsePackagesDefinition
 

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_log.py

@@ -1,8 +1,5 @@
 import unittest
-try:
-    from unittest.mock import MagicMock, patch  # In Python 3, mock is built-in
-except ImportError:
-    from mock import MagicMock, patch  # Python 2
+from unittest.mock import MagicMock, patch
 
 from alibuild_helpers.log import dieOnError, ProgressPrint
 

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_packagelist.py

@@ -1,10 +1,7 @@
 from __future__ import print_function
 from textwrap import dedent
 import unittest
-try:                  # Python 3
-    from unittest import mock
-except ImportError:   # Python 2
-    import mock
+from unittest import mock
 
 from alibuild_helpers.cmd import getstatusoutput
 from alibuild_helpers.utilities import getPackageList
@@ -160,10 +157,14 @@ class ReplacementTestCase(unittest.TestCase):
     @mock.patch("alibuild_helpers.utilities.dieOnError")
     def test_missing_replacement_spec(self, mock_dieOnError):
         """Check an error is thrown when the replacement spec is not found."""
-        specs, systemPkgs, ownPkgs, failedReqs, validDefaults = \
-            getPackageListWithDefaults(["missing-spec"])
-        mock_dieOnError.assert_any_call(True, "Could not find named replacement "
-                                        "spec for missing-spec: missing_tag")
+        assert_msg = "Could not find named replacement spec for missing-spec: missing_tag"
+        # Change the behaviour from sys.exit to a regular exception. Without it
+        # we don't stop execution properly and other asserts might trigger
+        mock_dieOnError.side_effect = lambda cond, _: (_ for _ in ()).throw(Exception("dieOnError called")) if cond else None
+        with self.assertRaises(Exception, msg=assert_msg) as context:
+            specs, systemPkgs, ownPkgs, failedReqs, validDefaults = \
+                getPackageListWithDefaults(["missing-spec"])
+        self.assertEqual(str(context.exception), "dieOnError called", msg=assert_msg)
 
 
 @mock.patch("alibuild_helpers.utilities.getRecipeReader", new=MockReader)

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_parseRecipe.py

@@ -1,12 +1,8 @@
 import unittest
-import platform
 from alibuild_helpers.utilities import parseRecipe, getRecipeReader, parseDefaults
 from alibuild_helpers.utilities import FileReader, GitReader
-from alibuild_helpers.utilities import validateDefaults, SpecError
-try:
-  from collections import OrderedDict
-except ImportError:
-  from ordereddict import OrderedDict
+from alibuild_helpers.utilities import validateDefaults
+from collections import OrderedDict
 
 TEST1="""package: foo
 version: bar

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_sync.py

@@ -4,10 +4,7 @@ import sys
 import unittest
 from io import BytesIO
 
-try:
-    from unittest.mock import patch, MagicMock   # In Python 3, mock is built-in
-except ImportError:
-    from mock import patch, MagicMock   # Python 2
+from unittest.mock import patch, MagicMock
 
 from alibuild_helpers import sync
 from alibuild_helpers.utilities import resolve_links_path, resolve_store_path

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_utilities.py

@@ -3,10 +3,7 @@
 import unittest
 
 # Assuming you are using the mock library to ... mock things
-try:
-    from unittest.mock import patch  # In Python 3, mock is built-in
-except ImportError:
-    from mock import patch  # Python 2
+from unittest.mock import patch
 
 from alibuild_helpers.utilities import doDetectArch, filterByArchitecture
 from alibuild_helpers.utilities import Hasher

{alibuild-1.17.11 → alibuild-1.17.12}/tests/test_workarea.py

@@ -1,13 +1,7 @@
 from os import getcwd
 import unittest
-try:
-    from unittest.mock import patch, MagicMock  # In Python 3, mock is built-in
-except ImportError:
-    from mock import patch, MagicMock  # Python 2
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from unittest.mock import patch, MagicMock  # In Python 3, mock is built-in
+from collections import OrderedDict
 
 from alibuild_helpers.workarea import updateReferenceRepoSpec
 from alibuild_helpers.git import Git

{alibuild-1.17.11 → alibuild-1.17.12}/tox.ini

@@ -5,7 +5,6 @@ envlist = lint, py{27, 36, 37, 38, 39, 310, 311, 312, 313}, darwin
 [gh-actions]
 # The "lint" job is run separately.
 python =
-    2.7: py27
     3.6: py36
     3.7: py37
     3.8: py38
@@ -45,19 +44,12 @@ allowlist_externals =
     sl
     rm
 deps =
-    py27: mock
     coverage
     distro
 
 setenv =
     # `aliBuild analytics` puts preference files under $HOME.
     HOME = {envtmpdir}
-    # On Python2, dictionary order depends on PYTHONHASHSEED, but we dump plain
-    # dictionaries (not OrderedDicts!) straight into the package hashing
-    # algorithm. Therefore, disable tox's hash seed randomisation on py27 to
-    # ensure our dicts always have the same order. See also:
-    # https://tox.wiki/en/latest/example/basic.html#special-handling-of-pythonhashseed
-    py27: PYTHONHASHSEED = 0
     # Keep coverage info for later upload, if needed. Files in {envtmpdir} are
     # deleted after each run.
     COVERAGE_FILE = {toxworkdir}/coverage.{envname}

alibuild-1.17.11/Jenkinsfile

@@ -1,99 +0,0 @@
-#!groovy
-
-node {
-  stage "Verify author"
-  def power_users = ["ktf", "dberzano"]
-  echo "Changeset from " + env.CHANGE_AUTHOR
-
-  if (power_users.contains(env.CHANGE_AUTHOR)) {
-    echo "PR comes from power user. Testing"
-    slackSend channel: '#github',
-              color: 'good',
-              message: "Automatically testing new PR in Jenkins.\nhttps://alijenkins.cern.ch/job/alibuild-pipeline/branch/${env.BRANCH_NAME} for progress report.",
-              token: env.SLACK_TOKEN
-  } else {
-    withCredentials([[$class: 'StringBinding', credentialsId: 'SLACK_TOKEN', variable: 'SLACK_TOKEN']]) {
-      slackSend channel: '#github',
-                color: 'good',
-                message: "A new PR to be approved for aliBuild. Please check https://alijenkins.cern.ch/job/alibuild-pipeline/branch/${env.BRANCH_NAME}",
-                token: env.SLACK_TOKEN
-      input "Do you want to test this change?"
-    }
-  }
-
-  stage "Run tests"
-  def build_script = '''
-      (cd alibuild && git show && git log HEAD~5..)
-      alibuild/aliBuild --help
-      rm -fr alidist
-      git clone https://github.com/alisw/alidist
-      CHANGED_FILES=`cd alibuild && git diff --name-only origin/$CHANGE_TARGET.. | sed -e 's|/.*||' | sort -u`
-      for d in $CHANGED_FILES; do
-        case $d in
-          # Changes in alibuild_helpers can we tested in isolation, so we
-          # do so.
-          alibuild_helpers|tests)
-            PYTHONPATH=alibuild python alibuild/tests/test_utilities.py
-            PYTHONPATH=alibuild python alibuild/tests/test_analytics.py
-            ;;
-          # Changes to alibuild require a full rebuild to be validated. The
-          # goal as usual is to fail fast.
-          aliBuild)
-            alibuild/aliBuild -d build zlib
-            alibuild/aliBuild --reference-sources /build/mirror -d build AliRoot -n
-            ;;
-          # All the other changes we do not have tests right now.
-          *) ;;
-        esac
-      done
-
-      # We do more extensive tests later
-      for d in $CHANGED_FILES; do
-        case $d in
-          # Rebuild everything if aliBuild or build_template.sh changed
-          aliBuild|*build_template.sh)
-            alibuild/aliBuild --reference-sources /build/mirror --remote-store rsync://repo.marathon.mesos/store/ -d build AliRoot
-            ;;
-          # All the other changes we do not have tests right now.
-          *) ;;
-        esac
-      done
-    '''
-
-    withEnv(["CHANGED_TARGET=${env.CHANGE_TARGET}"]) {
-      parallel(
-        "slc5": {
-          node ("slc5_x86-64-large") {
-            dir ("alibuild") {
-              checkout scm
-            }
-            sh build_script
-          }
-        },
-        "slc6": {
-          node ("slc6_x86-64-large") {
-            dir ("alibuild") {
-              checkout scm
-            }
-            sh build_script
-          }
-        },
-        "slc7": {
-          node ("slc7_x86-64-large") {
-            dir ("alibuild") {
-              checkout scm
-            }
-            sh build_script
-          }
-        },
-        "ubuntu1510": {
-          node ("ubt1510_x86-64-large") {
-            dir ("alibuild") {
-              checkout scm
-            }
-            sh build_script
-          }
-        }
-      )
-    }
-}