hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Gregory Becker 2016-01-15 16:51:41 -08:00
parent 16e9d658d5
commit e1a0af8745
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/spack/spack/cmd/__init__.py
View file

@ -88,7 +88,6 @@ def parse_specs(args, **kwargs):
if isinstance(args, (python_list, tuple)): if isinstance(args, (python_list, tuple)):
args = " ".join(args) args = " ".join(args)
try: try:
specs = spack.spec.parse(args) specs = spack.spec.parse(args)
for spec in specs: for spec in specs:

1
lib/spack/spack/multimethod.py
View file

@ -196,7 +196,6 @@ def install(self, prefix):
class when(object): class when(object):
def __init__(self, spec): def __init__(self, spec):
pkg = get_calling_module_name() pkg = get_calling_module_name()
# self.spec = spack.spec.Spec(spec)
self.spec = parse_anonymous_spec(spec, pkg) self.spec = parse_anonymous_spec(spec, pkg)
def __call__(self, method): def __call__(self, method):

2
lib/spack/spack/package.py
View file

@ -352,7 +352,6 @@ def __init__(self, spec):
# Fix up self.url if this package fetches with a URLFetchStrategy. # Fix up self.url if this package fetches with a URLFetchStrategy.
# This makes self.url behave sanely. # This makes self.url behave sanely.
if self.spec.versions.concrete: if self.spec.versions.concrete:
# TODO: this is a really roundabout way of determining the type # TODO: this is a really roundabout way of determining the type
# TODO: of fetch to do. figure out a more sane fetch strategy/package # TODO: of fetch to do. figure out a more sane fetch strategy/package
# TODO: init order (right now it's conflated with stage, package, and # TODO: init order (right now it's conflated with stage, package, and
@ -588,7 +587,6 @@ def installed_dependents(self):
@property @property
def prefix(self): def prefix(self):
"""Get the prefix into which this package should be installed.""" """Get the prefix into which this package should be installed."""
# print self.spec, self.spec.prefix
return self.spec.prefix return self.spec.prefix

8
lib/spack/spack/test/spec_yaml.py
View file

@ -38,18 +38,18 @@ def check_yaml_round_trip(self, spec):
self.assertTrue(spec.eq_dag(spec_from_yaml)) self.assertTrue(spec.eq_dag(spec_from_yaml))
def _test_simple_spec(self): def test_simple_spec(self):
spec = Spec('mpileaks') spec = Spec('mpileaks')
self.check_yaml_round_trip(spec) self.check_yaml_round_trip(spec)
def _test_normal_spec(self): def test_normal_spec(self):
spec = Spec('mpileaks+debug~opt') spec = Spec('mpileaks+debug~opt')
spec.normalize() spec.normalize()
self.check_yaml_round_trip(spec) self.check_yaml_round_trip(spec)
def _test_ambiguous_version_spec(self): def test_ambiguous_version_spec(self):
spec = Spec('mpileaks@1.0:5.0,6.1,7.3+debug~opt') spec = Spec('mpileaks@1.0:5.0,6.1,7.3+debug~opt')
spec.normalize() spec.normalize()
self.check_yaml_round_trip(spec) self.check_yaml_round_trip(spec)
@ -61,7 +61,7 @@ def test_concrete_spec(self):
self.check_yaml_round_trip(spec) self.check_yaml_round_trip(spec)
def _test_yaml_subdag(self): def test_yaml_subdag(self):
spec = Spec('mpileaks^mpich+debug') spec = Spec('mpileaks^mpich+debug')
spec.concretize() spec.concretize()