Merge remote-tracking branch 'upstream/main' into gha/upload_packages_workflow

Author: swap357

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
         exclude: ^.*meta\.yaml$
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.2
+    rev: v21.1.5
     hooks:
       - id: clang-format
         types_or: [c++, c, c#, cuda, metal]

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-, Continuum Analytics, Inc.
+Copyright (c) 2014, Anaconda Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

MANIFEST.in

@@ -1,4 +1,4 @@
-include *.rst setup.py runtests.py run_coverage.py LICENSE
+include *.rst setup.py runtests.py run_coverage.py LICENSE LICENSE.thirdparty
 include versioneer.py
 include llvmlite/_version.py
 recursive-include examples *.py *.ll

docs/source/conf.py

@@ -54,8 +54,8 @@
 
 # General information about the project.
 project = 'llvmlite'
-copyright = '2015, Continuum Analytics'
-author = 'Continuum Analytics'
+copyright = '2014, Anaconda Inc.'
+author = 'Numba Developers'
 
 if os.environ.get('READTHEDOCS'):
     # RTD replaces the last update date.  So we need to hack it in here.
@@ -237,7 +237,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   (master_doc, 'llvmlite.tex', 'llvmlite Documentation',
-   'Continuum Analytics', 'manual'),
+   'Anaconda Inc.', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

ffi/build.py

@@ -5,6 +5,7 @@
 
 from __future__ import print_function
 
+import functools
 import os
 import subprocess
 import shutil
@@ -79,7 +80,31 @@ def env_var_options_to_cmake_options():
     return cmake_options
 
 
+@functools.cache
+def check_cmake():
+    try:
+        subprocess.run(("cmake", ), check=True, stdout=subprocess.PIPE,
+                       stderr=subprocess.PIPE, timeout=60)
+    except subprocess.CalledProcessError as e:
+        msg = ("llvmlite needs working CMake tools to build. There was an "
+               "issue when performing a test run of the 'cmake' binary.\n"
+               f"STDOUT: {e.stdout.decode('UTF-8')}\n"
+               f"STDERR: {e.stderr.decode('UTF-8')}\n"
+               "See the traceback for details.")
+        raise RuntimeError(msg) from e
+    except FileNotFoundError as e:
+        msg = ("llvmlite needs CMake tools to build. It appears that the "
+               "'cmake' tool is either not installed or not found on the path. "
+               "Please add CMake tools to the build environment and path, they "
+               "are available from many package managers.")
+        raise FileNotFoundError(msg) from e
+    # Timeout etc not handled, there's little advice that can be given and the
+    # traceback is self explanatory.
+
+
 def try_cmake(cmake_dir, build_dir, generator, arch=None, toolkit=None):
+    # first check that CMake tools are present and run ok.
+    check_cmake()
     old_dir = os.getcwd()
     args = ['cmake', '-G', generator]
     if arch is not None:

setup.py

@@ -207,7 +207,8 @@ def finalize_options(self):
           "Source": "https://github.com/numba/llvmlite",
       },
       packages=packages,
-      license="BSD",
+      license_expression="BSD-2-Clause AND Apache-2.0 WITH LLVM-exception",
+      license_files=['LICENSE', 'LICENSE.thirdparty'],
       cmdclass=cmdclass,
       long_description=long_description,
       python_requires=">={}".format(_version_info_str(min_python_version)),