diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2018-04-08 21:10:05 -0500 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2018-05-17 14:10:30 -0700 |
| commit | a4d276fbe4ec45c7ac4d9315d0f803a223096d18 (patch) | |
| tree | 67c06d3d215054bbda67ec369be8add781e6a904 /var | |
| parent | 74aee60f7d036907712b1196c6b73af5b4e43808 (diff) | |
| download | spack-a4d276fbe4ec45c7ac4d9315d0f803a223096d18.tar.gz spack-a4d276fbe4ec45c7ac4d9315d0f803a223096d18.tar.bz2 spack-a4d276fbe4ec45c7ac4d9315d0f803a223096d18.tar.xz spack-a4d276fbe4ec45c7ac4d9315d0f803a223096d18.zip | |
init: factor paths out of spack/__init__.py and into spack.paths module
Diffstat (limited to 'var')
6 files changed, 10 insertions, 10 deletions
diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index 75377873b7..fff04d7a9e 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -25,14 +25,14 @@ from spack import * import os -import spack +import spack.paths class UrlListTest(Package): """Mock package with url_list.""" homepage = "http://www.url-list-example.com" - web_data_path = os.path.join(spack.test_path, 'data', 'web') + web_data_path = os.path.join(spack.paths.test_path, 'data', 'web') url = 'file://' + web_data_path + '/foo-0.0.0.tar.gz' list_url = 'file://' + web_data_path + '/index.html' list_depth = 3 diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 7e7facc93a..15ea33dd79 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -41,7 +41,6 @@ ########################################################################## from spack import * -import spack import spack.store diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index 350105af32..436949290c 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack import spack_root +from spack.paths import spack_root class GobjectIntrospection(Package): diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 7347280159..237784e42d 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -42,7 +42,6 @@ from spack import * -import spack import spack.store import os diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 332b5121e7..1759c15d86 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -30,12 +30,14 @@ # Author: Justin Too <justin@doubleotoo.com> # Date: September 6, 2015 # -from spack import * import os from contextlib import contextmanager -import spack + from llnl.util.lang import match_predicate +import spack.store +from spack import * + class Perl(Package): # Perl doesn't use Autotools, it should subclass Package """Perl 5 is a highly capable, feature-rich programming language with over diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 30774332fd..34e1e0ea6d 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -32,11 +32,11 @@ import llnl.util.tty as tty from llnl.util.lang import match_predicate from llnl.util.filesystem import force_remove -import spack -from spack import * +import spack.store +import spack.util.spack_json as sjson from spack.util.environment import is_system_path from spack.util.prefix import Prefix -import spack.util.spack_json as sjson +from spack import * class Python(AutotoolsPackage): |