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

python extensions : create PYTHONPATH in module files

Browse Source
This commit is contained in:
alalazo
2016-03-23 11:18:11 +01:00
parent 7cf1b7ed51
commit 758a9c9096
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/spack/spack/modules.py
View File

@@ -161,13 +161,13 @@ def write(self):
# Let the extendee modify their extensions before asking for # Let the extendee modify their extensions before asking for
# package-specific modifications # package-specific modifications
for extendee in self.pkg.extendees: spack_env = EnvironmentModifications()
extendee_spec = self.spec[extendee] for item in self.pkg.extendees:
extendee_spec.package.setup_dependent_package( package = self.spec[item].package
self.pkg.module, self.spec) package.setup_dependent_package(self.pkg.module, self.spec)
package.setup_dependent_environment(spack_env, env, self.spec)
# Package-specific environment modifications # Package-specific environment modifications
spack_env = EnvironmentModifications()
self.spec.package.setup_environment(spack_env, env) self.spec.package.setup_environment(spack_env, env)
# TODO : implement site-specific modifications and filters # TODO : implement site-specific modifications and filters

5
var/spack/repos/builtin/packages/python/package.py
View File

@@ -105,7 +105,10 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
pythonpath = ':'.join(python_paths) pythonpath = ':'.join(python_paths)
spack_env.set('PYTHONPATH', pythonpath) spack_env.set('PYTHONPATH', pythonpath)
run_env.set('PYTHONPATH', pythonpath)
# For run time environment set only the path for extension_spec and prepend it to PYTHONPATH
if extension_spec.package.extends(self.spec):
run_env.prepend_path('PYTHONPATH', os.path.join(extension_spec.prefix, self.site_packages_dir))
def setup_dependent_package(self, module, ext_spec): def setup_dependent_package(self, module, ext_spec):