diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2021-02-04 11:00:37 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-04 11:00:37 -0600 |
commit | ba70f90ee0c4af2ba8dcd6fb07be0837660a343a (patch) | |
tree | c9aab608591e6cab500a481e8ece90e5d1c205fb /lib | |
parent | f0cafd21ceaecd8243ea2b11653147afa0d3a53b (diff) | |
download | spack-ba70f90ee0c4af2ba8dcd6fb07be0837660a343a.tar.gz spack-ba70f90ee0c4af2ba8dcd6fb07be0837660a343a.tar.bz2 spack-ba70f90ee0c4af2ba8dcd6fb07be0837660a343a.tar.xz spack-ba70f90ee0c4af2ba8dcd6fb07be0837660a343a.zip |
Fix usage of PythonPackage.test outside of PythonPackage (#20555)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/build_systems/sip.py | 54 |
1 files changed, 50 insertions, 4 deletions
diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index 48c2edcf32..47713a100a 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -6,10 +6,10 @@ import inspect import os -from llnl.util.filesystem import working_dir, join_path -from spack.build_systems.python import PythonPackage +from llnl.util.filesystem import find, working_dir, join_path from spack.directives import depends_on, extends from spack.package import PackageBase, run_after +import llnl.util.tty as tty class SIPPackage(PackageBase): @@ -44,7 +44,44 @@ class SIPPackage(PackageBase): depends_on('qt') depends_on('py-sip') - import_modules = PythonPackage.import_modules + @property + def import_modules(self): + """Names of modules that the Python package provides. + + These are used to test whether or not the installation succeeded. + These names generally come from running: + + .. code-block:: python + + >> import setuptools + >> setuptools.find_packages() + + in the source tarball directory. If the module names are incorrectly + detected, this property can be overridden by the package. + + Returns: + list: list of strings of module names + """ + modules = [] + + # Python libraries may be installed in lib or lib64 + # See issues #18520 and #17126 + for lib in ['lib', 'lib64']: + root = os.path.join(self.prefix, lib, 'python{0}'.format( + self.spec['python'].version.up_to(2)), 'site-packages') + # Some Python libraries are packages: collections of modules + # distributed in directories containing __init__.py files + for path in find(root, '__init__.py', recursive=True): + modules.append(path.replace(root + os.sep, '', 1).replace( + os.sep + '__init__.py', '').replace('/', '.')) + # Some Python libraries are modules: individual *.py files + # found in the site-packages directory + for path in find(root, '*.py', recursive=False): + modules.append(path.replace(root + os.sep, '', 1).replace( + '.py', '').replace('/', '.')) + + tty.debug('Detected the following modules: {0}'.format(modules)) + return modules def python(self, *args, **kwargs): """The python ``Executable``.""" @@ -101,7 +138,16 @@ class SIPPackage(PackageBase): # Testing - test = PythonPackage.test + def test(self): + """Attempts to import modules of the installed package.""" + + # Make sure we are importing the installed modules, + # not the ones in the source directory + for module in self.import_modules: + self.run_test(inspect.getmodule(self).python.path, + ['-c', 'import {0}'.format(module)], + purpose='checking import of {0}'.format(module), + work_dir='spack-test') run_after('install')(PackageBase._run_default_install_time_test_callbacks) |