zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix usage of PythonPackage.test outside of PythonPackage (#20555)

Browse Source
This commit is contained in:
Adam J. Stewart
2021-02-04 11:00:37 -06:00
committed by GitHub
parent f0cafd21ce
commit ba70f90ee0
3 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/gdal/package.py
View File

@@ -20,6 +20,7 @@ class Gdal(AutotoolsPackage):
list_depth = 1
maintainers = ['adamjstewart']
import_modules = ['osgeo', 'osgeo.utils']
version('3.2.1', sha256='6c588b58fcb63ff3f288eb9f02d76791c0955ba9210d98c3abd879c770ae28ea')
version('3.2.0', sha256='b051f852600ffdf07e337a7f15673da23f9201a9dbb482bd513756a3e5a196a6')
@@ -562,5 +563,13 @@ def darwin_fix(self):
fix_darwin_install_name(self.prefix.lib)
def test(self):
"""Attempts to import modules of the installed package."""
if '+python' in self.spec:
PythonPackage.test(self)
# Make sure we are importing the installed modules,
# not the ones in the source directory
for module in self.import_modules:
self.run_test(self.spec['python'].command.path,
['-c', 'import {0}'.format(module)],
purpose='checking import of {0}'.format(module),
work_dir='spack-test')

15
var/spack/repos/builtin/packages/py-tensorflow/package.py
View File

@@ -15,6 +15,7 @@ class PyTensorflow(Package, CudaPackage):
url = "https://github.com/tensorflow/tensorflow/archive/v2.3.1.tar.gz"
maintainers = ['adamjstewart', 'aweits']
import_modules = ['tensorflow']
version('2.4.1', sha256='f681331f8fc0800883761c7709d13cda11942d4ad5ff9f44ad855e9dc78387e0')
version('2.4.0', sha256='26c833b7e1873936379e810a39d14700281125257ddda8cd822c89111db6f6ae')
@@ -298,9 +299,6 @@ class PyTensorflow(Package, CudaPackage):
phases = ['configure', 'build', 'install']
import_modules = PythonPackage.import_modules
test = PythonPackage.test
# https://www.tensorflow.org/install/source
def setup_build_environment(self, env):
spec = self.spec
@@ -790,3 +788,14 @@ def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix),
'--single-version-externally-managed', '--root=/')
remove_linked_tree(tmp_path)
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(self.spec['python'].command.path,
['-c', 'import {0}'.format(module)],
purpose='checking import of {0}'.format(module),
work_dir='spack-test')