From 402dfe30f99f129d310ccde3381ea7ac8c5fca53 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Sat, 7 Jan 2017 22:59:02 -0500 Subject: Get Rid of nobuild, nolink, and alldeps (#2765) * Removing the nobuild, nolink, and alldeps dependency types in favor of being explicit. * This will help with maintenance going forward, as adding more dependency types won't affect existing declared dependencies in weird ways. * default deptype is still `('build', 'link')` --- lib/spack/docs/packaging_guide.rst | 7 +------ lib/spack/external/_pytest/freeze_support.py | 2 +- lib/spack/spack/__init__.py | 4 ++-- lib/spack/spack/cmd/create.py | 6 +++--- lib/spack/spack/database.py | 2 +- lib/spack/spack/spec.py | 6 ------ lib/spack/spack/test/conftest.py | 2 +- 7 files changed, 9 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 343adca964..708dd71c76 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -1507,11 +1507,7 @@ Additional hybrid dependency types are (note the lack of quotes): * ****: ``type`` assumed to be ``("build", "link")``. This is the common case for compiled language usage. - * **alldeps**: All dependency types. **Note:** No quotes here - * **nolink**: Equal to ``("build", "run")``, for use by dependencies - that are not expressed via a linker (e.g., Python or Lua module - loading). **Note:** No quotes here - + """"""""""""""""""" Dependency Formulas """"""""""""""""""" @@ -3110,7 +3106,6 @@ dependencies as well. This is equivalent to * Any combination of ``build``, ``link``, and ``run`` separated by commas. -* ``nobuild``, ``nolink``, ``norun`` to omit one type. * ``all`` or ``alldeps`` for all types of dependencies. You can also use ``spack graph`` to generate graphs in the widely used diff --git a/lib/spack/external/_pytest/freeze_support.py b/lib/spack/external/_pytest/freeze_support.py index f78ccd298e..b27f59d74a 100644 --- a/lib/spack/external/_pytest/freeze_support.py +++ b/lib/spack/external/_pytest/freeze_support.py @@ -42,4 +42,4 @@ def _iter_all_modules(package, prefix=''): for m in _iter_all_modules(os.path.join(path, name), prefix=name + '.'): yield prefix + m else: - yield prefix + name \ No newline at end of file + yield prefix + name diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 1e38376f5e..901b8f115c 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -166,8 +166,8 @@ __all__ += ['Package', 'CMakePackage', 'AutotoolsPackage', 'MakefilePackage', from spack.version import Version, ver __all__ += ['Version', 'ver'] -from spack.spec import Spec, alldeps, nolink -__all__ += ['Spec', 'alldeps', 'nolink'] +from spack.spec import Spec, alldeps +__all__ += ['Spec', 'alldeps'] from spack.multimethod import when __all__ += ['when'] diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 2607daaeb5..2d25e8c8a9 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -200,7 +200,7 @@ class PythonGuess(DefaultGuess): # FIXME: Add additional dependencies if required. # depends_on('py-setuptools', type='build') - # depends_on('py-foo', type=nolink)""" + # depends_on('py-foo', type=('build', 'run'))""" body = """\ def install(self, spec, prefix): @@ -216,7 +216,7 @@ class RGuess(DefaultGuess): """Provides appropriate overrides for R extensions""" dependencies = """\ # FIXME: Add dependencies if required. - # depends_on('r-foo', type=nolink)""" + # depends_on('r-foo', type=('build', 'run'))""" body = """\ # FIXME: Override install() if necessary.""" @@ -232,7 +232,7 @@ class OctaveGuess(DefaultGuess): extends('octave') # FIXME: Add additional dependencies if required. - # depends_on('octave-foo', type=nolink)""" + # depends_on('octave-foo', type=('build', 'run'))""" body = """\ def install(self, spec, prefix): diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index 3a0c028d5b..ff55223351 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -68,7 +68,7 @@ _db_version = Version('0.9.2') _db_lock_timeout = 60 # Types of dependencies tracked by the database -_tracked_deps = 'nobuild' +_tracked_deps = ('link', 'run') def _autospec(function): diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 9ce50a54d3..8c6dd36c84 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -126,8 +126,6 @@ from spack.provider_index import ProviderIndex __all__ = [ 'Spec', 'alldeps', - 'nolink', - 'nobuild', 'canonical_deptype', 'validate_deptype', 'parse', @@ -188,14 +186,10 @@ _any_version = VersionList([':']) # Special types of dependencies. alldeps = ('build', 'link', 'run') -nolink = ('build', 'run') -nobuild = ('link', 'run') norun = ('link', 'build') special_types = { 'alldeps': alldeps, 'all': alldeps, # allow "all" as string but not symbol. - 'nolink': nolink, - 'nobuild': nobuild, 'norun': norun, } diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 79d9018c27..f344727674 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -511,4 +511,4 @@ def mock_svn_repository(): t = Bunch(checks=checks, url=url, hash=get_rev, path=str(repodir)) yield t - current.chdir() \ No newline at end of file + current.chdir() -- cgit v1.2.3-60-g2f50