Skip to content

Commit ec1c44f

Browse files
author
Elizabeth Fischer
authored
Merge 5882cdc into 68baac0 
2 parents 68baac0 + 5882cdc commit ec1c44f

183 files changed

Lines changed: 507 additions & 514 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/spack/docs/packaging_guide.rst‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,11 +1507,7 @@ Additional hybrid dependency types are (note the lack of quotes):
15071507

15081508
* **<not specified>**: ``type`` assumed to be ``("build",
15091509
"link")``. This is the common case for compiled language usage.
1510-
* **alldeps**: All dependency types. **Note:** No quotes here
1511-
* **nolink**: Equal to ``("build", "run")``, for use by dependencies
1512-
that are not expressed via a linker (e.g., Python or Lua module
1513-
loading). **Note:** No quotes here
1514-
1510+
15151511
"""""""""""""""""""
15161512
Dependency Formulas
15171513
"""""""""""""""""""
@@ -3110,7 +3106,6 @@ dependencies as well. This is equivalent to
31103106

31113107
* Any combination of ``build``, ``link``, and ``run`` separated by
31123108
commas.
3113-
* ``nobuild``, ``nolink``, ``norun`` to omit one type.
31143109
* ``all`` or ``alldeps`` for all types of dependencies.
31153110

31163111
You can also use ``spack graph`` to generate graphs in the widely used

‎lib/spack/external/_pytest/freeze_support.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ def _iter_all_modules(package, prefix=''):
4242
for m in _iter_all_modules(os.path.join(path, name), prefix=name + '.'):
4343
yield prefix + m
4444
else:
45-
yield prefix + name
45+
yield prefix + name

‎lib/spack/spack/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@
166166
from spack.version import Version, ver
167167
__all__ += ['Version', 'ver']
168168

169-
from spack.spec import Spec, alldeps, nolink
170-
__all__ += ['Spec', 'alldeps', 'nolink']
169+
from spack.spec import Spec, alldeps
170+
__all__ += ['Spec', 'alldeps']
171171

172172
from spack.multimethod import when
173173
__all__ += ['when']

‎lib/spack/spack/cmd/create.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class PythonGuess(DefaultGuess):
200200
201201
# FIXME: Add additional dependencies if required.
202202
# depends_on('py-setuptools', type='build')
203-
# depends_on('py-foo', type=nolink)"""
203+
# depends_on('py-foo', type=('build', 'run'))"""
204204

205205
body = """\
206206
def install(self, spec, prefix):
@@ -216,7 +216,7 @@ class RGuess(DefaultGuess):
216216
"""Provides appropriate overrides for R extensions"""
217217
dependencies = """\
218218
# FIXME: Add dependencies if required.
219-
# depends_on('r-foo', type=nolink)"""
219+
# depends_on('r-foo', type=('build', 'run'))"""
220220

221221
body = """\
222222
# FIXME: Override install() if necessary."""
@@ -232,7 +232,7 @@ class OctaveGuess(DefaultGuess):
232232
extends('octave')
233233
234234
# FIXME: Add additional dependencies if required.
235-
# depends_on('octave-foo', type=nolink)"""
235+
# depends_on('octave-foo', type=('build', 'run'))"""
236236

237237
body = """\
238238
def install(self, spec, prefix):

‎lib/spack/spack/database.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
_db_lock_timeout = 60
6969

7070
# Types of dependencies tracked by the database
71-
_tracked_deps = 'nobuild'
71+
_tracked_deps = ('link', 'run')
7272

7373

7474
def _autospec(function):

‎lib/spack/spack/spec.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@
126126
__all__ = [
127127
'Spec',
128128
'alldeps',
129-
'nolink',
130-
'nobuild',
131129
'canonical_deptype',
132130
'validate_deptype',
133131
'parse',
@@ -188,14 +186,10 @@
188186

189187
# Special types of dependencies.
190188
alldeps = ('build', 'link', 'run')
191-
nolink = ('build', 'run')
192-
nobuild = ('link', 'run')
193189
norun = ('link', 'build')
194190
special_types = {
195191
'alldeps': alldeps,
196192
'all': alldeps, # allow "all" as string but not symbol.
197-
'nolink': nolink,
198-
'nobuild': nobuild,
199193
'norun': norun,
200194
}
201195

‎lib/spack/spack/test/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,4 +511,4 @@ def get_rev():
511511

512512
t = Bunch(checks=checks, url=url, hash=get_rev, path=str(repodir))
513513
yield t
514-
current.chdir()
514+
current.chdir()

‎var/spack/repos/builtin/packages/cantera/package.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class Cantera(Package):
5757

5858
# Python module dependencies
5959
extends('python', when='+python')
60-
depends_on('py-numpy', when='+python', type=nolink)
61-
depends_on('py-scipy', when='+python', type=nolink)
62-
depends_on('py-cython', when='+python', type=nolink)
63-
depends_on('py-3to2', when='+python', type=nolink)
60+
depends_on('py-numpy', when='+python', type=('build', 'run'))
61+
depends_on('py-scipy', when='+python', type=('build', 'run'))
62+
depends_on('py-cython', when='+python', type=('build', 'run'))
63+
depends_on('py-3to2', when='+python', type=('build', 'run'))
6464
# TODO: these "when" specs don't actually work
6565
# depends_on('py-unittest2', when='+python^python@2.6')
6666
# depends_on('py-unittest2py3k', when='+python^python@3.1')

‎var/spack/repos/builtin/packages/cask/package.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Cask(Package):
4141
# version 0.8.0 is broken
4242
version('0.7.4', 'c973a7db43bc980dd83759a5864a1260')
4343

44-
depends_on('emacs', type=nolink)
44+
depends_on('emacs', type=('build', 'run'))
4545

4646
def install(self, spec, prefix):
4747
mkdirp(prefix.bin)

‎var/spack/repos/builtin/packages/cmor/package.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Cmor(AutotoolsPackage):
4747

4848
extends('python', when='+python')
4949
depends_on('python@:2.7', when='+python')
50-
depends_on('py-numpy', type=nolink, when='+python')
50+
depends_on('py-numpy', type=('build', 'run'), when='+python')
5151

5252
@AutotoolsPackage.precondition('configure')
5353
def validate(self):

0 commit comments

Comments
 (0)