From 972a277956f8f01a890e434a78fd3aec7f0e0b66 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 30 Dec 2016 11:37:50 -0800 Subject: [PATCH 01/22] Fix Python issue with build failures; Add test case for build failures. (#2687) --- lib/spack/spack/build_environment.py | 10 +++-- lib/spack/spack/test/install.py | 12 ++++++ .../packages/failing-build/package.py | 37 +++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 var/spack/repos/builtin.mock/packages/failing-build/package.py diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index d83288860b3..67b00c67494 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -60,9 +60,10 @@ import llnl.util.lang as lang import llnl.util.tty as tty +from llnl.util.filesystem import * + import spack import spack.store -from llnl.util.filesystem import * from spack.environment import EnvironmentModifications, validate from spack.util.environment import * from spack.util.executable import Executable, which @@ -450,7 +451,8 @@ def parent_class_modules(cls): """ Get list of super class modules that are all descend from spack.Package """ - if not issubclass(cls, spack.Package) or issubclass(spack.Package, cls): + if (not issubclass(cls, spack.package.Package) or + issubclass(spack.package.Package, cls)): return [] result = [] module = sys.modules.get(cls.__module__) @@ -622,9 +624,9 @@ def make_stack(tb, stack=None): for tb in stack: frame = tb.tb_frame if 'self' in frame.f_locals: - # Find the first proper subclass of spack.PackageBase. + # Find the first proper subclass of PackageBase. obj = frame.f_locals['self'] - if isinstance(obj, spack.PackageBase): + if isinstance(obj, spack.package.PackageBase): break # we found obj, the Package implementation we care about. diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index 3a83280c6f5..d2ebf8dfb45 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -90,3 +90,15 @@ def test_store(mock_archive): except Exception: pkg.remove_prefix() raise + + +@pytest.mark.usefixtures('install_mockery') +def test_failing_build(mock_archive): + spec = Spec('failing-build').concretized() + + for s in spec.traverse(): + fake_fetchify(mock_archive.url, s.package) + + pkg = spec.package + with pytest.raises(spack.build_environment.ChildError): + pkg.do_install() diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py new file mode 100644 index 00000000000..a36553992e8 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class FailingBuild(Package): + """This package has a trivial install method that fails.""" + + homepage = "http://www.example.com/trivial_install" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + + version('1.0', 'foobarbaz') + + def install(self, spec, prefix): + raise InstallError("Expected failure.") From d52c44cba9c5a56c38340157bfa8382a54e17ca5 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 30 Dec 2016 13:59:21 -0800 Subject: [PATCH 02/22] Add OSX build to .travis.yml. Clean up .travis.yml (#2689) * Add OSX build to .travis.yml. Clean up .travis.yml * Add gcc/gfortran to the mac brew setup. --- .travis.yml | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17549e42ab4..3f26b319a81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +#============================================================================= +# Project settings +#============================================================================= language: python # Only build master and develop on push; do not build every branch. @@ -6,7 +9,9 @@ branches: - master - develop -# Construct build matrix +#============================================================================= +# Build matrix +#============================================================================= python: - 2.6 - 2.7 @@ -17,14 +22,23 @@ env: - TEST_SUITE=doc matrix: + # Flake8 and Sphinx no longer support Python 2.6, and one run is enough. exclude: - python: 2.6 - # Flake8 no longer supports Python 2.6 env: TEST_SUITE=flake8 - python: 2.6 - # Sphinx no longer supports Python 2.6 env: TEST_SUITE=doc + # Explicitly include an OS X build with homebrew's python. + # Works around Python issues on Travis for OSX, described here: + # http://blog.fizyk.net.pl/blog/running-python-tests-on-traviss-osx-workers.html + include: + - os: osx + language: generic + env: TEST_SUITE=unit +#============================================================================= +# Environment +#============================================================================= # Use new Travis infrastructure (Docker can't sudo yet) sudo: false @@ -32,9 +46,18 @@ sudo: false addons: apt: packages: + - python - graphviz - libyaml-dev +# Work around Travis's lack of support for Python on OSX +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions python > /dev/null || brew install python; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions gcc > /dev/null || brew install gcc; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi + # Install various dependencies install: - pip install --upgrade coveralls @@ -50,11 +73,17 @@ before_script: # Need this to be able to compute the list of changed files - git fetch origin develop:develop +#============================================================================= +# Building +#============================================================================= script: share/spack/qa/run-$TEST_SUITE-tests after_success: - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi +#============================================================================= +# Notifications +#============================================================================= notifications: email: recipients: tgamblin@llnl.gov From a42f340d375cbc781e7a113f3b3afa2e4e3124ed Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 30 Dec 2016 23:11:39 +0100 Subject: [PATCH 03/22] Allow setting default variants (#2644) --- lib/spack/spack/preferred_packages.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/preferred_packages.py b/lib/spack/spack/preferred_packages.py index 08f9c3cfa83..dc6cb3e9218 100644 --- a/lib/spack/spack/preferred_packages.py +++ b/lib/spack/spack/preferred_packages.py @@ -154,10 +154,17 @@ def spec_has_preferred_provider(self, pkgname, provider_str): def spec_preferred_variants(self, pkgname): """Return a VariantMap of preferred variants and their values""" - variants = self.preferred.get(pkgname, {}).get('variants', '') + for pkg in (pkgname, 'all'): + variants = self.preferred.get(pkg, {}).get('variants', '') + if variants: + break if not isinstance(variants, basestring): variants = " ".join(variants) - return spack.spec.Spec("%s %s" % (pkgname, variants)).variants + pkg = spack.repo.get(pkgname) + spec = spack.spec.Spec("%s %s" % (pkgname, variants)) + # Only return variants that are actually supported by the package + return dict((name, variant) for name, variant in spec.variants.items() + if name in pkg.variants) def version_compare(self, pkgname, a, b): """Return less-than-0, 0, or greater than 0 if version a of pkgname is From b5537553f2ec7de70b507936a3abea30b71e2cbf Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 30 Dec 2016 13:53:30 -0800 Subject: [PATCH 04/22] Run coverage for the `spack install` command as well as `spack test`. - Also don't run coverage on OSX. --- .travis.yml | 4 ++-- share/spack/qa/run-unit-tests | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f26b319a81..04db99a47b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ sudo: false addons: apt: packages: - - python + - gfortran - graphviz - libyaml-dev @@ -79,7 +79,7 @@ before_script: script: share/spack/qa/run-$TEST_SUITE-tests after_success: - - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi + - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 && $TRAVIS_OS_NAME == "linux" ]]; then coveralls; fi #============================================================================= # Notifications diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 0728614bc84..9cace0dfd66 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -40,12 +40,13 @@ cd "$SPACK_ROOT" source "$SPACK_ROOT/share/spack/setup-env.sh" spack compilers spack config get compilers -spack install -v libdwarf # Run unit tests with code coverage if [[ "$TRAVIS_PYTHON_VERSION" == 2.7 ]]; then + coverage run bin/spack install -v libdwarf coverage run bin/spack test "$@" coverage combine else + spack install -v libdwarf spack test "$@" fi From c88df5819d2c62abbc3eb5a808ea1cce360ac884 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 30 Dec 2016 16:31:26 -0800 Subject: [PATCH 05/22] Fix test command arg handling. --- lib/spack/spack/cmd/test.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 2e0ab8b49ea..9d92037bb64 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -99,9 +99,10 @@ def test(parser, args, unknown_args): do_list(args, unknown_args) return - if args.tests and not any(arg.startswith('-') for arg in args.tests): - # Allow keyword search without -k if no options are specified + # Allow keyword search without -k if no options are specified + if (args.tests and not unknown_args and + not any(arg.startswith('-') for arg in args.tests)): return pytest.main(['-k'] + args.tests) - else: - # Just run the pytest command. - return pytest.main(unknown_args + args.tests) + + # Just run the pytest command + return pytest.main(unknown_args + args.tests) From 8cb54a9a67b52c809c1681cfce18c8adcf70d32a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 31 Dec 2016 00:52:49 -0600 Subject: [PATCH 06/22] Fix missing debug parameter for parse_version() (#2696) --- lib/spack/spack/url.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 9043a5ad3ee..85311ba64ca 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -266,11 +266,11 @@ def parse_version_offset(path, debug=False): raise UndetectableVersionError(original_path) -def parse_version(path): +def parse_version(path, debug=False): """Given a URL or archive name, extract a version from it and return a version object. """ - ver, start, l = parse_version_offset(path) + ver, start, l = parse_version_offset(path, debug=debug) return Version(ver) From 040f8a7176040f38ba46abc1afd54464ece3e1c8 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 31 Dec 2016 00:53:54 -0600 Subject: [PATCH 07/22] Add latest version of gmp (#2695) --- var/spack/repos/builtin/packages/gmp/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index eacd3a67338..45e8b8a452f 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -26,12 +26,13 @@ class Gmp(AutotoolsPackage): - """GMP is a free library for arbitrary precision arithmetic, - operating on signed integers, rational numbers, and - floating-point numbers.""" + """GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating-point numbers.""" + homepage = "https://gmplib.org" url = "https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2" + version('6.1.2', '8ddbb26dc3bd4e2302984debba1406a5') version('6.1.1', '4c175f86e11eb32d8bf9872ca3a8e11d') version('6.1.0', '86ee6e54ebfc4a90b643a65e402c4048') version('6.0.0a', 'b7ff2d88cae7f8085bd5006096eed470') @@ -41,7 +42,7 @@ class Gmp(AutotoolsPackage): def configure_args(self): args = ['--enable-cxx'] - # We need this flag if we want all the following checks to pass. + # This flag is necessary for the Intel build to pass `make check` if self.spec.compiler.name == 'intel': args.append('CXXFLAGS=-no-ftz') From b9ec69dce15c69ba11f6d637614399b3a3a470e5 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sat, 31 Dec 2016 08:12:38 -0800 Subject: [PATCH 08/22] Disallow vdeps in `packages.yaml` (#2699) * Consolidate packages.yaml code to preferred_packages * Add validation check and a test for packages.py parsing. * flake8 --- lib/spack/spack/__init__.py | 7 +- lib/spack/spack/concretize.py | 50 +------- lib/spack/spack/config.py | 49 +------ ...preferred_packages.py => package_prefs.py} | 120 +++++++++++++++++- lib/spack/spack/repository.py | 12 ++ lib/spack/spack/spec.py | 10 +- .../spack/test/concretize_preferences.py | 33 ++++- 7 files changed, 177 insertions(+), 104 deletions(-) rename lib/spack/spack/{preferred_packages.py => package_prefs.py} (70%) diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 39a0b78f829..771fc7b32ad 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -77,7 +77,7 @@ import spack.config import spack.fetch_strategy from spack.file_cache import FileCache -from spack.preferred_packages import PreferredPackages +from spack.package_prefs import PreferredPackages from spack.abi import ABI from spack.concretize import DefaultConcretizer from spack.version import Version @@ -99,11 +99,6 @@ tty.die('while initializing Spack RepoPath:', e.message) -# PreferredPackages controls preference sort order during concretization. -# More preferred packages are sorted first. -pkgsort = PreferredPackages() - - # Tests ABI compatibility between packages abi = ABI() diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 46906911744..36e8b301961 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -42,8 +42,7 @@ from spack.version import * from functools import partial from itertools import chain -from spack.config import * -import spack.preferred_packages +from spack.package_prefs import * class DefaultConcretizer(object): @@ -64,11 +63,11 @@ def _valid_virtuals_and_externals(self, spec): raise UnsatisfiableProviderSpecError(providers[0], spec) spec_w_preferred_providers = find_spec( spec, - lambda x: spack.pkgsort.spec_has_preferred_provider( + lambda x: pkgsort().spec_has_preferred_provider( x.name, spec.name)) if not spec_w_preferred_providers: spec_w_preferred_providers = spec - provider_cmp = partial(spack.pkgsort.provider_compare, + provider_cmp = partial(pkgsort().provider_compare, spec_w_preferred_providers.name, spec.name) candidates = sorted(providers, cmp=provider_cmp) @@ -169,8 +168,8 @@ def concretize_version(self, spec): # ---------- Produce prioritized list of versions # Get list of preferences from packages.yaml - preferred = spack.pkgsort - # NOTE: spack.pkgsort == spack.preferred_packages.PreferredPackages() + preferred = pkgsort() + # NOTE: pkgsort() == spack.package_prefs.PreferredPackages() yaml_specs = [ x[0] for x in @@ -277,7 +276,7 @@ def concretize_variants(self, spec): the package specification. """ changed = False - preferred_variants = spack.pkgsort.spec_preferred_variants( + preferred_variants = pkgsort().spec_preferred_variants( spec.package_class.name) for name, variant in spec.package_class.variants.items(): if name not in spec.variants: @@ -342,7 +341,7 @@ def _proper_compiler_style(cspec, aspec): compiler_list = all_compilers if not other_compiler else \ spack.compilers.find(other_compiler) cmp_compilers = partial( - spack.pkgsort.compiler_compare, other_spec.name) + pkgsort().compiler_compare, other_spec.name) matches = sorted(compiler_list, cmp=cmp_compilers) if not matches: arch = spec.architecture @@ -467,41 +466,6 @@ def find_spec(spec, condition): return None # Nothing matched the condition. -def cmp_specs(lhs, rhs): - # Package name sort order is not configurable, always goes alphabetical - if lhs.name != rhs.name: - return cmp(lhs.name, rhs.name) - - # Package version is second in compare order - pkgname = lhs.name - if lhs.versions != rhs.versions: - return spack.pkgsort.version_compare( - pkgname, lhs.versions, rhs.versions) - - # Compiler is third - if lhs.compiler != rhs.compiler: - return spack.pkgsort.compiler_compare( - pkgname, lhs.compiler, rhs.compiler) - - # Variants - if lhs.variants != rhs.variants: - return spack.pkgsort.variant_compare( - pkgname, lhs.variants, rhs.variants) - - # Architecture - if lhs.architecture != rhs.architecture: - return spack.pkgsort.architecture_compare( - pkgname, lhs.architecture, rhs.architecture) - - # Dependency is not configurable - lhash, rhash = hash(lhs), hash(rhs) - if lhash != rhash: - return -1 if lhash < rhash else 1 - - # Equal specs - return 0 - - class UnavailableCompilerVersionError(spack.error.SpackError): """Raised when there is no available compiler that satisfies a diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 989b3da1698..56c6421457f 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -199,6 +199,7 @@ def clear(self): def __repr__(self): return '' % (self.name, self.path) + # # Below are configuration scopes. # @@ -458,54 +459,6 @@ def print_section(section): raise ConfigError("Error reading configuration: %s" % section) -def spec_externals(spec): - """Return a list of external specs (with external directory path filled in), - one for each known external installation.""" - # break circular import. - from spack.build_environment import get_path_from_module - - allpkgs = get_config('packages') - name = spec.name - - external_specs = [] - pkg_paths = allpkgs.get(name, {}).get('paths', None) - pkg_modules = allpkgs.get(name, {}).get('modules', None) - if (not pkg_paths) and (not pkg_modules): - return [] - - for external_spec, path in pkg_paths.iteritems(): - if not path: - # skip entries without paths (avoid creating extra Specs) - continue - - external_spec = spack.spec.Spec(external_spec, external=path) - if external_spec.satisfies(spec): - external_specs.append(external_spec) - - for external_spec, module in pkg_modules.iteritems(): - if not module: - continue - - path = get_path_from_module(module) - - external_spec = spack.spec.Spec( - external_spec, external=path, external_module=module) - if external_spec.satisfies(spec): - external_specs.append(external_spec) - - return external_specs - - -def is_spec_buildable(spec): - """Return true if the spec pkgspec is configured as buildable""" - allpkgs = get_config('packages') - if spec.name not in allpkgs: - return True - if 'buildable' not in allpkgs[spec.name]: - return True - return allpkgs[spec.name]['buildable'] - - class ConfigError(SpackError): pass diff --git a/lib/spack/spack/preferred_packages.py b/lib/spack/spack/package_prefs.py similarity index 70% rename from lib/spack/spack/preferred_packages.py rename to lib/spack/spack/package_prefs.py index dc6cb3e9218..190647bb817 100644 --- a/lib/spack/spack/preferred_packages.py +++ b/lib/spack/spack/package_prefs.py @@ -24,12 +24,33 @@ ############################################################################## import spack +import spack.error from spack.version import * +def get_packages_config(): + """Wrapper around get_packages_config() to validate semantics.""" + config = spack.config.get_config('packages') + + # Get a list of virtuals from packages.yaml. Note that because we + # check spack.repo, this collects virtuals that are actually provided + # by sometihng, not just packages/names that don't exist. + # So, this won't include, e.g., 'all'. + virtuals = [(pkg_name, pkg_name._start_mark) for pkg_name in config + if spack.repo.is_virtual(pkg_name)] + + # die if there are virtuals in `packages.py` + if virtuals: + errors = ["%s: %s" % (line_info, name) for name, line_info in virtuals] + raise VirtualInPackagesYAMLError( + "packages.yaml entries cannot be virtual packages:", *errors) + + return config + + class PreferredPackages(object): def __init__(self): - self.preferred = spack.config.get_config('packages') + self.preferred = get_packages_config() self._spec_for_pkgname_cache = {} # Given a package name, sort component (e.g, version, compiler, ...), and @@ -194,3 +215,100 @@ def compiler_compare(self, pkgname, a, b): pkgname. One compiler is less-than another if it is preferred over the other.""" return self._spec_compare(pkgname, 'compiler', a, b, False, None) + + +def spec_externals(spec): + """Return a list of external specs (with external directory path filled in), + one for each known external installation.""" + # break circular import. + from spack.build_environment import get_path_from_module + + allpkgs = get_packages_config() + name = spec.name + + external_specs = [] + pkg_paths = allpkgs.get(name, {}).get('paths', None) + pkg_modules = allpkgs.get(name, {}).get('modules', None) + if (not pkg_paths) and (not pkg_modules): + return [] + + for external_spec, path in pkg_paths.iteritems(): + if not path: + # skip entries without paths (avoid creating extra Specs) + continue + + external_spec = spack.spec.Spec(external_spec, external=path) + if external_spec.satisfies(spec): + external_specs.append(external_spec) + + for external_spec, module in pkg_modules.iteritems(): + if not module: + continue + + path = get_path_from_module(module) + + external_spec = spack.spec.Spec( + external_spec, external=path, external_module=module) + if external_spec.satisfies(spec): + external_specs.append(external_spec) + + return external_specs + + +def is_spec_buildable(spec): + """Return true if the spec pkgspec is configured as buildable""" + allpkgs = get_packages_config() + if spec.name not in allpkgs: + return True + if 'buildable' not in allpkgs[spec.name]: + return True + return allpkgs[spec.name]['buildable'] + + +def cmp_specs(lhs, rhs): + # Package name sort order is not configurable, always goes alphabetical + if lhs.name != rhs.name: + return cmp(lhs.name, rhs.name) + + # Package version is second in compare order + pkgname = lhs.name + if lhs.versions != rhs.versions: + return pkgsort().version_compare( + pkgname, lhs.versions, rhs.versions) + + # Compiler is third + if lhs.compiler != rhs.compiler: + return pkgsort().compiler_compare( + pkgname, lhs.compiler, rhs.compiler) + + # Variants + if lhs.variants != rhs.variants: + return pkgsort().variant_compare( + pkgname, lhs.variants, rhs.variants) + + # Architecture + if lhs.architecture != rhs.architecture: + return pkgsort().architecture_compare( + pkgname, lhs.architecture, rhs.architecture) + + # Dependency is not configurable + lhash, rhash = hash(lhs), hash(rhs) + if lhash != rhash: + return -1 if lhash < rhash else 1 + + # Equal specs + return 0 + + +_pkgsort = None + + +def pkgsort(): + global _pkgsort + if _pkgsort is None: + _pkgsort = PreferredPackages() + return _pkgsort + + +class VirtualInPackagesYAMLError(spack.error.SpackError): + """Raised when a disallowed virtual is found in packages.yaml""" diff --git a/lib/spack/spack/repository.py b/lib/spack/spack/repository.py index d77700c01f9..1536ecb0e63 100644 --- a/lib/spack/spack/repository.py +++ b/lib/spack/spack/repository.py @@ -337,8 +337,16 @@ def filename_for_package_name(self, pkg_name): return self.repo_for_pkg(pkg_name).filename_for_package_name(pkg_name) def exists(self, pkg_name): + """Whether package with the give name exists in the path's repos. + + Note that virtual packages do not "exist". + """ return any(repo.exists(pkg_name) for repo in self.repos) + def is_virtual(self, pkg_name): + """True if the package with this name is virtual, False otherwise.""" + return pkg_name in self.provider_index + def __contains__(self, pkg_name): return self.exists(pkg_name) @@ -772,6 +780,10 @@ def exists(self, pkg_name): filename = self.filename_for_package_name(pkg_name) return os.path.exists(filename) + def is_virtual(self, pkg_name): + """True if the package with this name is virtual, False otherwise.""" + return self.provider_index.contains(pkg_name) + def _get_pkg_module(self, pkg_name): """Create a module for a particular package. diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 5291a7c9d01..c96ef1dc305 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -2546,6 +2546,8 @@ def dep_string(self): return ''.join("^" + dep.format() for dep in self.sorted_deps()) def __cmp__(self, other): + from package_prefs import pkgsort + # Package name sort order is not configurable, always goes alphabetical if self.name != other.name: return cmp(self.name, other.name) @@ -2553,22 +2555,22 @@ def __cmp__(self, other): # Package version is second in compare order pkgname = self.name if self.versions != other.versions: - return spack.pkgsort.version_compare( + return pkgsort().version_compare( pkgname, self.versions, other.versions) # Compiler is third if self.compiler != other.compiler: - return spack.pkgsort.compiler_compare( + return pkgsort().compiler_compare( pkgname, self.compiler, other.compiler) # Variants if self.variants != other.variants: - return spack.pkgsort.variant_compare( + return pkgsort().variant_compare( pkgname, self.variants, other.variants) # Target if self.architecture != other.architecture: - return spack.pkgsort.architecture_compare( + return pkgsort().architecture_compare( pkgname, self.architecture, other.architecture) # Dependency is not configurable diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py index 21d457d2e0f..b95fc83010b 100644 --- a/lib/spack/spack/test/concretize_preferences.py +++ b/lib/spack/spack/test/concretize_preferences.py @@ -25,7 +25,9 @@ import pytest import spack +import spack.util.spack_yaml as syaml from spack.spec import Spec +from spack.package_prefs import PreferredPackages @pytest.fixture() @@ -39,7 +41,7 @@ def concretize_scope(config, tmpdir): # This is kind of weird, but that's how config scopes are # set in ConfigScope.__init__ spack.config.config_scopes.pop('concretize') - spack.pkgsort = spack.PreferredPackages() + spack.package_prefs._pkgsort = PreferredPackages() def concretize(abstract_spec): @@ -50,7 +52,7 @@ def update_packages(pkgname, section, value): """Update config and reread package list""" conf = {pkgname: {section: value}} spack.config.update_config('packages', conf, 'concretize') - spack.pkgsort = spack.PreferredPackages() + spack.package_prefs._pkgsort = PreferredPackages() def assert_variant_values(spec, **variants): @@ -114,3 +116,30 @@ def test_develop(self): spec = Spec('builtin.mock.develop-test') spec.concretize() assert spec.version == spack.spec.Version('0.2.15') + + def test_no_virtuals_in_packages_yaml(self): + """Verify that virtuals are not allowed in packages.yaml.""" + + # set up a packages.yaml file with a vdep as a key. We use + # syaml.load here to make sure source lines in the config are + # attached to parsed strings, as the error message uses them. + conf = syaml.load("""mpi: + paths: + mpi-with-lapack@2.1: /path/to/lapack +""") + spack.config.update_config('packages', conf, 'concretize') + + # now when we get the packages.yaml config, there should be an error + with pytest.raises(spack.package_prefs.VirtualInPackagesYAMLError): + spack.package_prefs.get_packages_config() + + def test_all_is_not_a_virtual(self): + """Verify that `all` is allowed in packages.yaml.""" + conf = syaml.load("""all: + variants: [+mpi] +""") + spack.config.update_config('packages', conf, 'concretize') + + # should be no error for 'all': + spack.package_prefs._pkgsort = PreferredPackages() + spack.package_prefs.get_packages_config() From 34d23c617c89861e0d4ee1aad6a0acf1892502df Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 1 Jan 2017 22:05:33 +0100 Subject: [PATCH 09/22] tests: `coverage combine` run only if tests succeeded (#2712) --- share/spack/qa/run-unit-tests | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 9cace0dfd66..d2ce9647aff 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -44,8 +44,7 @@ spack config get compilers # Run unit tests with code coverage if [[ "$TRAVIS_PYTHON_VERSION" == 2.7 ]]; then coverage run bin/spack install -v libdwarf - coverage run bin/spack test "$@" - coverage combine + coverage run bin/spack test "$@" && coverage combine else spack install -v libdwarf spack test "$@" From d32d5e45fb898835343a8aa8853708f60e14bd9f Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 2 Jan 2017 18:40:57 -0800 Subject: [PATCH 10/22] Fix issues when a package provides the same vdep twice. (#2710) * Fix issues when a package provides the same vdep twice. - provides() now adds to a set of provided vdeps instead of a single one. * flake8 --- lib/spack/spack/cmd/info.py | 11 +++- lib/spack/spack/directives.py | 4 +- lib/spack/spack/provider_index.py | 49 +++++++++--------- lib/spack/spack/spec.py | 5 +- lib/spack/spack/test/concretize.py | 19 +++++++ .../packages/multi-provider-mpi/package.py | 51 +++++++++++++++++++ 6 files changed, 111 insertions(+), 28 deletions(-) create mode 100644 var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index 5366ad4aa8a..8e7df87a023 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -106,8 +106,15 @@ def print_text_info(pkg): print print "Virtual Packages: " if pkg.provided: - for spec, when in pkg.provided.items(): - print " %s provides %s" % (when, spec) + inverse_map = {} + for spec, whens in pkg.provided.items(): + for when in whens: + if when not in inverse_map: + inverse_map[when] = set() + inverse_map[when].add(spec) + for when, specs in reversed(sorted(inverse_map.items())): + print " %s provides %s" % ( + when, ', '.join(str(s) for s in specs)) else: print " None" diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index d499e96513b..72656684e04 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -313,7 +313,9 @@ def _execute(pkg): for provided_spec in spack.spec.parse(string): if pkg.name == provided_spec.name: raise CircularReferenceError('depends_on', pkg.name) - pkg.provided[provided_spec] = provider_spec + if provided_spec not in pkg.provided: + pkg.provided[provided_spec] = set() + pkg.provided[provided_spec].add(provider_spec) return _execute diff --git a/lib/spack/spack/provider_index.py b/lib/spack/spack/provider_index.py index 3911947e4a0..0e771c6255e 100644 --- a/lib/spack/spack/provider_index.py +++ b/lib/spack/spack/provider_index.py @@ -97,35 +97,38 @@ def update(self, spec): assert(not spec.virtual) pkg = spec.package - for provided_spec, provider_spec in pkg.provided.iteritems(): - # We want satisfaction other than flags - provider_spec.compiler_flags = spec.compiler_flags.copy() + for provided_spec, provider_specs in pkg.provided.iteritems(): + for provider_spec in provider_specs: + # TODO: fix this comment. + # We want satisfaction other than flags + provider_spec.compiler_flags = spec.compiler_flags.copy() - if spec.satisfies(provider_spec, deps=False): - provided_name = provided_spec.name + if spec.satisfies(provider_spec, deps=False): + provided_name = provided_spec.name - provider_map = self.providers.setdefault(provided_name, {}) - if provided_spec not in provider_map: - provider_map[provided_spec] = set() + provider_map = self.providers.setdefault(provided_name, {}) + if provided_spec not in provider_map: + provider_map[provided_spec] = set() - if self.restrict: - provider_set = provider_map[provided_spec] + if self.restrict: + provider_set = provider_map[provided_spec] - # If this package existed in the index before, - # need to take the old versions out, as they're - # now more constrained. - old = set([s for s in provider_set if s.name == spec.name]) - provider_set.difference_update(old) + # If this package existed in the index before, + # need to take the old versions out, as they're + # now more constrained. + old = set( + [s for s in provider_set if s.name == spec.name]) + provider_set.difference_update(old) - # Now add the new version. - provider_set.add(spec) + # Now add the new version. + provider_set.add(spec) - else: - # Before putting the spec in the map, constrain it so that - # it provides what was asked for. - constrained = spec.copy() - constrained.constrain(provider_spec) - provider_map[provided_spec].add(constrained) + else: + # Before putting the spec in the map, constrain + # it so that it provides what was asked for. + constrained = spec.copy() + constrained.constrain(provider_spec) + provider_map[provided_spec].add(constrained) def providers_for(self, *vpkg_specs): """Gives specs of all packages that provide virtual packages diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index c96ef1dc305..9ce50a54d3d 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -2020,8 +2020,9 @@ def satisfies(self, other, deps=True, strict=False): if not self.virtual and other.virtual: pkg = spack.repo.get(self.fullname) if pkg.provides(other.name): - for provided, when_spec in pkg.provided.items(): - if self.satisfies(when_spec, deps=False, strict=strict): + for provided, when_specs in pkg.provided.items(): + if any(self.satisfies(when_spec, deps=False, strict=strict) + for when_spec in when_specs): if provided.satisfies(other): return True return False diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 1f8eeaa29ea..3cc5c70a5f7 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -161,6 +161,25 @@ def test_concretize_with_provides_when(self): s.satisfies('mpich2') for s in repo.providers_for('mpi@3') ) + def test_provides_handles_multiple_providers_of_same_vesrion(self): + """ + """ + providers = spack.repo.providers_for('mpi@3.0') + + # Note that providers are repo-specific, so we don't misinterpret + # providers, but vdeps are not namespace-specific, so we can + # associate vdeps across repos. + assert Spec('builtin.mock.multi-provider-mpi@1.10.3') in providers + assert Spec('builtin.mock.multi-provider-mpi@1.10.2') in providers + assert Spec('builtin.mock.multi-provider-mpi@1.10.1') in providers + assert Spec('builtin.mock.multi-provider-mpi@1.10.0') in providers + assert Spec('builtin.mock.multi-provider-mpi@1.8.8') in providers + + def concretize_multi_provider(self): + s = Spec('mpileaks ^multi-provider-mpi@3.0') + s.concretize() + assert s['mpi'].version == ver('1.10.3') + def test_concretize_two_virtuals(self): """Test a package with multiple virtual dependencies.""" Spec('hypre').concretize() diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py new file mode 100644 index 00000000000..5f85dec9b52 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class MultiProviderMpi(Package): + """This is a fake MPI package used to test packages providing multiple + virtuals at the same version.""" + homepage = "http://www.spack-fake-mpi.org" + url = "http://www.spack-fake-mpi.org/downloads/multi-mpi-1.0.tar.gz" + + version('2.0.0', 'foobarbaz') + version('1.10.3', 'foobarbaz') + version('1.10.2', 'foobarbaz') + version('1.10.1', 'foobarbaz') + version('1.10.0', 'foobarbaz') + version('1.8.8', 'foobarbaz') + version('1.6.5', 'foobarbaz') + + provides('mpi@3.1', when='@2.0.0') + provides('mpi@3.0', when='@1.10.3') + provides('mpi@3.0', when='@1.10.2') + provides('mpi@3.0', when='@1.10.1') + provides('mpi@3.0', when='@1.10.0') + provides('mpi@3.0', when='@1.8.8') + provides('mpi@2.2', when='@1.6.5') + + def install(self, spec, prefix): + pass From 2322deda65b687dd13e4b50fc07cd3fa8dafff5a Mon Sep 17 00:00:00 2001 From: Barry Smith Date: Tue, 3 Jan 2017 15:52:14 -0600 Subject: [PATCH 11/22] Update to latest zlib version, server no longer provides older version (#2720) * Update to latest zlib version, server no longer provides older version Funded-by: IDEAS Project: IDEAS/xSDK * Add alternative URL for previous release of zlib --- var/spack/repos/builtin/packages/zlib/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 5382146b5d4..c8251ce7a85 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -33,7 +33,10 @@ class Zlib(AutotoolsPackage): homepage = "http://zlib.net" url = "http://zlib.net/zlib-1.2.8.tar.gz" - version('1.2.8', '44d667c142d7cda120332623eab69f40') + version('1.2.10', 'd9794246f853d15ce0fcbf79b9a3cf13') + version('1.2.8', '44d667c142d7cda120332623eab69f40', + url='http://pkgs.fedoraproject.org/repo/pkgs/mingw-zlib/zlib-1.2.8.tar.gz/44d667c142d7cda120332623eab69f40/zlib-1.2.8.tar.gz' + ) variant('pic', default=True, description='Produce position-independent code (for shared libs)') From 2e24a3a2be933b853905131c360becb35b67ebf1 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Wed, 4 Jan 2017 07:51:16 -0800 Subject: [PATCH 12/22] zlib@1.2.10 and R do not get along, work around it (#2727) * zlib@1.2.10 and R do not get along, work around it R's configure script has trouble with version numbers > 1.2.9. This works around it by constraining R to 1.2.8. I'm working with some R folk on getting it fixed going forward. * Add adamjstewart's change. --- var/spack/repos/builtin/packages/R/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/R/package.py index fa8adb69eaa..a60fa8122c1 100644 --- a/var/spack/repos/builtin/packages/R/package.py +++ b/var/spack/repos/builtin/packages/R/package.py @@ -63,6 +63,7 @@ class R(Package): depends_on('icu4c') depends_on('glib') depends_on('zlib') + depends_on('zlib@:1.2.8', when='@:3.3.1') depends_on('bzip2') depends_on('libtiff') depends_on('jpeg') From 03471469e7f4059ab3a9be9637b64f6b852e6303 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 4 Jan 2017 11:32:10 -0500 Subject: [PATCH 13/22] libpng: Upgrade versions to fix vulnerability. (#2723) --- .../repos/builtin/packages/libpng/package.py | 20 +++++++++++++------ .../repos/builtin/packages/qt/package.py | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index fc55651497c..46bbcebb89a 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -29,14 +29,22 @@ class Libpng(AutotoolsPackage): """libpng is the official PNG reference library.""" homepage = "http://www.libpng.org/pub/png/libpng.html" - url = "http://download.sourceforge.net/libpng/libpng-1.6.26.tar.gz" + url = "http://download.sourceforge.net/libpng/libpng-1.6.27.tar.gz" - version('1.6.26', '236cd975520fc1f34cc0b8f0e615f7a0') - version('1.6.24', '65213080dd30a9b16193d9b83adc1ee9') - - # Security vulnerabilities have been discovered in 1.6.19 an older + version('1.6.27', '58698519e9f6126c1caeefc28dbcbd5f') + # From http://www.libpng.org/pub/png/libpng.html (2017-01-04) + # Virtually all libpng versions through 1.6.26, 1.5.27, + # 1.4.19, 1.2.56, and 1.0.66, respectively, have a + # null-pointer-dereference bug in png_set_text_2() when an + # image-editing application adds, removes, and re-adds text + # chunks to a PNG image. (This bug does not affect pure + # viewers, nor are there any known editors that could trigger + # it without interactive user input. It has been assigned ID + # CVE-2016-10087.) The vulnerability is fixed in versions + # 1.6.27, 1.5.28, 1.4.20, 1.2.57, and 1.0.67, released on 29 + # December 2016. # Required for qt@3 - version('1.2.56', '9508fc59d10a1ffadd9aae35116c19ee') + version('1.2.57', 'dfcda3603e29dcc11870c48f838ef75b') depends_on('zlib@1.0.4:') # 1.2.5 or later recommended diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 6e6d4b95f61..d815add9f0d 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -70,7 +70,7 @@ class Qt(Package): depends_on("zlib") depends_on("dbus", when='@4:+dbus') depends_on("libtiff") - depends_on("libpng@1.2.56", when='@3') + depends_on("libpng@1.2.57", when='@3') depends_on("libpng", when='@4:') depends_on("libmng") depends_on("jpeg") From 4ff33d41a79ef586a87ca6d080eb8267e46241f7 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Wed, 4 Jan 2017 17:39:58 +0100 Subject: [PATCH 14/22] New package: ccache (#2721) --- .../repos/builtin/packages/ccache/package.py | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ccache/package.py diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py new file mode 100644 index 00000000000..69b590629e7 --- /dev/null +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ccache(AutotoolsPackage): + """ccache is a compiler cache. It speeds up recompilation by caching + previous compilations and detecting when the same compilation is being done + again.""" + + homepage = "https://ccache.samba.org/" + url = "https://www.samba.org/ftp/ccache/ccache-3.3.3.tar.gz" + + version('3.3.3', 'ea1f95303749b9ac136c617d1b333eef') + version('3.3.2', 'b966d56603e1fad2bac22930e5f01830') + version('3.3.1', '7102ef024cff09d353b3f4c48379b40b') + version('3.3' , 'b7ac8fdd556f93831618483325fbb1ef') + version('3.2.9', '8f3f6e15e75a0e6020166927d41bd0b3') + + depends_on('gperf') + depends_on('libxslt') + depends_on('zlib') From e57fc3d9501263bc4d3a442b4350fb9b8f0bd4b6 Mon Sep 17 00:00:00 2001 From: Jeffrey Salmond Date: Wed, 4 Jan 2017 16:40:55 +0000 Subject: [PATCH 15/22] opencoarrays: new version (#2734) * add version 1.8.0 * remove depends_on('cmake') as it is now unecessary * remove 'coarrays' as a virtual package --- var/spack/repos/builtin/packages/opencoarrays/package.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index eb76960024d..387bc459465 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -36,14 +36,12 @@ class Opencoarrays(CMakePackage): homepage = "http://www.opencoarrays.org/" url = "https://github.com/sourceryinstitute/opencoarrays/releases/download/1.7.4/OpenCoarrays-1.7.4.tar.gz" + version('1.8.0', 'ca78d1507b2a118c75128c6c2e093e27') version('1.7.4', '85ba87def461e3ff5a164de2e6482930') version('1.6.2', '5a4da993794f3e04ea7855a6678981ba') - depends_on('cmake', type='build') depends_on('mpi') - provides('coarrays') - def cmake_args(self): args = [] args.append("-DCMAKE_C_COMPILER=%s" % self.spec['mpi'].mpicc) From eaa24b08fd032db60b11d3480ea4bbc13cd90f92 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Wed, 4 Jan 2017 10:20:08 -0800 Subject: [PATCH 16/22] add package for conduit (#2670) * add package for conduit * try to fix main conduit docstring * use join_path instead of pjoin * address a few requests in pr #2670 change name of 'github-master' to 'master' change 'docs' variant to 'doc', set default to False remove explicit +shared variant spec for silo and hdf5 deps (in the conduit +shared case) cases since they default to True add reference to static rpath issue (https://github.com/LLNL/spack/issues/2658) * address pr #2670 requests add todos and more info on why variants for deps where selected use python module install python to enable spack activate use .format instead of %s --- .../repos/builtin/packages/conduit/package.py | 312 ++++++++++++++++++ 1 file changed, 312 insertions(+) create mode 100644 var/spack/repos/builtin/packages/conduit/package.py diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py new file mode 100644 index 00000000000..ce1affc0cdb --- /dev/null +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -0,0 +1,312 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + +import socket +import os + +import llnl.util.tty as tty + + +def cmake_cache_entry(name, value): + """ + Helper that creates CMake cache entry strings used in + 'host-config' files. + """ + return 'set("{0}" "{1}" CACHE PATH "")\n\n'.format(name, value) + + +class Conduit(Package): + """Conduit is an open source project from Lawrence Livermore National + Laboratory that provides an intuitive model for describing hierarchical + scientific data in C++, C, Fortran, and Python. It is used for data + coupling between packages in-core, serialization, and I/O tasks.""" + + homepage = "http://software.llnl.gov/conduit" + url = "https://github.com/LLNL/conduit/archive/v0.2.0.tar.gz" + + version('0.2.0', 'd595573dedf55514c11d7391092fd760') + + version('master', git='https://github.com/LLNL/conduit.git') + + ########################################################################### + # package variants + ########################################################################### + + variant("shared", default=True, description="Build Conduit as shared libs") + + variant("cmake", default=True, + description="Build CMake (if off, attempt to use cmake from PATH)") + + # variants for python support + variant("python", default=True, description="Build Conduit Python support") + + # variants for comm and i/o + variant("mpi", default=True, description="Build Conduit MPI Support") + variant("hdf5", default=True, description="Build Conduit HDF5 support") + variant("silo", default=True, description="Build Conduit Silo support") + + # variants for dev-tools (docs, etc) + variant("doc", default=False, description="Build Conduit's documentation") + + ########################################################################### + # package dependencies + ########################################################################### + + ####################### + # CMake + ####################### + # cmake 3.3.1 is the version we tested + depends_on("cmake@3.3.1", when="+cmake") + + ####################### + # Python + ####################### + extends("python", when="+python") + # TODO: blas and lapack are disabled due to build + # issues Cyrus experienced on OSX 10.11.6 + depends_on("py-numpy~blas~lapack", when="+python") + + ####################### + # I/O Packages + ####################### + # TODO: cxx variant is disabled due to build issue Cyrus + # experienced on BGQ. When on, the static build tries + # to link agains shared libs. + # + # we are not using hdf5's mpi or fortran features. + depends_on("hdf5~cxx~mpi~fortran", when="+shared") + depends_on("hdf5~shared~cxx~mpi~fortran", when="~shared") + + # we are not using silo's fortran features + depends_on("silo~fortran", when="+shared") + depends_on("silo~shared~fortran", when="~shared") + + ####################### + # MPI + ####################### + depends_on("mpi", when="+mpi") + + ####################### + # Documentation related + ####################### + depends_on("py-sphinx", when="+python+doc") + depends_on("doxygen", when="+doc") + + def install(self, spec, prefix): + """ + Build and install Conduit. + """ + with working_dir('spack-build', create=True): + host_cfg_fname = self.create_host_config(spec, prefix) + cmake_args = [] + # if we have a static build, we need to avoid any of + # spack's default cmake settings related to rpaths + # (see: https://github.com/LLNL/spack/issues/2658) + if "+shared" in spec: + cmake_args.extend(std_cmake_args) + else: + for arg in std_cmake_args: + if arg.count("RPATH") == 0: + cmake_args.append(arg) + cmake_args.extend(["-C", host_cfg_fname, "../src"]) + cmake(*cmake_args) + make() + make("install") + + def create_host_config(self, spec, prefix): + """ + This method creates a 'host-config' file that specifies + all of the options used to configure and build conduit. + + For more details see about 'host-config' files see: + http://software.llnl.gov/conduit/building.html + """ + + ####################### + # Compiler Info + ####################### + c_compiler = env["SPACK_CC"] + cpp_compiler = env["SPACK_CXX"] + f_compiler = None + + if self.compiler.fc: + # even if this is set, it may not exist so do one more sanity check + if os.path.isfile(env["SPACK_FC"]): + f_compiler = env["SPACK_FC"] + + ####################################################################### + # By directly fetching the names of the actual compilers we appear + # to doing something evil here, but this is necessary to create a + # 'host config' file that works outside of the spack install env. + ####################################################################### + + sys_type = spec.architecture + # if on llnl systems, we can use the SYS_TYPE + if "SYS_TYPE" in env: + sys_type = env["SYS_TYPE"] + + ############################################## + # Find and record what CMake is used + ############################################## + + if "+cmake" in spec: + cmake_exe = join_path(spec['cmake'].prefix.bin, "cmake") + else: + cmake_exe = which("cmake") + if cmake_exe is None: + msg = 'failed to find CMake (and cmake variant is off)' + raise RuntimeError(msg) + cmake_exe = cmake_exe.command + + host_cfg_fname = "%s-%s-%s.cmake" % (socket.gethostname(), + sys_type, + spec.compiler) + + cfg = open(host_cfg_fname, "w") + cfg.write("##################################\n") + cfg.write("# spack generated host-config\n") + cfg.write("##################################\n") + cfg.write("# {0}-{1}\n".format(sys_type, spec.compiler)) + cfg.write("##################################\n\n") + + # Include path to cmake for reference + cfg.write("# cmake from spack \n") + cfg.write("# cmake executable path: %s\n\n" % cmake_exe) + + ####################### + # Compiler Settings + ####################### + + cfg.write("#######\n") + cfg.write("# using %s compiler spec\n" % spec.compiler) + cfg.write("#######\n\n") + cfg.write("# c compiler used by spack\n") + cfg.write(cmake_cache_entry("CMAKE_C_COMPILER", c_compiler)) + cfg.write("# cpp compiler used by spack\n") + cfg.write(cmake_cache_entry("CMAKE_CXX_COMPILER", cpp_compiler)) + + cfg.write("# fortran compiler used by spack\n") + if f_compiler is not None: + cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON")) + cfg.write(cmake_cache_entry("CMAKE_Fortran_COMPILER", f_compiler)) + else: + cfg.write("# no fortran compiler found\n\n") + cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF")) + + ####################### + # Python + ####################### + + cfg.write("# Python Support\n") + + if "+python" in spec: + python_exe = join_path(spec['python'].prefix.bin, "python") + cfg.write("# Enable python module builds\n") + cfg.write(cmake_cache_entry("ENABLE_PYTHON", "ON")) + cfg.write("# python from spack \n") + cfg.write(cmake_cache_entry("PYTHON_EXECUTABLE", python_exe)) + # install module to standard style site packages dir + # so we can support spack activate + py_ver_short = "python{0}".format(spec["python"].version.up_to(2)) + pym_prefix = join_path("${CMAKE_INSTALL_PREFIX}", + "lib", + py_ver_short, + "site-packages") + # use pym_prefix as the install path + cfg.write(cmake_cache_entry("PYTHON_MODULE_INSTALL_PREFIX", + pym_prefix)) + else: + cfg.write(cmake_cache_entry("ENABLE_PYTHON", "OFF")) + + if "+doc" in spec: + cfg.write(cmake_cache_entry("ENABLE_DOCS", "ON")) + + cfg.write("# sphinx from spack \n") + sphinx_build_exe = join_path(spec['py-sphinx'].prefix.bin, + "sphinx-build") + cfg.write(cmake_cache_entry("SPHINX_EXECUTABLE", sphinx_build_exe)) + + cfg.write("# doxygen from uberenv\n") + doxygen_exe = join_path(spec['doxygen'].prefix.bin, "doxygen") + cfg.write(cmake_cache_entry("DOXYGEN_EXECUTABLE", doxygen_exe)) + else: + cfg.write(cmake_cache_entry("ENABLE_DOCS", "OFF")) + + ####################### + # MPI + ####################### + + cfg.write("# MPI Support\n") + + if "+mpi" in spec: + cfg.write(cmake_cache_entry("ENABLE_MPI", "ON")) + cfg.write(cmake_cache_entry("MPI_C_COMPILER", spec['mpi'].mpicc)) + # we use `mpicc` as `MPI_CXX_COMPILER` b/c we don't want to + # introduce linking deps to the MPI C++ libs (we aren't using + # C++ features of MPI) -- this happens with some versions of + # OpenMPI + cfg.write(cmake_cache_entry("MPI_CXX_COMPILER", spec['mpi'].mpicc)) + cfg.write(cmake_cache_entry("MPI_Fortran_COMPILER", + spec['mpi'].mpifc)) + else: + cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF")) + + ####################################################################### + # I/O Packages + ####################################################################### + + cfg.write("# I/O Packages\n\n") + + ####################### + # HDF5 + ####################### + + cfg.write("# hdf5 from spack \n") + + if "+hdf5" in spec: + cfg.write(cmake_cache_entry("HDF5_DIR", spec['hdf5'].prefix)) + else: + cfg.write("# hdf5 not built by spack \n") + + ####################### + # Silo + ####################### + + cfg.write("# silo from spack \n") + + if "+silo" in spec: + cfg.write(cmake_cache_entry("SILO_DIR", spec['silo'].prefix)) + else: + cfg.write("# silo not built by spack \n") + + cfg.write("##################################\n") + cfg.write("# end spack generated host-config\n") + cfg.write("##################################\n") + cfg.close() + + host_cfg_fname = os.path.abspath(host_cfg_fname) + tty.info("spack generated conduit host-config file: " + host_cfg_fname) + return host_cfg_fname From 4e653254c5047828887263120d5c49a2d898a402 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Wed, 4 Jan 2017 11:43:10 -0800 Subject: [PATCH 17/22] Use zlib's "fossil" site for old tarballs (#2735) * Use zlib's "fossil" site for old tarballs Following citibeth's suggestion in #2732, use zlib's "fossil" site (not to be confused with the sqlite team's VCS...) for retrieving old tarballs. Digests for 1.2.{8,10} match and both install for me on CentOS 7. * Use zlib's "fossil" URL as the one true URL Everything seems to be available at zlib's "fossil" URL, so just use it as the one and only url. (and fix a flake8 complaint about a comment) --- var/spack/repos/builtin/packages/zlib/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index c8251ce7a85..a20f6ff802b 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -31,12 +31,13 @@ class Zlib(AutotoolsPackage): data-compression library.""" homepage = "http://zlib.net" - url = "http://zlib.net/zlib-1.2.8.tar.gz" + url = "http://zlib.net/fossils/zlib-1.2.10.tar.gz" version('1.2.10', 'd9794246f853d15ce0fcbf79b9a3cf13') - version('1.2.8', '44d667c142d7cda120332623eab69f40', - url='http://pkgs.fedoraproject.org/repo/pkgs/mingw-zlib/zlib-1.2.8.tar.gz/44d667c142d7cda120332623eab69f40/zlib-1.2.8.tar.gz' - ) + # author had this to say about 1.2.9.... + # Due to the bug fixes, any installations of 1.2.9 should be immediately + # replaced with 1.2.10. + version('1.2.8', '44d667c142d7cda120332623eab69f40') variant('pic', default=True, description='Produce position-independent code (for shared libs)') From 3dd4a01a5e737a08a211f4e0f58da0a725e70818 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 4 Jan 2017 21:24:07 -0500 Subject: [PATCH 18/22] Standardize package names: lower-case, not Mixed_CASE (#2475) * Rename packages * Upcasing depends_on() in packages. * Downcased extends('r') * Fixed erroneously changed URL that had slipped through. * Fixed typo * Fixed link from documentation into package source code. * Fixed another doc problem. * Changed underscores to dashes in package names. * Added test to enforce lowercase, no-underscore naming convention. * Fix r-xgboost * Downcase more instances of 'R' in package auto-creation. * Fix test. * Converted unit test packages to use dashes not underscores * Downcase `r` in the docs. * Update module_file_support.rst Fix r->R for class R. --- lib/spack/docs/module_file_support.rst | 10 +++++----- lib/spack/spack/cmd/create.py | 6 +++--- lib/spack/spack/test/build_system_guess.py | 2 +- lib/spack/spack/test/concretize.py | 2 +- lib/spack/spack/test/install.py | 2 +- lib/spack/spack/test/mirror.py | 4 ++-- lib/spack/spack/test/package_sanity.py | 11 +++++++++++ lib/spack/spack/test/packages.py | 6 +++--- .../{direct_mpich => direct-mpich}/package.py | 0 .../{indirect_mpich => indirect-mpich}/package.py | 2 +- .../package.py | 0 .../package.py | 0 .../repos/builtin/packages/cleverleaf/package.py | 2 +- .../builtin/packages/{etsf_io => etsf-io}/package.py | 0 .../{fastx_toolkit => fastx-toolkit}/package.py | 0 .../{globus_toolkit => globus-toolkit}/package.py | 0 var/spack/repos/builtin/packages/gource/package.py | 2 +- .../packages/{ImageMagick => image-magick}/package.py | 2 +- var/spack/repos/builtin/packages/julia/package.py | 2 +- .../builtin/packages/{libNBC => libnbc}/package.py | 0 .../builtin/packages/{LuaJIT => lua-jit}/package.py | 2 +- .../builtin/packages/{Mitos => mitos}/package.py | 0 var/spack/repos/builtin/packages/octave/package.py | 4 ++-- var/spack/repos/builtin/packages/octopus/package.py | 4 ++-- .../{pmgr_collective => pmgr-collective}/package.py | 0 var/spack/repos/builtin/packages/py-csvkit/package.py | 2 +- .../repos/builtin/packages/py-matplotlib/package.py | 2 +- .../{py-SQLAlchemy => py-sqlalchemy}/package.py | 0 var/spack/repos/builtin/packages/r-abind/package.py | 2 +- .../repos/builtin/packages/r-assertthat/package.py | 2 +- .../repos/builtin/packages/r-base64enc/package.py | 2 +- var/spack/repos/builtin/packages/r-bh/package.py | 2 +- .../{r-BiocGenerics => r-biocgenerics}/package.py | 2 +- var/spack/repos/builtin/packages/r-bitops/package.py | 2 +- var/spack/repos/builtin/packages/r-boot/package.py | 2 +- var/spack/repos/builtin/packages/r-brew/package.py | 2 +- var/spack/repos/builtin/packages/r-c50/package.py | 2 +- var/spack/repos/builtin/packages/r-car/package.py | 2 +- var/spack/repos/builtin/packages/r-caret/package.py | 2 +- var/spack/repos/builtin/packages/r-catools/package.py | 2 +- var/spack/repos/builtin/packages/r-chron/package.py | 2 +- var/spack/repos/builtin/packages/r-class/package.py | 2 +- var/spack/repos/builtin/packages/r-cluster/package.py | 2 +- .../repos/builtin/packages/r-codetools/package.py | 2 +- .../repos/builtin/packages/r-colorspace/package.py | 2 +- var/spack/repos/builtin/packages/r-crayon/package.py | 2 +- .../repos/builtin/packages/r-cubature/package.py | 2 +- var/spack/repos/builtin/packages/r-curl/package.py | 2 +- .../repos/builtin/packages/r-datatable/package.py | 2 +- var/spack/repos/builtin/packages/r-dbi/package.py | 2 +- var/spack/repos/builtin/packages/r-deoptim/package.py | 2 +- .../repos/builtin/packages/r-devtools/package.py | 2 +- .../repos/builtin/packages/r-diagrammer/package.py | 2 +- .../repos/builtin/packages/r-dichromat/package.py | 2 +- var/spack/repos/builtin/packages/r-digest/package.py | 2 +- .../repos/builtin/packages/r-doparallel/package.py | 2 +- var/spack/repos/builtin/packages/r-dplyr/package.py | 4 ++-- var/spack/repos/builtin/packages/r-dt/package.py | 2 +- .../repos/builtin/packages/r-dygraphs/package.py | 2 +- var/spack/repos/builtin/packages/r-e1071/package.py | 2 +- .../repos/builtin/packages/r-evaluate/package.py | 2 +- .../repos/builtin/packages/r-filehash/package.py | 2 +- var/spack/repos/builtin/packages/r-foreach/package.py | 2 +- var/spack/repos/builtin/packages/r-foreign/package.py | 2 +- var/spack/repos/builtin/packages/r-formatr/package.py | 2 +- var/spack/repos/builtin/packages/r-formula/package.py | 2 +- var/spack/repos/builtin/packages/r-gdata/package.py | 2 +- .../repos/builtin/packages/r-geosphere/package.py | 2 +- var/spack/repos/builtin/packages/r-ggmap/package.py | 2 +- var/spack/repos/builtin/packages/r-ggplot2/package.py | 2 +- var/spack/repos/builtin/packages/r-ggvis/package.py | 2 +- var/spack/repos/builtin/packages/r-gistr/package.py | 2 +- var/spack/repos/builtin/packages/r-git2r/package.py | 2 +- var/spack/repos/builtin/packages/r-glmnet/package.py | 2 +- .../repos/builtin/packages/r-googlevis/package.py | 2 +- .../repos/builtin/packages/r-gridbase/package.py | 2 +- .../repos/builtin/packages/r-gridextra/package.py | 2 +- var/spack/repos/builtin/packages/r-gtable/package.py | 2 +- var/spack/repos/builtin/packages/r-gtools/package.py | 2 +- var/spack/repos/builtin/packages/r-hexbin/package.py | 2 +- var/spack/repos/builtin/packages/r-highr/package.py | 2 +- .../repos/builtin/packages/r-htmltools/package.py | 2 +- .../repos/builtin/packages/r-htmlwidgets/package.py | 2 +- var/spack/repos/builtin/packages/r-httpuv/package.py | 2 +- var/spack/repos/builtin/packages/r-httr/package.py | 4 ++-- var/spack/repos/builtin/packages/r-igraph/package.py | 2 +- .../repos/builtin/packages/r-influencer/package.py | 2 +- var/spack/repos/builtin/packages/r-inline/package.py | 2 +- .../repos/builtin/packages/r-irdisplay/package.py | 2 +- .../repos/builtin/packages/r-irkernel/package.py | 2 +- var/spack/repos/builtin/packages/r-irlba/package.py | 2 +- .../repos/builtin/packages/r-iterators/package.py | 2 +- var/spack/repos/builtin/packages/r-jpeg/package.py | 2 +- .../repos/builtin/packages/r-jsonlite/package.py | 2 +- var/spack/repos/builtin/packages/r-knitr/package.py | 2 +- .../repos/builtin/packages/r-labeling/package.py | 2 +- var/spack/repos/builtin/packages/r-lattice/package.py | 2 +- .../repos/builtin/packages/r-lazyeval/package.py | 2 +- var/spack/repos/builtin/packages/r-leaflet/package.py | 2 +- var/spack/repos/builtin/packages/r-lme4/package.py | 2 +- var/spack/repos/builtin/packages/r-lmtest/package.py | 2 +- .../repos/builtin/packages/r-lubridate/package.py | 2 +- var/spack/repos/builtin/packages/r-magic/package.py | 2 +- .../repos/builtin/packages/r-magrittr/package.py | 2 +- var/spack/repos/builtin/packages/r-mapproj/package.py | 2 +- var/spack/repos/builtin/packages/r-maps/package.py | 2 +- .../repos/builtin/packages/r-maptools/package.py | 2 +- .../repos/builtin/packages/r-markdown/package.py | 2 +- var/spack/repos/builtin/packages/r-mass/package.py | 2 +- var/spack/repos/builtin/packages/r-matrix/package.py | 2 +- .../repos/builtin/packages/r-matrixmodels/package.py | 2 +- var/spack/repos/builtin/packages/r-memoise/package.py | 2 +- var/spack/repos/builtin/packages/r-mgcv/package.py | 2 +- var/spack/repos/builtin/packages/r-mime/package.py | 2 +- var/spack/repos/builtin/packages/r-minqa/package.py | 2 +- .../repos/builtin/packages/r-multcomp/package.py | 2 +- var/spack/repos/builtin/packages/r-munsell/package.py | 2 +- var/spack/repos/builtin/packages/r-mvtnorm/package.py | 2 +- var/spack/repos/builtin/packages/r-ncdf4/package.py | 2 +- .../repos/builtin/packages/r-networkd3/package.py | 2 +- var/spack/repos/builtin/packages/r-nlme/package.py | 2 +- var/spack/repos/builtin/packages/r-nloptr/package.py | 2 +- var/spack/repos/builtin/packages/r-nmf/package.py | 2 +- var/spack/repos/builtin/packages/r-nnet/package.py | 2 +- var/spack/repos/builtin/packages/r-np/package.py | 2 +- var/spack/repos/builtin/packages/r-openssl/package.py | 2 +- var/spack/repos/builtin/packages/r-packrat/package.py | 2 +- .../repos/builtin/packages/r-partykit/package.py | 2 +- var/spack/repos/builtin/packages/r-pbdzmq/package.py | 4 ++-- .../repos/builtin/packages/r-pbkrtest/package.py | 2 +- .../repos/builtin/packages/r-pkgmaker/package.py | 2 +- var/spack/repos/builtin/packages/r-plotrix/package.py | 2 +- var/spack/repos/builtin/packages/r-plyr/package.py | 2 +- var/spack/repos/builtin/packages/r-png/package.py | 2 +- var/spack/repos/builtin/packages/r-praise/package.py | 2 +- var/spack/repos/builtin/packages/r-proto/package.py | 2 +- var/spack/repos/builtin/packages/r-pryr/package.py | 2 +- .../repos/builtin/packages/r-quantmod/package.py | 2 +- .../repos/builtin/packages/r-quantreg/package.py | 2 +- .../repos/builtin/packages/{r-R6 => r-r6}/package.py | 2 +- .../repos/builtin/packages/r-randomforest/package.py | 2 +- var/spack/repos/builtin/packages/r-raster/package.py | 2 +- var/spack/repos/builtin/packages/r-rbokeh/package.py | 2 +- .../repos/builtin/packages/r-rcolorbrewer/package.py | 2 +- var/spack/repos/builtin/packages/r-rcpp/package.py | 2 +- .../repos/builtin/packages/r-rcppeigen/package.py | 2 +- .../repos/builtin/packages/r-registry/package.py | 2 +- var/spack/repos/builtin/packages/r-repr/package.py | 2 +- .../repos/builtin/packages/r-reshape2/package.py | 2 +- .../repos/builtin/packages/r-rgooglemaps/package.py | 2 +- var/spack/repos/builtin/packages/r-rinside/package.py | 2 +- var/spack/repos/builtin/packages/r-rjava/package.py | 2 +- var/spack/repos/builtin/packages/r-rjson/package.py | 2 +- var/spack/repos/builtin/packages/r-rjsonio/package.py | 2 +- .../repos/builtin/packages/r-rmarkdown/package.py | 2 +- var/spack/repos/builtin/packages/r-rmysql/package.py | 2 +- .../repos/builtin/packages/r-rngtools/package.py | 2 +- var/spack/repos/builtin/packages/r-rodbc/package.py | 2 +- .../repos/builtin/packages/r-roxygen2/package.py | 2 +- .../repos/builtin/packages/r-rpostgresql/package.py | 2 +- var/spack/repos/builtin/packages/r-rsnns/package.py | 2 +- var/spack/repos/builtin/packages/r-rsqlite/package.py | 2 +- var/spack/repos/builtin/packages/r-rstan/package.py | 2 +- .../repos/builtin/packages/r-rstudioapi/package.py | 2 +- var/spack/repos/builtin/packages/r-rzmq/package.py | 2 +- .../repos/builtin/packages/r-sandwich/package.py | 2 +- var/spack/repos/builtin/packages/r-scales/package.py | 2 +- var/spack/repos/builtin/packages/r-shiny/package.py | 4 ++-- var/spack/repos/builtin/packages/r-sp/package.py | 2 +- var/spack/repos/builtin/packages/r-sparsem/package.py | 2 +- .../repos/builtin/packages/r-stanheaders/package.py | 2 +- var/spack/repos/builtin/packages/r-stringi/package.py | 2 +- var/spack/repos/builtin/packages/r-stringr/package.py | 2 +- var/spack/repos/builtin/packages/r-survey/package.py | 2 +- .../repos/builtin/packages/r-survival/package.py | 2 +- var/spack/repos/builtin/packages/r-tarifx/package.py | 2 +- var/spack/repos/builtin/packages/r-testit/package.py | 2 +- .../repos/builtin/packages/r-testthat/package.py | 4 ++-- var/spack/repos/builtin/packages/r-thdata/package.py | 2 +- var/spack/repos/builtin/packages/r-threejs/package.py | 2 +- var/spack/repos/builtin/packages/r-tibble/package.py | 2 +- var/spack/repos/builtin/packages/r-tidyr/package.py | 2 +- var/spack/repos/builtin/packages/r-ttr/package.py | 2 +- var/spack/repos/builtin/packages/r-uuid/package.py | 2 +- var/spack/repos/builtin/packages/r-vcd/package.py | 2 +- .../repos/builtin/packages/r-visnetwork/package.py | 2 +- var/spack/repos/builtin/packages/r-whisker/package.py | 2 +- var/spack/repos/builtin/packages/r-withr/package.py | 2 +- var/spack/repos/builtin/packages/r-xgboost/package.py | 2 +- .../repos/builtin/packages/r-xlconnect/package.py | 2 +- .../repos/builtin/packages/r-xlconnectjars/package.py | 2 +- var/spack/repos/builtin/packages/r-xlsx/package.py | 2 +- .../repos/builtin/packages/r-xlsxjars/package.py | 2 +- var/spack/repos/builtin/packages/r-xml/package.py | 2 +- var/spack/repos/builtin/packages/r-xtable/package.py | 2 +- var/spack/repos/builtin/packages/r-xts/package.py | 2 +- var/spack/repos/builtin/packages/r-yaml/package.py | 2 +- var/spack/repos/builtin/packages/r-zoo/package.py | 2 +- var/spack/repos/builtin/packages/{R => r}/package.py | 0 .../packages/{SAMRAI => samrai}/no-tool-build.patch | 0 .../builtin/packages/{SAMRAI => samrai}/package.py | 0 .../packages/{sdl2_image => sdl2-image}/package.py | 0 .../package.py | 0 .../package.py | 0 var/spack/repos/builtin/packages/uberftp/package.py | 2 +- 205 files changed, 215 insertions(+), 204 deletions(-) rename var/spack/repos/builtin.mock/packages/{direct_mpich => direct-mpich}/package.py (100%) rename var/spack/repos/builtin.mock/packages/{indirect_mpich => indirect-mpich}/package.py (98%) rename var/spack/repos/builtin.mock/packages/{simple_inheritance => simple-inheritance}/package.py (100%) rename var/spack/repos/builtin.mock/packages/{trivial_install_test_package => trivial-install-test-package}/package.py (100%) rename var/spack/repos/builtin/packages/{etsf_io => etsf-io}/package.py (100%) rename var/spack/repos/builtin/packages/{fastx_toolkit => fastx-toolkit}/package.py (100%) rename var/spack/repos/builtin/packages/{globus_toolkit => globus-toolkit}/package.py (100%) rename var/spack/repos/builtin/packages/{ImageMagick => image-magick}/package.py (98%) rename var/spack/repos/builtin/packages/{libNBC => libnbc}/package.py (100%) rename var/spack/repos/builtin/packages/{LuaJIT => lua-jit}/package.py (98%) rename var/spack/repos/builtin/packages/{Mitos => mitos}/package.py (100%) rename var/spack/repos/builtin/packages/{pmgr_collective => pmgr-collective}/package.py (100%) rename var/spack/repos/builtin/packages/{py-SQLAlchemy => py-sqlalchemy}/package.py (100%) rename var/spack/repos/builtin/packages/{r-BiocGenerics => r-biocgenerics}/package.py (99%) rename var/spack/repos/builtin/packages/{r-R6 => r-r6}/package.py (99%) rename var/spack/repos/builtin/packages/{R => r}/package.py (100%) rename var/spack/repos/builtin/packages/{SAMRAI => samrai}/no-tool-build.patch (100%) rename var/spack/repos/builtin/packages/{SAMRAI => samrai}/package.py (100%) rename var/spack/repos/builtin/packages/{sdl2_image => sdl2-image}/package.py (100%) rename var/spack/repos/builtin/packages/{the_platinum_searcher => the-platinum-searcher}/package.py (100%) rename var/spack/repos/builtin/packages/{the_silver_searcher => the-silver-searcher}/package.py (100%) diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst index 5db2ca02857..93c2ee33c65 100644 --- a/lib/spack/docs/module_file_support.rst +++ b/lib/spack/docs/module_file_support.rst @@ -353,9 +353,9 @@ and has similar effects on module file of dependees. Even in this case ``run_env`` must be filled with the desired list of environment modifications. .. note:: - The ``R`` package and callback APIs + The ``r`` package and callback APIs A typical example in which overriding both methods prove to be useful - is given by the ``R`` package. This package installs libraries and headers + is given by the ``r`` package. This package installs libraries and headers in non-standard locations and it is possible to prepend the appropriate directory to the corresponding environment variables: @@ -367,14 +367,14 @@ and has similar effects on module file of dependees. Even in this case with the following snippet: - .. literalinclude:: ../../../var/spack/repos/builtin/packages/R/package.py + .. literalinclude:: ../../../var/spack/repos/builtin/packages/r/package.py :pyobject: R.setup_environment - The ``R`` package also knows which environment variable should be modified + The ``r`` package also knows which environment variable should be modified to make language extensions provided by other packages available, and modifies it appropriately in the override of the second method: - .. literalinclude:: ../../../var/spack/repos/builtin/packages/R/package.py + .. literalinclude:: ../../../var/spack/repos/builtin/packages/r/package.py :lines: 128-129,146-151 .. _modules-yaml: diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index bee75cec4b3..f1a5bc5cdb7 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -215,7 +215,7 @@ def __init__(self, name, *args): class RGuess(DefaultGuess): """Provides appropriate overrides for R extensions""" dependencies = """\ - extends('R') + extends('r') # FIXME: Add additional dependencies if required. # depends_on('r-foo', type=nolink)""" @@ -283,7 +283,7 @@ class BuildSystemGuesser(object): 'scons': SconsGuess, 'bazel': BazelGuess, 'python': PythonGuess, - 'R': RGuess, + 'r': RGuess, 'octave': OctaveGuess } @@ -306,7 +306,7 @@ def __call__(self, stage, url): (r'/CMakeLists.txt$', 'cmake'), (r'/SConstruct$', 'scons'), (r'/setup.py$', 'python'), - (r'/NAMESPACE$', 'R'), + (r'/NAMESPACE$', 'r'), (r'/WORKSPACE$', 'bazel') ] diff --git a/lib/spack/spack/test/build_system_guess.py b/lib/spack/spack/test/build_system_guess.py index 97a9d67b47f..86c1c9da135 100644 --- a/lib/spack/spack/test/build_system_guess.py +++ b/lib/spack/spack/test/build_system_guess.py @@ -36,7 +36,7 @@ ('CMakeLists.txt', 'cmake'), ('SConstruct', 'scons'), ('setup.py', 'python'), - ('NAMESPACE', 'R'), + ('NAMESPACE', 'r'), ('foobar', 'unknown') ] ) diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 3cc5c70a5f7..b7cad503a33 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -240,7 +240,7 @@ def test_virtual_is_fully_expanded_for_mpileaks( assert 'mpi' in spec def test_my_dep_depends_on_provider_of_my_virtual_dep(self): - spec = Spec('indirect_mpich') + spec = Spec('indirect-mpich') spec.normalize() spec.concretize() diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index d2ebf8dfb45..f10c3a37e99 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -60,7 +60,7 @@ def fake_fetchify(url, pkg): @pytest.mark.usefixtures('install_mockery') def test_install_and_uninstall(mock_archive): # Get a basic concrete spec for the trivial install package. - spec = Spec('trivial_install_test_package') + spec = Spec('trivial-install-test-package') spec.concretize() assert spec.concrete diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index 13219ef878a..e5e60e3045c 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -129,7 +129,7 @@ def test_hg_mirror(self, mock_hg_repository): repos.clear() def test_url_mirror(self, mock_archive): - set_up_package('trivial_install_test_package', mock_archive, 'url') + set_up_package('trivial-install-test-package', mock_archive, 'url') check_mirror() repos.clear() @@ -143,6 +143,6 @@ def test_all_mirror( set_up_package('git-test', mock_git_repository, 'git') set_up_package('svn-test', mock_svn_repository, 'svn') set_up_package('hg-test', mock_hg_repository, 'hg') - set_up_package('trivial_install_test_package', mock_archive, 'url') + set_up_package('trivial-install-test-package', mock_archive, 'url') check_mirror() repos.clear() diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index c3c3923855c..c75d7cdcc70 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -26,6 +26,7 @@ This test does sanity checks on Spack's builtin package database. """ import unittest +import re import spack from spack.repository import RepoPath @@ -57,3 +58,13 @@ def test_url_versions(self): # If there is a url for the version check it. v_url = pkg.url_for_version(v) self.assertEqual(vattrs['url'], v_url) + + def test_all_versions_are_lowercase(self): + """Spack package names must be lowercase, and use `-` instead of `_`. + """ + errors = [] + for name in spack.repo.all_package_names(): + if re.search(r'[_A-Z]', name): + errors.append(name) + + self.assertEqual([], errors) diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 39bbe4a9541..6ae8a33a247 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -83,7 +83,7 @@ def test_import_package_as(builtin_mock): def test_inheritance_of_diretives(): - p = spack.repo.get('simple_inheritance') + p = spack.repo.get('simple-inheritance') # Check dictionaries that should have been filled by directives assert len(p.dependencies) == 3 @@ -93,14 +93,14 @@ def test_inheritance_of_diretives(): assert len(p.provided) == 2 # Check that Spec instantiation behaves as we expect - s = Spec('simple_inheritance') + s = Spec('simple-inheritance') s.concretize() assert '^cmake' in s assert '^openblas' in s assert '+openblas' in s assert 'mpi' in s - s = Spec('simple_inheritance~openblas') + s = Spec('simple-inheritance~openblas') s.concretize() assert '^cmake' in s assert '^openblas' not in s diff --git a/var/spack/repos/builtin.mock/packages/direct_mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py similarity index 100% rename from var/spack/repos/builtin.mock/packages/direct_mpich/package.py rename to var/spack/repos/builtin.mock/packages/direct-mpich/package.py diff --git a/var/spack/repos/builtin.mock/packages/indirect_mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py similarity index 98% rename from var/spack/repos/builtin.mock/packages/indirect_mpich/package.py rename to var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index bbbf196129b..77b8022b1c4 100644 --- a/var/spack/repos/builtin.mock/packages/indirect_mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -36,7 +36,7 @@ class IndirectMpich(Package): version(1.0, 'foobarbaz') depends_on('mpi') - depends_on('direct_mpich') + depends_on('direct-mpich') def install(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/simple_inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py similarity index 100% rename from var/spack/repos/builtin.mock/packages/simple_inheritance/package.py rename to var/spack/repos/builtin.mock/packages/simple-inheritance/package.py diff --git a/var/spack/repos/builtin.mock/packages/trivial_install_test_package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py similarity index 100% rename from var/spack/repos/builtin.mock/packages/trivial_install_test_package/package.py rename to var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index 61e6dca4333..3bd1f0b5d06 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -40,7 +40,7 @@ class Cleverleaf(Package): version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop') - depends_on("SAMRAI@3.8.0:") + depends_on("samrai@3.8.0:") depends_on("hdf5+mpi") depends_on("boost") depends_on('cmake', type='build') diff --git a/var/spack/repos/builtin/packages/etsf_io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py similarity index 100% rename from var/spack/repos/builtin/packages/etsf_io/package.py rename to var/spack/repos/builtin/packages/etsf-io/package.py diff --git a/var/spack/repos/builtin/packages/fastx_toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py similarity index 100% rename from var/spack/repos/builtin/packages/fastx_toolkit/package.py rename to var/spack/repos/builtin/packages/fastx-toolkit/package.py diff --git a/var/spack/repos/builtin/packages/globus_toolkit/package.py b/var/spack/repos/builtin/packages/globus-toolkit/package.py similarity index 100% rename from var/spack/repos/builtin/packages/globus_toolkit/package.py rename to var/spack/repos/builtin/packages/globus-toolkit/package.py diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index d8ae8b6506d..dda00420a38 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -47,7 +47,7 @@ class Gource(Package): depends_on('libpng') depends_on('pcre') depends_on('sdl2') - depends_on('sdl2_image') + depends_on('sdl2-image') def install(self, spec, prefix): make_args = ['--prefix=%s' % prefix, diff --git a/var/spack/repos/builtin/packages/ImageMagick/package.py b/var/spack/repos/builtin/packages/image-magick/package.py similarity index 98% rename from var/spack/repos/builtin/packages/ImageMagick/package.py rename to var/spack/repos/builtin/packages/image-magick/package.py index 0b474285ce5..9efb0cd3686 100644 --- a/var/spack/repos/builtin/packages/ImageMagick/package.py +++ b/var/spack/repos/builtin/packages/image-magick/package.py @@ -25,7 +25,7 @@ from spack import * -class Imagemagick(Package): +class ImageMagick(Package): """ImageMagick is a software suite to create, edit, compose, or convert bitmap images.""" diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 3725724ee34..89db570b81e 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -222,7 +222,7 @@ def install(self, spec, prefix): if "+plot" in spec: julia("-e", 'Pkg.add("PyPlot"); using PyPlot') julia("-e", 'Pkg.add("Colors"); using Colors') - # These require maybe Gtk and ImageMagick + # These require maybe gtk and image-magick julia("-e", 'Pkg.add("Plots"); using Plots') julia("-e", 'Pkg.add("PlotRecipes"); using PlotRecipes') julia("-e", 'Pkg.add("UnicodePlots"); using UnicodePlots') diff --git a/var/spack/repos/builtin/packages/libNBC/package.py b/var/spack/repos/builtin/packages/libnbc/package.py similarity index 100% rename from var/spack/repos/builtin/packages/libNBC/package.py rename to var/spack/repos/builtin/packages/libnbc/package.py diff --git a/var/spack/repos/builtin/packages/LuaJIT/package.py b/var/spack/repos/builtin/packages/lua-jit/package.py similarity index 98% rename from var/spack/repos/builtin/packages/LuaJIT/package.py rename to var/spack/repos/builtin/packages/lua-jit/package.py index 244c63c8fb6..5f7de8ff06b 100644 --- a/var/spack/repos/builtin/packages/LuaJIT/package.py +++ b/var/spack/repos/builtin/packages/lua-jit/package.py @@ -26,7 +26,7 @@ from spack import * -class Luajit(Package): +class LuaJit(Package): """Flast flexible JITed lua""" homepage = "http://www.luajit.org" url = "http://luajit.org/download/LuaJIT-2.0.4.tar.gz" diff --git a/var/spack/repos/builtin/packages/Mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py similarity index 100% rename from var/spack/repos/builtin/packages/Mitos/package.py rename to var/spack/repos/builtin/packages/mitos/package.py diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index aa521899e5c..df144c8bbbd 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -85,7 +85,7 @@ class Octave(Package): depends_on('glpk', when='+glpk') depends_on('gl2ps', when='+gl2ps') depends_on('gnuplot', when='+gnuplot') - depends_on('ImageMagick', when='+magick') + depends_on('image-magick', when='+magick') depends_on('hdf5', when='+hdf5') depends_on('jdk', when='+jdk') depends_on('llvm', when='+llvm') @@ -162,7 +162,7 @@ def install(self, spec, prefix): if '+magick' in spec: config_args.append("--with-magick=%s" - % spec['ImageMagick'].prefix.lib) + % spec['image-magick'].prefix.lib) if '+hdf5' in spec: config_args.extend([ diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index adb760f06d7..a100f7896a2 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -42,8 +42,8 @@ class Octopus(Package): depends_on('fftw+mpi') # optional dependencies: - # TODO: scalapack, metis, parmetis, netcdf, etsf_io, SPARSKIT, ARPACK, - # FEAST, Libfm, PFFT, ISF, PNFFT + # TODO: scalapack, metis, parmetis, netcdf, etsf-io, sparskit, arpack, + # feast, libfm, pfft, isf, pnfft def install(self, spec, prefix): lapack = spec['lapack'].lapack_libs diff --git a/var/spack/repos/builtin/packages/pmgr_collective/package.py b/var/spack/repos/builtin/packages/pmgr-collective/package.py similarity index 100% rename from var/spack/repos/builtin/packages/pmgr_collective/package.py rename to var/spack/repos/builtin/packages/pmgr-collective/package.py diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 5b0394a1381..904f138d12b 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -39,7 +39,7 @@ class PyCsvkit(Package): depends_on('py-dateutil', type=nolink) depends_on('py-dbf', type=nolink) depends_on('py-xlrd', type=nolink) - depends_on('py-SQLAlchemy', type=nolink) + depends_on('py-sqlalchemy', type=nolink) depends_on('py-six', type=nolink) depends_on('py-openpyxl', type=nolink) diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 38859ebe157..8661a3f7215 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -76,7 +76,7 @@ class PyMatplotlib(Package): # --------- Optional external programs # ffmpeg/avconv or mencoder - depends_on('ImageMagick', when='+animation') + depends_on('image-magick', when='+animation') # --------- Optional dependencies depends_on('pkg-config', type='build') # why not... diff --git a/var/spack/repos/builtin/packages/py-SQLAlchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py similarity index 100% rename from var/spack/repos/builtin/packages/py-SQLAlchemy/package.py rename to var/spack/repos/builtin/packages/py-sqlalchemy/package.py diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 96f623a0963..f691ae13ea6 100644 --- a/var/spack/repos/builtin/packages/r-abind/package.py +++ b/var/spack/repos/builtin/packages/r-abind/package.py @@ -37,7 +37,7 @@ class RAbind(Package): version('1.4-3', '10fcf80c677b991bf263d38be35a1fc5') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-assertthat/package.py b/var/spack/repos/builtin/packages/r-assertthat/package.py index 4070b6fe8d7..fe0c400aaa2 100644 --- a/var/spack/repos/builtin/packages/r-assertthat/package.py +++ b/var/spack/repos/builtin/packages/r-assertthat/package.py @@ -36,7 +36,7 @@ class RAssertthat(Package): version('0.1', '59f9d7f7c00077ea54d763b78eeb5798') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-base64enc/package.py b/var/spack/repos/builtin/packages/r-base64enc/package.py index 4c5d14a90f4..2289f40e4f9 100644 --- a/var/spack/repos/builtin/packages/r-base64enc/package.py +++ b/var/spack/repos/builtin/packages/r-base64enc/package.py @@ -35,7 +35,7 @@ class RBase64enc(Package): version('0.1-3', '0f476dacdd11a3e0ad56d13f5bc2f190') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-bh/package.py b/var/spack/repos/builtin/packages/r-bh/package.py index a0f30b779f3..4b2b4ca11da 100644 --- a/var/spack/repos/builtin/packages/r-bh/package.py +++ b/var/spack/repos/builtin/packages/r-bh/package.py @@ -47,7 +47,7 @@ class RBh(Package): version('1.60.0-2', 'b50fdc85285da05add4e9da664a2d551') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-BiocGenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py similarity index 99% rename from var/spack/repos/builtin/packages/r-BiocGenerics/package.py rename to var/spack/repos/builtin/packages/r-biocgenerics/package.py index 5a6ce72a4bd..ce933565412 100644 --- a/var/spack/repos/builtin/packages/r-BiocGenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -36,7 +36,7 @@ class RBiocgenerics(Package): git='https://github.com/Bioconductor-mirror/BiocGenerics.git', branch='release-3.2') - extends('R') + extends('r') def validate(self, spec): """ diff --git a/var/spack/repos/builtin/packages/r-bitops/package.py b/var/spack/repos/builtin/packages/r-bitops/package.py index 6399202abab..7421ea46582 100644 --- a/var/spack/repos/builtin/packages/r-bitops/package.py +++ b/var/spack/repos/builtin/packages/r-bitops/package.py @@ -35,7 +35,7 @@ class RBitops(Package): version('1.0-6', 'fba16485a51b1ccd354abde5816b6bdd') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-boot/package.py b/var/spack/repos/builtin/packages/r-boot/package.py index 1f2f541fec6..0b78c202b87 100644 --- a/var/spack/repos/builtin/packages/r-boot/package.py +++ b/var/spack/repos/builtin/packages/r-boot/package.py @@ -36,7 +36,7 @@ class RBoot(Package): version('1.3-18', '711dd58af14e1027eb8377d9202e9b6f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-brew/package.py b/var/spack/repos/builtin/packages/r-brew/package.py index 111606d5769..10bbccf1de1 100644 --- a/var/spack/repos/builtin/packages/r-brew/package.py +++ b/var/spack/repos/builtin/packages/r-brew/package.py @@ -36,7 +36,7 @@ class RBrew(Package): version('1.0-6', '4aaca5e6ec145e0fc0fe6375ce1f3806') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py index e9b582b52ff..6ce917521d6 100644 --- a/var/spack/repos/builtin/packages/r-c50/package.py +++ b/var/spack/repos/builtin/packages/r-c50/package.py @@ -35,7 +35,7 @@ class RC50(Package): version('0.1.0-24', '42631e65c5c579532cc6edf5ea175949') - extends('R') + extends('r') depends_on('r-partykit', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py index f4a3824983f..fa2cc407b88 100644 --- a/var/spack/repos/builtin/packages/r-car/package.py +++ b/var/spack/repos/builtin/packages/r-car/package.py @@ -35,7 +35,7 @@ class RCar(Package): version('2.1-2', '0f78ad74ef7130126d319acec23951a0') - extends('R') + extends('r') depends_on('r-mass', type=nolink) depends_on('r-mgcv', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py index 460526c7d32..bfc2db5780d 100644 --- a/var/spack/repos/builtin/packages/r-caret/package.py +++ b/var/spack/repos/builtin/packages/r-caret/package.py @@ -35,7 +35,7 @@ class RCaret(Package): version('6.0-70', '202d7abb6a679af716ea69fb2573f108') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) depends_on('r-ggplot2', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py index adc64e269cf..b2daa14c6bb 100644 --- a/var/spack/repos/builtin/packages/r-catools/package.py +++ b/var/spack/repos/builtin/packages/r-catools/package.py @@ -38,7 +38,7 @@ class RCatools(Package): version('1.17.1', '5c872bbc78b177b306f36709deb44498') - extends('R') + extends('r') depends_on('r-bitops', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-chron/package.py b/var/spack/repos/builtin/packages/r-chron/package.py index 9cd9d76e9e6..9393ac416f2 100644 --- a/var/spack/repos/builtin/packages/r-chron/package.py +++ b/var/spack/repos/builtin/packages/r-chron/package.py @@ -34,7 +34,7 @@ class RChron(Package): version('2.3-47', 'b8890cdc5f2337f8fd775b0becdcdd1f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py index f541ea36113..627cce808c6 100644 --- a/var/spack/repos/builtin/packages/r-class/package.py +++ b/var/spack/repos/builtin/packages/r-class/package.py @@ -35,7 +35,7 @@ class RClass(Package): version('7.3-14', '6a21dd206fe4ea29c55faeb65fb2b71e') - extends('R') + extends('r') depends_on('r-mass', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index 0fdf2ce5de1..2deb0533220 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -36,7 +36,7 @@ class RCluster(Package): version('2.0.4', 'bb4deceaafb1c42bb1278d5d0dc11e59') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-codetools/package.py b/var/spack/repos/builtin/packages/r-codetools/package.py index bea2f78c829..206e4c09a55 100644 --- a/var/spack/repos/builtin/packages/r-codetools/package.py +++ b/var/spack/repos/builtin/packages/r-codetools/package.py @@ -34,7 +34,7 @@ class RCodetools(Package): version('0.2-14', '7ec41d4f8bd6ba85facc8c5e6adc1f4d') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-colorspace/package.py b/var/spack/repos/builtin/packages/r-colorspace/package.py index a7622cad951..48c50191acb 100644 --- a/var/spack/repos/builtin/packages/r-colorspace/package.py +++ b/var/spack/repos/builtin/packages/r-colorspace/package.py @@ -37,7 +37,7 @@ class RColorspace(Package): version('1.2-6', 'a30191e9caf66f77ff4e99c062e9dce1') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-crayon/package.py b/var/spack/repos/builtin/packages/r-crayon/package.py index 1e0befbca91..f0578a7c814 100644 --- a/var/spack/repos/builtin/packages/r-crayon/package.py +++ b/var/spack/repos/builtin/packages/r-crayon/package.py @@ -38,7 +38,7 @@ class RCrayon(Package): version('1.3.2', 'fe29c6204d2d6ff4c2f9d107a03d0cb9') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-cubature/package.py b/var/spack/repos/builtin/packages/r-cubature/package.py index 1d8f837922b..4ae21947ae4 100644 --- a/var/spack/repos/builtin/packages/r-cubature/package.py +++ b/var/spack/repos/builtin/packages/r-cubature/package.py @@ -34,7 +34,7 @@ class RCubature(Package): version('1.1-2', '5617e1d82baa803a3814d92461da45c9') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-curl/package.py b/var/spack/repos/builtin/packages/r-curl/package.py index 24c0eadb2d5..71f28d46097 100644 --- a/var/spack/repos/builtin/packages/r-curl/package.py +++ b/var/spack/repos/builtin/packages/r-curl/package.py @@ -43,7 +43,7 @@ class RCurl(Package): version('1.0', '93d34926d6071e1fba7e728b482f0dd9') version('0.9.7', 'a101f7de948cb828fef571c730f39217') - extends('R') + extends('r') depends_on('curl') diff --git a/var/spack/repos/builtin/packages/r-datatable/package.py b/var/spack/repos/builtin/packages/r-datatable/package.py index fb0b2f1053b..f0d2247d36e 100644 --- a/var/spack/repos/builtin/packages/r-datatable/package.py +++ b/var/spack/repos/builtin/packages/r-datatable/package.py @@ -37,7 +37,7 @@ class RDatatable(Package): version('1.9.6', 'b1c0c7cce490bdf42ab288541cc55372') - extends('R') + extends('r') depends_on('r-chron', type='nolink') diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index a1e06d51002..b0146ffb27d 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -36,7 +36,7 @@ class RDbi(Package): version('0.4-1', 'c7ee8f1c5037c2284e99c62698d0f087') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-deoptim/package.py b/var/spack/repos/builtin/packages/r-deoptim/package.py index 16aacccd0e3..9f5302ce16c 100644 --- a/var/spack/repos/builtin/packages/r-deoptim/package.py +++ b/var/spack/repos/builtin/packages/r-deoptim/package.py @@ -36,7 +36,7 @@ class RDeoptim(Package): version('2.2-3', 'ed406e6790f8f1568aa9bec159f80326') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 75506dd257d..01adc6e327f 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -34,7 +34,7 @@ class RDevtools(Package): version('1.11.1', '242672ee27d24dddcbdaac88c586b6c2') - extends('R') + extends('r') depends_on('r-httr', type=nolink) depends_on('r-memoise', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py index 7ff3b8548b6..420e4d803a8 100644 --- a/var/spack/repos/builtin/packages/r-diagrammer/package.py +++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py @@ -34,7 +34,7 @@ class RDiagrammer(Package): version('0.8.4', '9ee295c744f5d4ba9a84289ca7bdaf1a') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-igraph', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dichromat/package.py b/var/spack/repos/builtin/packages/r-dichromat/package.py index 663e5295af7..240bfc3be7c 100644 --- a/var/spack/repos/builtin/packages/r-dichromat/package.py +++ b/var/spack/repos/builtin/packages/r-dichromat/package.py @@ -35,7 +35,7 @@ class RDichromat(Package): version('2.0-0', '84e194ac95a69763d740947a7ee346a6') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-digest/package.py b/var/spack/repos/builtin/packages/r-digest/package.py index 1d11afb139e..f573638b1b5 100644 --- a/var/spack/repos/builtin/packages/r-digest/package.py +++ b/var/spack/repos/builtin/packages/r-digest/package.py @@ -49,7 +49,7 @@ class RDigest(Package): version('0.6.9', '48048ce6c466bdb124716e45ba4a0e83') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py index 7cebfd9e58e..c78624d6d83 100644 --- a/var/spack/repos/builtin/packages/r-doparallel/package.py +++ b/var/spack/repos/builtin/packages/r-doparallel/package.py @@ -35,7 +35,7 @@ class RDoparallel(Package): version('1.0.10', 'd9fbde8f315d98d055483ee3493c9b43') - extends('R') + extends('r') depends_on('r-foreach', type=nolink) depends_on('r-iterators', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index ded76512783..2e0f43b7269 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -35,10 +35,10 @@ class RDplyr(Package): version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef') - extends('R') + extends('r') depends_on('r-assertthat', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) depends_on('r-rcpp', type=nolink) depends_on('r-tibble', type=nolink) depends_on('r-magrittr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py index f134ee8913f..2612ce3a570 100644 --- a/var/spack/repos/builtin/packages/r-dt/package.py +++ b/var/spack/repos/builtin/packages/r-dt/package.py @@ -36,7 +36,7 @@ class RDt(Package): version('0.1', '5c8df984921fa484784ec4b8a4fb6f3c') - extends('R') + extends('r') depends_on('r-htmltools', type=nolink) depends_on('r-htmlwidgets', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py index 9b01d7aa180..94441dd6d5f 100644 --- a/var/spack/repos/builtin/packages/r-dygraphs/package.py +++ b/var/spack/repos/builtin/packages/r-dygraphs/package.py @@ -38,7 +38,7 @@ class RDygraphs(Package): version('0.9', '7f0ce4312bcd3f0a58b8c03b2772f833') - extends('R') + extends('r') depends_on('r-magrittr', type=nolink) depends_on('r-htmlwidgets', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py index c2e71664037..ef29cc33186 100644 --- a/var/spack/repos/builtin/packages/r-e1071/package.py +++ b/var/spack/repos/builtin/packages/r-e1071/package.py @@ -36,7 +36,7 @@ class RE1071(Package): version('1.6-7', 'd109a7e3dd0c905d420e327a9a921f5a') - extends('R') + extends('r') depends_on('r-class', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py index 5583c0ed68f..c9a980a2c51 100644 --- a/var/spack/repos/builtin/packages/r-evaluate/package.py +++ b/var/spack/repos/builtin/packages/r-evaluate/package.py @@ -37,7 +37,7 @@ class REvaluate(Package): version('0.9', '877d89ce8a9ef7f403b1089ca1021775') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-filehash/package.py b/var/spack/repos/builtin/packages/r-filehash/package.py index a09b458eaf2..2b92013db81 100644 --- a/var/spack/repos/builtin/packages/r-filehash/package.py +++ b/var/spack/repos/builtin/packages/r-filehash/package.py @@ -42,7 +42,7 @@ class RFilehash(Package): version('2.3', '01fffafe09b148ccadc9814c103bdc2f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py index 2a7324ae993..7f2b1e63a87 100644 --- a/var/spack/repos/builtin/packages/r-foreach/package.py +++ b/var/spack/repos/builtin/packages/r-foreach/package.py @@ -40,7 +40,7 @@ class RForeach(Package): version('1.4.3', 'ef45768126661b259f9b8994462c49a0') - extends('R') + extends('r') depends_on('r-codetools', type=nolink) depends_on('r-iterators', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-foreign/package.py b/var/spack/repos/builtin/packages/r-foreign/package.py index df38fc56803..a248518f586 100644 --- a/var/spack/repos/builtin/packages/r-foreign/package.py +++ b/var/spack/repos/builtin/packages/r-foreign/package.py @@ -36,7 +36,7 @@ class RForeign(Package): version('0.8-66', 'ff12190f4631dca31e30ca786c2c8f62') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py index 4c92e1f34be..3935ee90006 100644 --- a/var/spack/repos/builtin/packages/r-formatr/package.py +++ b/var/spack/repos/builtin/packages/r-formatr/package.py @@ -39,7 +39,7 @@ class RFormatr(Package): version('1.4', '98b9b64b2785b35f9df403e1aab6c73c') - extends('R') + extends('r') depends_on('r-codetools', type=nolink) depends_on('r-shiny', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-formula/package.py b/var/spack/repos/builtin/packages/r-formula/package.py index 3c4347ee500..cd5b0b41e93 100644 --- a/var/spack/repos/builtin/packages/r-formula/package.py +++ b/var/spack/repos/builtin/packages/r-formula/package.py @@ -36,7 +36,7 @@ class RFormula(Package): version('1.2-1', '2afb31e637cecd0c1106317aca1e4849') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py index 0a09a1145bd..2897ad922d0 100644 --- a/var/spack/repos/builtin/packages/r-gdata/package.py +++ b/var/spack/repos/builtin/packages/r-gdata/package.py @@ -50,7 +50,7 @@ class RGdata(Package): version('2.17.0', 'c716b663b9dc16ad8cafe6acc781a75f') - extends('R') + extends('r') depends_on('r-gtools', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py index 21ae07fd41f..dec9a3939e9 100644 --- a/var/spack/repos/builtin/packages/r-geosphere/package.py +++ b/var/spack/repos/builtin/packages/r-geosphere/package.py @@ -36,7 +36,7 @@ class RGeosphere(Package): version('1.5-5', '28efb7a8e266c7f076cdbcf642455f3e') - extends('R') + extends('r') depends_on('r-sp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py index 2dfca19b51d..d6c6d53c210 100644 --- a/var/spack/repos/builtin/packages/r-ggmap/package.py +++ b/var/spack/repos/builtin/packages/r-ggmap/package.py @@ -37,7 +37,7 @@ class RGgmap(Package): version('2.6.1', '25ad414a3a1c6d59a227a9f22601211a') - extends('R') + extends('r') depends_on('r-ggplot2', type=nolink) depends_on('r-proto', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py index a8cf21930fe..c0c37d91644 100644 --- a/var/spack/repos/builtin/packages/r-ggplot2/package.py +++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py @@ -40,7 +40,7 @@ class RGgplot2(Package): version('2.1.0', '771928cfb97c649c720423deb3ec7fd3') - extends('R') + extends('r') depends_on('r-digest', type=nolink) depends_on('r-gtable', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index 29b2069ae9c..9c6720b4aa8 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -36,7 +36,7 @@ class RGgvis(Package): version('0.4.2', '039f45e5c7f1e0652779163d7d99f922') - extends('R') + extends('r') depends_on('r-assertthat', type=nolink) depends_on('r-jsonlite', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py index 646299b97b9..08910b0fe12 100644 --- a/var/spack/repos/builtin/packages/r-gistr/package.py +++ b/var/spack/repos/builtin/packages/r-gistr/package.py @@ -40,7 +40,7 @@ class RGistr(Package): version('0.3.6', '49d548cb3eca0e66711aece37757a2c0') - extends('R') + extends('r') depends_on('r-jsonlite', type=nolink) depends_on('r-httr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 1f08379d6ed..1387581306f 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -36,7 +36,7 @@ class RGit2r(Package): version('0.15.0', '57658b3298f9b9aadc0dd77b4ef6a1e1') - extends('R') + extends('r') depends_on('zlib') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index af6e1d1b637..895c066e57d 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -39,7 +39,7 @@ class RGlmnet(Package): version('2.0-5', '049b18caa29529614cd684db3beaec2a') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-foreach', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py index bcb7caa0fbd..54e1d397a6e 100644 --- a/var/spack/repos/builtin/packages/r-googlevis/package.py +++ b/var/spack/repos/builtin/packages/r-googlevis/package.py @@ -38,7 +38,7 @@ class RGooglevis(Package): version('0.6.0', 'ec36fd2a6884ddc7baa894007d0d0468') - extends('R') + extends('r') depends_on('r-jsonlite', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-gridbase/package.py b/var/spack/repos/builtin/packages/r-gridbase/package.py index a2f55b44703..1afc1af3acb 100644 --- a/var/spack/repos/builtin/packages/r-gridbase/package.py +++ b/var/spack/repos/builtin/packages/r-gridbase/package.py @@ -34,7 +34,7 @@ class RGridbase(Package): version('0.4-7', '6d5064a85f5c966a92ee468ae44c5f1f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py index 537426d42f5..582cd39b851 100644 --- a/var/spack/repos/builtin/packages/r-gridextra/package.py +++ b/var/spack/repos/builtin/packages/r-gridextra/package.py @@ -35,7 +35,7 @@ class RGridextra(Package): version('2.2.1', '7076c2122d387c7ef3add69a1c4fc1b2') - extends('R') + extends('r') depends_on('r-gtable', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-gtable/package.py b/var/spack/repos/builtin/packages/r-gtable/package.py index 74dee0b3d54..a633e8273f0 100644 --- a/var/spack/repos/builtin/packages/r-gtable/package.py +++ b/var/spack/repos/builtin/packages/r-gtable/package.py @@ -34,7 +34,7 @@ class RGtable(Package): version('0.2.0', '124090ae40b2dd3170ae11180e0d4cab') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-gtools/package.py b/var/spack/repos/builtin/packages/r-gtools/package.py index 367bb30f870..6676ec1be3f 100644 --- a/var/spack/repos/builtin/packages/r-gtools/package.py +++ b/var/spack/repos/builtin/packages/r-gtools/package.py @@ -53,7 +53,7 @@ class RGtools(Package): version('3.5.0', '45f8800c0336d35046641fbacc56bdbb') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py index 5d2972ff96d..b9a7e612c33 100644 --- a/var/spack/repos/builtin/packages/r-hexbin/package.py +++ b/var/spack/repos/builtin/packages/r-hexbin/package.py @@ -36,7 +36,7 @@ class RHexbin(Package): version('1.27.1', '7f380390c6511e97df10a810a3b3bb7c') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-highr/package.py b/var/spack/repos/builtin/packages/r-highr/package.py index f977a7302f4..e9fb7c34d53 100644 --- a/var/spack/repos/builtin/packages/r-highr/package.py +++ b/var/spack/repos/builtin/packages/r-highr/package.py @@ -37,7 +37,7 @@ class RHighr(Package): version('0.6', 'bf47388c5f57dc61962362fb7e1d8b16') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index 21cdbe9184d..aa776f3929b 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -34,7 +34,7 @@ class RHtmltools(Package): version('0.3.5', '5f001aff4a39e329f7342dcec5139724') - extends('R') + extends('r') depends_on('r-digest', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py index 8090776f06f..615936c5853 100644 --- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py +++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py @@ -36,7 +36,7 @@ class RHtmlwidgets(Package): version('0.6', '7fa522d2eda97593978021bda9670c0e') - extends('R') + extends('r') depends_on('r-htmltools', type=nolink) depends_on('r-jsonlite', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 57025d3a3cc..c353dacc5f5 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -40,7 +40,7 @@ class RHttpuv(Package): version('1.3.3', 'c78ae068cf59e949b9791be987bb4489') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py index 227594fc0d5..bf7ce4dccbb 100644 --- a/var/spack/repos/builtin/packages/r-httr/package.py +++ b/var/spack/repos/builtin/packages/r-httr/package.py @@ -36,13 +36,13 @@ class RHttr(Package): version('1.1.0', '5ffbbc5c2529e49f00aaa521a2b35600') - extends('R') + extends('r') depends_on('r-jsonlite', type=nolink) depends_on('r-mime', type=nolink) depends_on('r-curl', type=nolink) depends_on('r-openssl', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index 37925d4e028..8c1a6252ba7 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -36,7 +36,7 @@ class RIgraph(Package): version('1.0.1', 'ea33495e49adf4a331e4ba60ba559065') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-magrittr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py index dd525daf2b9..8102954daad 100644 --- a/var/spack/repos/builtin/packages/r-influencer/package.py +++ b/var/spack/repos/builtin/packages/r-influencer/package.py @@ -40,7 +40,7 @@ class RInfluencer(Package): version('0.1.0', '6c8b6decd78c341364b5811fb3050ba5') - extends('R') + extends('r') depends_on('r-igraph', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-inline/package.py b/var/spack/repos/builtin/packages/r-inline/package.py index 35eb8ca76fd..0694af6d34a 100644 --- a/var/spack/repos/builtin/packages/r-inline/package.py +++ b/var/spack/repos/builtin/packages/r-inline/package.py @@ -36,7 +36,7 @@ class RInline(Package): version('0.3.14', '9fe304a6ebf0e3889c4c6a7ad1c50bca') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py index a3c49feb93e..00de6b35acd 100644 --- a/var/spack/repos/builtin/packages/r-irdisplay/package.py +++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py @@ -36,7 +36,7 @@ class RIrdisplay(Package): version('0.4.4', '5be672fb82185b90f23bd99ac1e1cdb6') - extends('R') + extends('r') depends_on('r-repr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index 34b5c3c363f..4890d95b3ef 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -35,7 +35,7 @@ class RIrkernel(Package): version('master', git='https://github.com/IRkernel/IRkernel.git', tag='0.7') - extends('R') + extends('r') depends_on('r-repr', type=nolink) depends_on('r-irdisplay', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py index 42cc142e8ab..caae09930cd 100644 --- a/var/spack/repos/builtin/packages/r-irlba/package.py +++ b/var/spack/repos/builtin/packages/r-irlba/package.py @@ -36,7 +36,7 @@ class RIrlba(Package): version('2.0.0', '557674cf8b68fea5b9f231058c324d26') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-iterators/package.py b/var/spack/repos/builtin/packages/r-iterators/package.py index f5a3489e7d2..7e6fb9890dc 100644 --- a/var/spack/repos/builtin/packages/r-iterators/package.py +++ b/var/spack/repos/builtin/packages/r-iterators/package.py @@ -35,7 +35,7 @@ class RIterators(Package): version('1.0.8', '2ded7f82cddd8174f1ec98607946c6ee') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-jpeg/package.py b/var/spack/repos/builtin/packages/r-jpeg/package.py index ef940720f83..2ec11e744b0 100644 --- a/var/spack/repos/builtin/packages/r-jpeg/package.py +++ b/var/spack/repos/builtin/packages/r-jpeg/package.py @@ -36,7 +36,7 @@ class RJpeg(Package): version('0.1-8', '696007451d14395b1ed1d0e9af667a57') - extends('R') + extends('r') depends_on('jpeg') diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index d1cb4b52c14..d01caf1f95b 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -44,7 +44,7 @@ class RJsonlite(Package): version('1.0', 'c8524e086de22ab39b8ac8000220cc87') version('0.9.21', '4fc382747f88a79ff0718a0d06bed45d') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index 4976e12b45f..4ad22cf33f4 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -37,7 +37,7 @@ class RKnitr(Package): version('1.14', 'ef0fbeaa9372f99ffbc57212a7781511') version('0.6' , 'c67d6db84cd55594a9e870c90651a3db') - extends('R') + extends('r') depends_on('r-evaluate', type=nolink) depends_on('r-digest', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-labeling/package.py b/var/spack/repos/builtin/packages/r-labeling/package.py index 02e5da9d858..daf971bf440 100644 --- a/var/spack/repos/builtin/packages/r-labeling/package.py +++ b/var/spack/repos/builtin/packages/r-labeling/package.py @@ -34,7 +34,7 @@ class RLabeling(Package): version('0.3', 'ccd7082ec0b211aba8a89d85176bb534') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index a798b1ce658..9308a869a2b 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -37,7 +37,7 @@ class RLattice(Package): version('0.20-34', 'c2a648b22d4206ae7526fb70b8e90fed') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-lazyeval/package.py b/var/spack/repos/builtin/packages/r-lazyeval/package.py index f80fb4d2727..138691759f9 100644 --- a/var/spack/repos/builtin/packages/r-lazyeval/package.py +++ b/var/spack/repos/builtin/packages/r-lazyeval/package.py @@ -36,7 +36,7 @@ class RLazyeval(Package): version('0.2.0', 'df1daac908dcf02ae7e12f4335b1b13b') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py index 2a91100c348..ab7fd2c48af 100644 --- a/var/spack/repos/builtin/packages/r-leaflet/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet/package.py @@ -36,7 +36,7 @@ class RLeaflet(Package): version('1.0.1', '7f3d8b17092604d87d4eeb579f73d5df') - extends('R') + extends('r') depends_on('r-base64enc', type=nolink) depends_on('r-htmlwidgets', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py index c52d9d0e27c..2f9ee3e48fc 100644 --- a/var/spack/repos/builtin/packages/r-lme4/package.py +++ b/var/spack/repos/builtin/packages/r-lme4/package.py @@ -37,7 +37,7 @@ class RLme4(Package): version('1.1-12', 'da8aaebb67477ecb5631851c46207804') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-mass', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py index 31a36f1f7e4..ff98eeadcf9 100644 --- a/var/spack/repos/builtin/packages/r-lmtest/package.py +++ b/var/spack/repos/builtin/packages/r-lmtest/package.py @@ -36,7 +36,7 @@ class RLmtest(Package): version('0.9-34', 'fcdf7286bb5ccc2ca46be00bf25ac2fe') - extends('R') + extends('r') depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 2e5661fa4d3..125762de1ed 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -39,7 +39,7 @@ class RLubridate(Package): version('1.5.6', 'a5dc44817548ee219d26a10bae92e611') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py index 2b8f95351a1..ff329031254 100644 --- a/var/spack/repos/builtin/packages/r-magic/package.py +++ b/var/spack/repos/builtin/packages/r-magic/package.py @@ -37,7 +37,7 @@ class RMagic(Package): version('1.5-6', 'a68e5ced253b2196af842e1fc84fd029') - extends('R') + extends('r') depends_on('r-abind', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-magrittr/package.py b/var/spack/repos/builtin/packages/r-magrittr/package.py index 11476c3d1e3..c41f4eff8f6 100644 --- a/var/spack/repos/builtin/packages/r-magrittr/package.py +++ b/var/spack/repos/builtin/packages/r-magrittr/package.py @@ -38,7 +38,7 @@ class RMagrittr(Package): version('1.5', 'e74ab7329f2b9833f0c3c1216f86d65a') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py index 0f8bbe199b4..bace22a1256 100644 --- a/var/spack/repos/builtin/packages/r-mapproj/package.py +++ b/var/spack/repos/builtin/packages/r-mapproj/package.py @@ -34,7 +34,7 @@ class RMapproj(Package): version('1.2-4', '10e22bde1c790e1540672f15ddcaee71') - extends('R') + extends('r') depends_on('r-maps', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-maps/package.py b/var/spack/repos/builtin/packages/r-maps/package.py index 1e0bfd2d437..8cbb6466435 100644 --- a/var/spack/repos/builtin/packages/r-maps/package.py +++ b/var/spack/repos/builtin/packages/r-maps/package.py @@ -35,7 +35,7 @@ class RMaps(Package): version('3.1.1', 'ff045eccb6d5a658db5a539116ddf764') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py index 8d045a4ed44..df9254e1875 100644 --- a/var/spack/repos/builtin/packages/r-maptools/package.py +++ b/var/spack/repos/builtin/packages/r-maptools/package.py @@ -38,7 +38,7 @@ class RMaptools(Package): version('0.8-39', '3690d96afba8ef22c8e27ae540ffb836') - extends('R') + extends('r') depends_on('r-sp', type=nolink) depends_on('r-foreign', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py index c34727d2b05..9648412e504 100644 --- a/var/spack/repos/builtin/packages/r-markdown/package.py +++ b/var/spack/repos/builtin/packages/r-markdown/package.py @@ -38,7 +38,7 @@ class RMarkdown(Package): version('0.7.7', '72deca9c675c7cc9343048edbc29f7ff') - extends('R') + extends('r') depends_on('r-mime', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mass/package.py b/var/spack/repos/builtin/packages/r-mass/package.py index 1ab01d22561..eda7dccabfa 100644 --- a/var/spack/repos/builtin/packages/r-mass/package.py +++ b/var/spack/repos/builtin/packages/r-mass/package.py @@ -35,7 +35,7 @@ class RMass(Package): version('7.3-45', 'aba3d12fab30f1793bee168a1efea88b') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index 1b45dc55caa..02f193dd9b9 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -35,7 +35,7 @@ class RMatrix(Package): version('1.2-6', 'f545307fb1284861e9266c4e9712c55e') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py index 3cdce6fea63..62adab7f15c 100644 --- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py +++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py @@ -35,7 +35,7 @@ class RMatrixmodels(Package): version('0.4-1', '65b3ab56650c62bf1046a3eb1f1e19a0') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index 81f3ff1dab2..da931315545 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -35,7 +35,7 @@ class RMemoise(Package): version('1.0.0', 'd31145292e2a88ae9a504cab1602e4ac') - extends('R') + extends('r') depends_on('r-digest', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index 4c49462ba23..5b8f04a84c4 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -37,7 +37,7 @@ class RMgcv(Package): version('1.8-13', '30607be3aaf44b13bd8c81fc32e8c984') - extends('R') + extends('r') depends_on('r-nlme', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mime/package.py b/var/spack/repos/builtin/packages/r-mime/package.py index 5e78889a76b..55d40c56639 100644 --- a/var/spack/repos/builtin/packages/r-mime/package.py +++ b/var/spack/repos/builtin/packages/r-mime/package.py @@ -36,7 +36,7 @@ class RMime(Package): version('0.5', '87e00b6d57b581465c19ae869a723c4d') version('0.4', '789cb33e41db2206c6fc7c3e9fbc2c02') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py index 16cff20b410..a38f00f9abb 100644 --- a/var/spack/repos/builtin/packages/r-minqa/package.py +++ b/var/spack/repos/builtin/packages/r-minqa/package.py @@ -35,7 +35,7 @@ class RMinqa(Package): version('1.2.4', 'bcaae4fdba60a33528f2116e2fd51105') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py index 54416502d95..b32bea62496 100644 --- a/var/spack/repos/builtin/packages/r-multcomp/package.py +++ b/var/spack/repos/builtin/packages/r-multcomp/package.py @@ -38,7 +38,7 @@ class RMultcomp(Package): version('1.4-6', 'f1353ede2ed78b23859a7f1f1f9ebe88') - extends('R') + extends('r') depends_on('r-mvtnorm', type=nolink) depends_on('r-survival', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py index b96b90f9c7e..4250b00ec20 100644 --- a/var/spack/repos/builtin/packages/r-munsell/package.py +++ b/var/spack/repos/builtin/packages/r-munsell/package.py @@ -38,7 +38,7 @@ class RMunsell(Package): version('0.4.3', 'ebd205323dc37c948f499ee08be9c476') - extends('R') + extends('r') depends_on('r-colorspace', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mvtnorm/package.py b/var/spack/repos/builtin/packages/r-mvtnorm/package.py index b3f7db60c60..956ae6bc44c 100644 --- a/var/spack/repos/builtin/packages/r-mvtnorm/package.py +++ b/var/spack/repos/builtin/packages/r-mvtnorm/package.py @@ -35,7 +35,7 @@ class RMvtnorm(Package): version('1.0-5', '5894dd3969bbfa26f4862c45f9a48a52') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-ncdf4/package.py b/var/spack/repos/builtin/packages/r-ncdf4/package.py index 11bf7abb38d..3949967022e 100644 --- a/var/spack/repos/builtin/packages/r-ncdf4/package.py +++ b/var/spack/repos/builtin/packages/r-ncdf4/package.py @@ -47,7 +47,7 @@ class RNcdf4(Package): version('1.15', 'cd60dadbae3be31371e1ed40ddeb420a') - extends('R') + extends('r') depends_on('netcdf') diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py index 8884f7cf1b1..2374b78d7bd 100644 --- a/var/spack/repos/builtin/packages/r-networkd3/package.py +++ b/var/spack/repos/builtin/packages/r-networkd3/package.py @@ -35,7 +35,7 @@ class RNetworkd3(Package): version('0.2.12', '356fe4be59698e6fb052644bd9659d84') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-igraph', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py index 1b6bb114e1b..02a0836fd8f 100644 --- a/var/spack/repos/builtin/packages/r-nlme/package.py +++ b/var/spack/repos/builtin/packages/r-nlme/package.py @@ -34,7 +34,7 @@ class RNlme(Package): version('3.1-128', '3d75ae7380bf123761b95a073eb55008') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index 58cb585c491..8b5e947710f 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -40,7 +40,7 @@ class RNloptr(Package): version('1.0.4', '9af69a613349b236fd377d0a107f484c') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py index c30a1ac1012..e33a9364d43 100644 --- a/var/spack/repos/builtin/packages/r-nmf/package.py +++ b/var/spack/repos/builtin/packages/r-nmf/package.py @@ -39,7 +39,7 @@ class RNmf(Package): version('0.20.6', '81df07b3bf710a611db5af24730ff3d0') - extends('R') + extends('r') depends_on('r-pkgmaker', type=nolink) depends_on('r-registry', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-nnet/package.py b/var/spack/repos/builtin/packages/r-nnet/package.py index be048f5ad04..6f5e7d65040 100644 --- a/var/spack/repos/builtin/packages/r-nnet/package.py +++ b/var/spack/repos/builtin/packages/r-nnet/package.py @@ -35,7 +35,7 @@ class RNnet(Package): version('7.3-12', 'dc7c6f0d0de53d8fc72b44554400a74e') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py index bff7d0f1952..1ee6105576f 100644 --- a/var/spack/repos/builtin/packages/r-np/package.py +++ b/var/spack/repos/builtin/packages/r-np/package.py @@ -40,7 +40,7 @@ class RNp(Package): version('0.60-2', 'e094d52ddff7280272b41e6cb2c74389') - extends('R') + extends('r') depends_on('r-boot', type=nolink) depends_on('r-cubature', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-openssl/package.py b/var/spack/repos/builtin/packages/r-openssl/package.py index 3e77923d76b..f5442b102fb 100644 --- a/var/spack/repos/builtin/packages/r-openssl/package.py +++ b/var/spack/repos/builtin/packages/r-openssl/package.py @@ -43,7 +43,7 @@ class ROpenssl(Package): version('0.9.4', '82a890e71ed0e74499878bedacfb8ccb') - extends('R') + extends('r') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index 9520952bd7b..f978b9f7797 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -35,7 +35,7 @@ class RPackrat(Package): version('0.4.7-1', '80c2413269b292ade163a70ba5053e84') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py index dff9099c07a..ab994ce4d26 100644 --- a/var/spack/repos/builtin/packages/r-partykit/package.py +++ b/var/spack/repos/builtin/packages/r-partykit/package.py @@ -42,7 +42,7 @@ class RPartykit(Package): version('1.1-1', '8fcb31d73ec1b8cd3bcd9789639a9277') - extends('R') + extends('r') depends_on('r-survival', type=nolink) depends_on('r-formula', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py index b5a95461243..e6c546e9211 100644 --- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py +++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py @@ -41,9 +41,9 @@ class RPbdzmq(Package): version('0.2-4', 'e5afb70199aa54d737ee7a0e26bde060') - extends('R') + extends('r') - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) depends_on('zeromq') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py index 40b6f96927f..0bd749abe1c 100644 --- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py +++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py @@ -38,7 +38,7 @@ class RPbkrtest(Package): version('0.4-6', '0a7d9ff83b8d131af9b2335f35781ef9') - extends('R') + extends('r') depends_on('r-lme4', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py index 87daec5ad00..5c9e5496e71 100644 --- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py +++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py @@ -40,7 +40,7 @@ class RPkgmaker(Package): version('0.22', '73a0c6d3e84c6dadf3de7582ef7e88a4') - extends('R') + extends('r') depends_on('r-registry', type=nolink) depends_on('r-codetools', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-plotrix/package.py b/var/spack/repos/builtin/packages/r-plotrix/package.py index d1d61dbc4dd..ec02193d403 100644 --- a/var/spack/repos/builtin/packages/r-plotrix/package.py +++ b/var/spack/repos/builtin/packages/r-plotrix/package.py @@ -34,7 +34,7 @@ class RPlotrix(Package): version('3.6-3', '23e3e022a13a596e9b77b40afcb4a2ef') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py index fe4512347ab..cc9c19b98ac 100644 --- a/var/spack/repos/builtin/packages/r-plyr/package.py +++ b/var/spack/repos/builtin/packages/r-plyr/package.py @@ -40,7 +40,7 @@ class RPlyr(Package): version('1.8.4', 'ef455cf7fc06e34837692156b7b2587b') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-png/package.py b/var/spack/repos/builtin/packages/r-png/package.py index d3a80a4e16b..aa3d4f3c69a 100644 --- a/var/spack/repos/builtin/packages/r-png/package.py +++ b/var/spack/repos/builtin/packages/r-png/package.py @@ -36,7 +36,7 @@ class RPng(Package): version('0.1-7', '1ebc8b8aa5979b12c5ec2384b30d649f') - extends('R') + extends('r') depends_on('libpng') diff --git a/var/spack/repos/builtin/packages/r-praise/package.py b/var/spack/repos/builtin/packages/r-praise/package.py index 102d86d2fad..dba2289311e 100644 --- a/var/spack/repos/builtin/packages/r-praise/package.py +++ b/var/spack/repos/builtin/packages/r-praise/package.py @@ -34,7 +34,7 @@ class RPraise(Package): version('1.0.0', '9318724cec0454884b5f762bee2da6a1') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index 07ace3ad296..109ea5fe4f8 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -35,7 +35,7 @@ class RProto(Package): version('0.3-10', 'd5523943a5be6ca2f0ab557c900f8212') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py index acd502b536d..e9cbab3878a 100644 --- a/var/spack/repos/builtin/packages/r-pryr/package.py +++ b/var/spack/repos/builtin/packages/r-pryr/package.py @@ -36,7 +36,7 @@ class RPryr(Package): version('0.1.2', '66b597a762aa15a3b7037779522983b6') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py index ecfbf490554..bf27e1a41bc 100644 --- a/var/spack/repos/builtin/packages/r-quantmod/package.py +++ b/var/spack/repos/builtin/packages/r-quantmod/package.py @@ -35,7 +35,7 @@ class RQuantmod(Package): version('0.4-5', 'cab3c409e4de3df98a20f1ded60f3631') - extends('R') + extends('r') depends_on('r-xts', type=nolink) depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py index 89a26070ba2..81aa242ee81 100644 --- a/var/spack/repos/builtin/packages/r-quantreg/package.py +++ b/var/spack/repos/builtin/packages/r-quantreg/package.py @@ -39,7 +39,7 @@ class RQuantreg(Package): version('5.26', '1d89ed932fb4d67ae2d5da0eb8c2989f') - extends('R') + extends('r') depends_on('r-sparsem', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-R6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py similarity index 99% rename from var/spack/repos/builtin/packages/r-R6/package.py rename to var/spack/repos/builtin/packages/r-r6/package.py index 0b75888e793..cb5593f6fc5 100644 --- a/var/spack/repos/builtin/packages/r-R6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -39,7 +39,7 @@ class RR6(Package): version('2.1.2', 'b6afb9430e48707be87638675390e457') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-randomforest/package.py b/var/spack/repos/builtin/packages/r-randomforest/package.py index 1066c217f44..4d56210c99d 100644 --- a/var/spack/repos/builtin/packages/r-randomforest/package.py +++ b/var/spack/repos/builtin/packages/r-randomforest/package.py @@ -35,7 +35,7 @@ class RRandomforest(Package): version('4.6-12', '071c03af974198e861f1475c5bab9e7a') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py index 39f4256703c..017838428cd 100644 --- a/var/spack/repos/builtin/packages/r-raster/package.py +++ b/var/spack/repos/builtin/packages/r-raster/package.py @@ -36,7 +36,7 @@ class RRaster(Package): version('2.5-8', '2a7db931c74d50516e82d04687c0a577') - extends('R') + extends('r') depends_on('r-sp', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py index 074c5455340..c410acaba2c 100644 --- a/var/spack/repos/builtin/packages/r-rbokeh/package.py +++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py @@ -36,7 +36,7 @@ class RRbokeh(Package): version('0.5.0', '4e14778c3fbd9286460ca28c68f57d10') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-maps', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py index b81ec2561cf..4734a1674f9 100644 --- a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py +++ b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py @@ -35,7 +35,7 @@ class RRcolorbrewer(Package): version('1.1-2', '66054d83eade4dff8a43ad4732691182') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index 94580a87008..1637faca030 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -43,7 +43,7 @@ class RRcpp(Package): version('0.12.6', 'db4280fb0a79cd19be73a662c33b0a8b') version('0.12.5', 'f03ec05b4e391cc46e7ce330e82ff5e2') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index ecf9256ab3a..f0aebb54f0c 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -46,7 +46,7 @@ class RRcppeigen(Package): version('0.3.2.8.1', '4146e06e4fdf7f4d08db7839069d479f') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-registry/package.py b/var/spack/repos/builtin/packages/r-registry/package.py index 119a84718ad..89402cfbff4 100644 --- a/var/spack/repos/builtin/packages/r-registry/package.py +++ b/var/spack/repos/builtin/packages/r-registry/package.py @@ -34,7 +34,7 @@ class RRegistry(Package): version('0.3', '85345b334ec81eb3da6edcbb27c5f421') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-repr/package.py b/var/spack/repos/builtin/packages/r-repr/package.py index 2e1f6126f9f..11d43cf7ea4 100644 --- a/var/spack/repos/builtin/packages/r-repr/package.py +++ b/var/spack/repos/builtin/packages/r-repr/package.py @@ -36,7 +36,7 @@ class RRepr(Package): version('0.9', 'db5ff74893063b492f684e42283070bd') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py index 769e82aff9d..1fd8067bbec 100644 --- a/var/spack/repos/builtin/packages/r-reshape2/package.py +++ b/var/spack/repos/builtin/packages/r-reshape2/package.py @@ -35,7 +35,7 @@ class RReshape2(Package): version('1.4.1', '41e9dffdf5c6fa830321ac9c8ebffe00') - extends('R') + extends('r') depends_on('r-plyr', type=nolink) depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py index 0d28b68b940..0e0d94a3d3b 100644 --- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py +++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py @@ -37,7 +37,7 @@ class RRgooglemaps(Package): version('1.2.0.7', '2e1df804f0331b4122d841105f0c7ea5') - extends('R') + extends('r') depends_on('r-png', type=nolink) depends_on('r-rjsonio', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index 41af3a4392a..e18fc2499c1 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -48,7 +48,7 @@ class RRinside(Package): version('0.2.13', '2e3c35a7bd648e9bef98d0afcc02cf88') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index 47804bd7fc1..e1de4b77ff6 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -35,7 +35,7 @@ class RRjava(Package): version('0.9-8', '51ae0d690ceed056ebe7c4be71fc6c7a') - extends('R') + extends('r') depends_on('jdk') diff --git a/var/spack/repos/builtin/packages/r-rjson/package.py b/var/spack/repos/builtin/packages/r-rjson/package.py index 94ca45f485d..db25a92916f 100644 --- a/var/spack/repos/builtin/packages/r-rjson/package.py +++ b/var/spack/repos/builtin/packages/r-rjson/package.py @@ -34,7 +34,7 @@ class RRjson(Package): version('0.2.15', '87d0e29bc179c6aeaf312b138089f8e9') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rjsonio/package.py b/var/spack/repos/builtin/packages/r-rjsonio/package.py index b56dfbe21d3..a62f17abf76 100644 --- a/var/spack/repos/builtin/packages/r-rjsonio/package.py +++ b/var/spack/repos/builtin/packages/r-rjsonio/package.py @@ -48,7 +48,7 @@ class RRjsonio(Package): version('1.3-0', '72c395622ba8d1435ec43849fd32c830') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index c3793883140..c65ff7df9b9 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -35,7 +35,7 @@ class RRmarkdown(Package): version('1.0', '264aa6a59e9680109e38df8270e14c58') - extends('R') + extends('r') depends_on('r-knitr', type=nolink) depends_on('r-yaml', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py index bc42c51ca9b..4164dd37219 100644 --- a/var/spack/repos/builtin/packages/r-rmysql/package.py +++ b/var/spack/repos/builtin/packages/r-rmysql/package.py @@ -34,7 +34,7 @@ class RRmysql(Package): version('0.10.9', '3628200a1864ac3005cfd55cc7cde17a') - extends('R') + extends('r') depends_on('r-dbi', type=nolink) depends_on('mariadb') diff --git a/var/spack/repos/builtin/packages/r-rngtools/package.py b/var/spack/repos/builtin/packages/r-rngtools/package.py index 2f33cd9f88c..2c06306f317 100644 --- a/var/spack/repos/builtin/packages/r-rngtools/package.py +++ b/var/spack/repos/builtin/packages/r-rngtools/package.py @@ -38,7 +38,7 @@ class RRngtools(Package): version('1.2.4', '715967f8b3af2848a76593a7c718c1cd') - extends('R') + extends('r') depends_on('r-pkgmaker', type=nolink) depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index 11fe0ace56e..af142c841ab 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -34,7 +34,7 @@ class RRodbc(Package): version('1.3-13', 'c52ef9139c2ed85adc53ad6effa7d68e') - extends('R') + extends('r') depends_on('unixodbc') diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py index 4f4b8dcafaa..1c017d78982 100644 --- a/var/spack/repos/builtin/packages/r-roxygen2/package.py +++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py @@ -35,7 +35,7 @@ class RRoxygen2(Package): version('5.0.1', 'df5bdbc12fda372e427710ef1cd92ed7') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) depends_on('r-stringi', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py index 999fb4a1b9b..3f7b64693fd 100644 --- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py @@ -42,7 +42,7 @@ class RRpostgresql(Package): version('0.4-1', 'e7b22e212afbb2cbb88bab937f93e55a') - extends('R') + extends('r') depends_on('r-dbi', type=nolink) depends_on('postgresql') diff --git a/var/spack/repos/builtin/packages/r-rsnns/package.py b/var/spack/repos/builtin/packages/r-rsnns/package.py index 7684792ba10..fad75827d4a 100644 --- a/var/spack/repos/builtin/packages/r-rsnns/package.py +++ b/var/spack/repos/builtin/packages/r-rsnns/package.py @@ -41,7 +41,7 @@ class RRsnns(Package): version('0.4-7', 'ade7736611c456effb5f72e0ce0a1e6f') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index c7d41f0fb37..a22421ed87a 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -36,7 +36,7 @@ class RRsqlite(Package): version('1.0.0', 'e6cbe2709612b687c13a10d30c7bad45') - extends('R') + extends('r') depends_on('r-dbi', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 1d0052563b7..4f580d7853d 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -42,7 +42,7 @@ class RRstan(Package): version('2.10.1', 'f5d212f6f8551bdb91fe713d05d4052a') - extends('R') + extends('r') depends_on('r-ggplot2', type=nolink) depends_on('r-stanheaders', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index bf9b35fe5b9..1a20fc226b5 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -36,7 +36,7 @@ class RRstudioapi(Package): version('0.6', 'fdb13bf46aab02421557e713fceab66b') version('0.5', '6ce1191da74e7bcbf06b61339486b3ba') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rzmq/package.py b/var/spack/repos/builtin/packages/r-rzmq/package.py index 472e706e725..d013c8889c9 100644 --- a/var/spack/repos/builtin/packages/r-rzmq/package.py +++ b/var/spack/repos/builtin/packages/r-rzmq/package.py @@ -37,7 +37,7 @@ class RRzmq(Package): depends_on('zeromq') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py index ffd62b1b147..a9d39d37f9d 100644 --- a/var/spack/repos/builtin/packages/r-sandwich/package.py +++ b/var/spack/repos/builtin/packages/r-sandwich/package.py @@ -35,7 +35,7 @@ class RSandwich(Package): version('2.3-4', 'a621dbd8a57b6e1e036496642aadc2e5') - extends('R') + extends('r') depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py index 44bd5a5a2a7..0072de8f5f6 100644 --- a/var/spack/repos/builtin/packages/r-scales/package.py +++ b/var/spack/repos/builtin/packages/r-scales/package.py @@ -35,7 +35,7 @@ class RScales(Package): version('0.4.0', '7b5602d9c55595901192248bca25c099') - extends('R') + extends('r') depends_on('r-rcolorbrewer', type=nolink) depends_on('r-dichromat', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index a80860f4a53..4617e8a0b22 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -37,7 +37,7 @@ class RShiny(Package): version('0.13.2', 'cb5bff7a28ad59ec2883cd0912ca9611') - extends('R') + extends('r') depends_on('r-httpuv', type=nolink) depends_on('r-mime', type=nolink) @@ -45,7 +45,7 @@ class RShiny(Package): depends_on('r-xtable', type=nolink) depends_on('r-digest', type=nolink) depends_on('r-htmltools', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py index bb7589d4906..ecb75203bb4 100644 --- a/var/spack/repos/builtin/packages/r-sp/package.py +++ b/var/spack/repos/builtin/packages/r-sp/package.py @@ -37,7 +37,7 @@ class RSp(Package): version('1.2-3', 'f0e24d993dec128642ee66b6b47b10c1') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-sparsem/package.py b/var/spack/repos/builtin/packages/r-sparsem/package.py index c4dabf5c153..1bd8835d5a5 100644 --- a/var/spack/repos/builtin/packages/r-sparsem/package.py +++ b/var/spack/repos/builtin/packages/r-sparsem/package.py @@ -36,7 +36,7 @@ class RSparsem(Package): version('1.7', '7b5b0ab166a0929ef6dcfe1d97643601') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index c77b5aa8b6a..681969f18da 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -48,7 +48,7 @@ class RStanheaders(Package): version('2.10.0-2', '9d09b1e9278f08768f7a988ad9082d57') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-stringi/package.py b/var/spack/repos/builtin/packages/r-stringi/package.py index cc57caf8cd2..5a5f4ee18a7 100644 --- a/var/spack/repos/builtin/packages/r-stringi/package.py +++ b/var/spack/repos/builtin/packages/r-stringi/package.py @@ -42,7 +42,7 @@ class RStringi(Package): version('1.1.1', '32b919ee3fa8474530c4942962a6d8d9') - extends('R') + extends('r') depends_on('icu4c') diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py index 08ded958339..43bae9bbf07 100644 --- a/var/spack/repos/builtin/packages/r-stringr/package.py +++ b/var/spack/repos/builtin/packages/r-stringr/package.py @@ -38,7 +38,7 @@ class RStringr(Package): version('1.0.0', '5ca977c90351f78b1b888b379114a7b4') - extends('R') + extends('r') depends_on('r-stringi', type=nolink) depends_on('r-magrittr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-survey/package.py b/var/spack/repos/builtin/packages/r-survey/package.py index 646793f7a44..619f22cb59a 100644 --- a/var/spack/repos/builtin/packages/r-survey/package.py +++ b/var/spack/repos/builtin/packages/r-survey/package.py @@ -40,7 +40,7 @@ class RSurvey(Package): version('3.30-3', 'c70cdae9cb43d35abddd11173d64cad0') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py index cfba9298fe1..71652c2bcc5 100644 --- a/var/spack/repos/builtin/packages/r-survival/package.py +++ b/var/spack/repos/builtin/packages/r-survival/package.py @@ -36,7 +36,7 @@ class RSurvival(Package): version('2.39-5', 'a3cc6b5762e8c5c0bb9e64a276710be2') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py index a85aa8baefe..a6b5fbddd34 100644 --- a/var/spack/repos/builtin/packages/r-tarifx/package.py +++ b/var/spack/repos/builtin/packages/r-tarifx/package.py @@ -34,7 +34,7 @@ class RTarifx(Package): version('1.0.6', '7e782e04bd69d929b29f91553382e6a2') - extends('R') + extends('r') depends_on('r-reshape2', type=nolink) depends_on('r-plyr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-testit/package.py b/var/spack/repos/builtin/packages/r-testit/package.py index a10b55d66c2..2f2b0f3c4fa 100644 --- a/var/spack/repos/builtin/packages/r-testit/package.py +++ b/var/spack/repos/builtin/packages/r-testit/package.py @@ -36,7 +36,7 @@ class RTestit(Package): version('0.5', 'f206d3cbdc5174e353d2d05ba6a12e59') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py index 60dfd2afcd5..8d4d1741289 100644 --- a/var/spack/repos/builtin/packages/r-testthat/package.py +++ b/var/spack/repos/builtin/packages/r-testthat/package.py @@ -35,13 +35,13 @@ class RTestthat(Package): version('1.0.2', '6c6a90c8db860292df5784a70e07b8dc') - extends('R') + extends('r') depends_on('r-digest', type=nolink) depends_on('r-crayon', type=nolink) depends_on('r-praise', type=nolink) depends_on('r-magrittr', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-thdata/package.py b/var/spack/repos/builtin/packages/r-thdata/package.py index e1cf0501811..a389da3045d 100644 --- a/var/spack/repos/builtin/packages/r-thdata/package.py +++ b/var/spack/repos/builtin/packages/r-thdata/package.py @@ -34,7 +34,7 @@ class RThdata(Package): version('1.0-7', '3e8b6b1a4699544f175215aed7039a94') - extends('R') + extends('r') depends_on('r-survival', type=nolink) depends_on('r-mass', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py index 89ecce8bfc7..e3aa271b3ec 100644 --- a/var/spack/repos/builtin/packages/r-threejs/package.py +++ b/var/spack/repos/builtin/packages/r-threejs/package.py @@ -35,7 +35,7 @@ class RThreejs(Package): version('0.2.2', '35c179b10813c5e4bd3e7827fae6627b') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-base64enc', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index c601de3c880..6d59a401477 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -35,7 +35,7 @@ class RTibble(Package): version('1.1', '2fe9f806109d0b7fadafb1ffafea4cb8') - extends('R') + extends('r') depends_on('r-assertthat', type=nolink) depends_on('r-lazyeval', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index d82ae278fe0..c83d75b6fde 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -36,7 +36,7 @@ class RTidyr(Package): version('0.5.1', '3cadc869510c054ed93d374ab44120bd') - extends('R') + extends('r') depends_on('r-tibble', type=nolink) depends_on('r-dplyr', type=nolink) depends_on('r-stringi', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py index c9b40a8262d..355ba6ca3cf 100644 --- a/var/spack/repos/builtin/packages/r-ttr/package.py +++ b/var/spack/repos/builtin/packages/r-ttr/package.py @@ -34,7 +34,7 @@ class RTtr(Package): version('0.23-1', '35f693ac0d97e8ec742ebea2da222986') - extends('R') + extends('r') depends_on('r-xts', type=nolink) depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-uuid/package.py b/var/spack/repos/builtin/packages/r-uuid/package.py index 97541bc3b8e..9a2455017be 100644 --- a/var/spack/repos/builtin/packages/r-uuid/package.py +++ b/var/spack/repos/builtin/packages/r-uuid/package.py @@ -36,7 +36,7 @@ class RUuid(Package): version('0.1-2', 'f97d000c0b16bca455fb5bf2cd668ddf') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py index 06e609b1efd..f7c0b253692 100644 --- a/var/spack/repos/builtin/packages/r-vcd/package.py +++ b/var/spack/repos/builtin/packages/r-vcd/package.py @@ -39,7 +39,7 @@ class RVcd(Package): version('1.4-1', '7db150a77f173f85b69a1f86f73f8f02') - extends('R') + extends('r') depends_on('r-mass', type=nolink) depends_on('r-colorspace', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py index 90d55bbb2fb..6cce369325d 100644 --- a/var/spack/repos/builtin/packages/r-visnetwork/package.py +++ b/var/spack/repos/builtin/packages/r-visnetwork/package.py @@ -35,7 +35,7 @@ class RVisnetwork(Package): version('1.0.1', 'dfc9664a5165134d8dbdcd949ad73cf7') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-htmltools', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-whisker/package.py b/var/spack/repos/builtin/packages/r-whisker/package.py index f338d150f1e..8edea7e840a 100644 --- a/var/spack/repos/builtin/packages/r-whisker/package.py +++ b/var/spack/repos/builtin/packages/r-whisker/package.py @@ -35,7 +35,7 @@ class RWhisker(Package): version('0.3-2', 'c4b9bf9a22e69ce003fe68663ab5e8e6') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-withr/package.py b/var/spack/repos/builtin/packages/r-withr/package.py index 5ce7437c84f..92b941b32fa 100644 --- a/var/spack/repos/builtin/packages/r-withr/package.py +++ b/var/spack/repos/builtin/packages/r-withr/package.py @@ -37,7 +37,7 @@ class RWithr(Package): version('1.0.1', 'ac38af2c6f74027c9592dd8f0acb7598') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py index 458045ff74b..586a99f76f7 100644 --- a/var/spack/repos/builtin/packages/r-xgboost/package.py +++ b/var/spack/repos/builtin/packages/r-xgboost/package.py @@ -42,7 +42,7 @@ class RXgboost(Package): version('0.4-4', 'c24d3076058101a71de4b8af8806697c') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-datatable', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 332c80fb92d..64b95f84e0c 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -36,7 +36,7 @@ class RXlconnect(Package): version('0.2-12', '3340d05d259f0a41262eab4ed32617ad') version('0.2-11', '9d1769a103cda05665df399cc335017d') - extends('R') + extends('r') depends_on('r-xlconnectjars', type=nolink) depends_on('r-rjava', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py index 26e822d2b77..37dbed27839 100644 --- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py @@ -35,7 +35,7 @@ class RXlconnectjars(Package): version('0.2-12', '6984e5140cd1c887c017ef6f88cbba81') version('0.2-9', 'e6d6b1acfede26acaa616ee421bd30fb') - extends('R') + extends('r') depends_on('r-rjava', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py index 6fed09296d6..4c7b8ee15d6 100644 --- a/var/spack/repos/builtin/packages/r-xlsx/package.py +++ b/var/spack/repos/builtin/packages/r-xlsx/package.py @@ -35,7 +35,7 @@ class RXlsx(Package): version('0.5.7', '36b1b16f29c54b6089b1dae923180dd5') - extends('R') + extends('r') depends_on('r-rjava', type=nolink) depends_on('r-xlsxjars', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py index 19f0006ce98..22bda6e83f4 100644 --- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py @@ -35,7 +35,7 @@ class RXlsxjars(Package): version('0.6.1', '5a1721d5733cb42f3a29e3f353e39166') - extends('R') + extends('r') depends_on('r-rjava', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xml/package.py b/var/spack/repos/builtin/packages/r-xml/package.py index 5affe7f08a4..416491cbe6d 100644 --- a/var/spack/repos/builtin/packages/r-xml/package.py +++ b/var/spack/repos/builtin/packages/r-xml/package.py @@ -37,7 +37,7 @@ class RXml(Package): version('3.98-1.5', 'd1cfcd56f7aec96a84ffca91aea507ee') version('3.98-1.4', '1a7f3ce6f264eeb109bfa57bedb26c14') - extends('R') + extends('r') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/r-xtable/package.py b/var/spack/repos/builtin/packages/r-xtable/package.py index 46434b48420..8c675e1b3bb 100644 --- a/var/spack/repos/builtin/packages/r-xtable/package.py +++ b/var/spack/repos/builtin/packages/r-xtable/package.py @@ -34,7 +34,7 @@ class RXtable(Package): version('1.8-2', '239e4825cd046156a67efae3aac01d86') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py index d8a4b62d27e..678a9f4bf44 100644 --- a/var/spack/repos/builtin/packages/r-xts/package.py +++ b/var/spack/repos/builtin/packages/r-xts/package.py @@ -37,7 +37,7 @@ class RXts(Package): version('0.9-7', 'a232e94aebfa654653a7d88a0503537b') - extends('R') + extends('r') depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-yaml/package.py b/var/spack/repos/builtin/packages/r-yaml/package.py index b68f26e9b87..d8a3c9bacc9 100644 --- a/var/spack/repos/builtin/packages/r-yaml/package.py +++ b/var/spack/repos/builtin/packages/r-yaml/package.py @@ -35,7 +35,7 @@ class RYaml(Package): version('2.1.13', 'f2203ea395adaff6bd09134666191d9a') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py index d889cacbeee..27295c7afcc 100644 --- a/var/spack/repos/builtin/packages/r-zoo/package.py +++ b/var/spack/repos/builtin/packages/r-zoo/package.py @@ -38,7 +38,7 @@ class RZoo(Package): version('1.7-13', '99521dfa4c668e692720cefcc5a1bf30') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/r/package.py similarity index 100% rename from var/spack/repos/builtin/packages/R/package.py rename to var/spack/repos/builtin/packages/r/package.py diff --git a/var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch b/var/spack/repos/builtin/packages/samrai/no-tool-build.patch similarity index 100% rename from var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch rename to var/spack/repos/builtin/packages/samrai/no-tool-build.patch diff --git a/var/spack/repos/builtin/packages/SAMRAI/package.py b/var/spack/repos/builtin/packages/samrai/package.py similarity index 100% rename from var/spack/repos/builtin/packages/SAMRAI/package.py rename to var/spack/repos/builtin/packages/samrai/package.py diff --git a/var/spack/repos/builtin/packages/sdl2_image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py similarity index 100% rename from var/spack/repos/builtin/packages/sdl2_image/package.py rename to var/spack/repos/builtin/packages/sdl2-image/package.py diff --git a/var/spack/repos/builtin/packages/the_platinum_searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py similarity index 100% rename from var/spack/repos/builtin/packages/the_platinum_searcher/package.py rename to var/spack/repos/builtin/packages/the-platinum-searcher/package.py diff --git a/var/spack/repos/builtin/packages/the_silver_searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py similarity index 100% rename from var/spack/repos/builtin/packages/the_silver_searcher/package.py rename to var/spack/repos/builtin/packages/the-silver-searcher/package.py diff --git a/var/spack/repos/builtin/packages/uberftp/package.py b/var/spack/repos/builtin/packages/uberftp/package.py index b1b7dada6f4..b0c6c8a42f0 100644 --- a/var/spack/repos/builtin/packages/uberftp/package.py +++ b/var/spack/repos/builtin/packages/uberftp/package.py @@ -35,7 +35,7 @@ class Uberftp(Package): version('2_7', 'faaea2d6e1958c1105cfc9147824e03c') version('2_6', '784210976f259f9d19c0798c19778d34') - depends_on('globus_toolkit') + depends_on('globus-toolkit') def install(self, spec, prefix): configure('--prefix={0}'.format(prefix)) From 9271c69b5d529d49e23ab93df6ccc5464e6bf39d Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 5 Jan 2017 19:25:24 +0100 Subject: [PATCH 19/22] test: fixed 'refresh_builtin_mock' fixture (#2748) --- lib/spack/spack/test/conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 11127d8735c..79d9018c27c 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -122,7 +122,6 @@ def builtin_mock(repo_path): def refresh_builtin_mock(builtin_mock, repo_path): """Refreshes the state of spack.repo""" # Get back the real repository - spack.repo.swap(builtin_mock.real) mock_repo = copy.deepcopy(repo_path) spack.repo.swap(mock_repo) return builtin_mock From 3d54c3c689ac17366325c5a48e8b94f667414f71 Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Thu, 5 Jan 2017 11:15:38 -0800 Subject: [PATCH 20/22] Correct env vars for modulecmd; Fixes #1481 (#2745) Don't override MODULEPATH with PATH, PATH has no modulefiles PEP8 compliance --- lib/spack/spack/operating_systems/cnl.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index 790090d9db4..7acab1cbcbf 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import re -import os from spack.architecture import OperatingSystem from spack.util.executable import * @@ -67,17 +66,10 @@ def find_compiler(self, cmp_cls, *paths): modulecmd = which('modulecmd') modulecmd.add_default_arg('python') - # Save the environment variable to restore later - old_modulepath = os.environ['MODULEPATH'] - # if given any explicit paths, search them for module files too - if paths: - module_paths = ':' + ':'.join(p for p in paths) - os.environ['MODULEPATH'] = module_paths - output = modulecmd( 'avail', cmp_cls.PrgEnv_compiler, output=str, error=str) - matches = re.findall( - r'(%s)/([\d\.]+[\d])' % cmp_cls.PrgEnv_compiler, output) + version_regex = r'(%s)/([\d\.]+[\d])' % cmp_cls.PrgEnv_compiler + matches = re.findall(version_regex, output) for name, version in matches: v = version comp = cmp_cls( @@ -87,8 +79,4 @@ def find_compiler(self, cmp_cls, *paths): compilers.append(comp) - # Restore modulepath environment variable - if paths: - os.environ['MODULEPATH'] = old_modulepath - return compilers From 6a5185a2a7dc728d770179bbb2b3b30b30e830d5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Thu, 4 Aug 2016 13:58:42 +0200 Subject: [PATCH 21/22] Added npm, node.js, and Jupyter dependencies Adds the following packages: node-js py-backports-abc py-functools32 py-pycurl py-vcversione npm py-certifi py-jsonschema py-tornado py-zmq - Added python packages that are dependencies for the Jupyter suite - Update new python packaages to use extension package install function. - Added npm and node-js packages --- .../repos/builtin/packages/node-js/package.py | 105 ++++++++++++++++++ .../repos/builtin/packages/npm/package.py | 45 ++++++++ .../packages/py-backports-abc/package.py | 41 +++++++ .../builtin/packages/py-certifi/package.py | 42 +++++++ .../packages/py-functools32/package.py | 41 +++++++ .../builtin/packages/py-jsonschema/package.py | 43 +++++++ .../builtin/packages/py-pycurl/package.py | 42 +++++++ .../builtin/packages/py-tornado/package.py | 43 +++++++ .../packages/py-vcversioner/package.py | 41 +++++++ .../repos/builtin/packages/py-zmq/package.py | 42 +++++++ 10 files changed, 485 insertions(+) create mode 100644 var/spack/repos/builtin/packages/node-js/package.py create mode 100644 var/spack/repos/builtin/packages/npm/package.py create mode 100644 var/spack/repos/builtin/packages/py-backports-abc/package.py create mode 100644 var/spack/repos/builtin/packages/py-certifi/package.py create mode 100644 var/spack/repos/builtin/packages/py-functools32/package.py create mode 100644 var/spack/repos/builtin/packages/py-jsonschema/package.py create mode 100644 var/spack/repos/builtin/packages/py-pycurl/package.py create mode 100644 var/spack/repos/builtin/packages/py-tornado/package.py create mode 100644 var/spack/repos/builtin/packages/py-vcversioner/package.py create mode 100644 var/spack/repos/builtin/packages/py-zmq/package.py diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py new file mode 100644 index 00000000000..55d7aabc547 --- /dev/null +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import sys +import subprocess + + +class NodeJs(Package): + """Node.js is a JavaScript runtime built on Chrome's V8 JavaScript + engine.""" + + homepage = "https://nodejs.org/" + url = "https://nodejs.org/download/release/v6.3.0/node-v6.3.0.tar.gz" + + version('6.3.0', '8c14e5c89d66d4d060c91b3ba15dfd31') + version('6.2.2', '1120e8bf191fdaee42206d031935210d') + + # variant('bash-completion', default=False, description='Build with bash-completion support for npm') # NOQA: ignore=E501 + variant('debug', default=False, description='Include debugger support') + variant('doc', default=False, description='Compile with documentation') + variant('icu4c', default=False, description='Build with support for all locales instead of just English') + variant('openssl', default=True, description='Build with Spacks OpenSSL instead of the bundled version') + variant('zlib', default=True, description='Build with Spacks zlib instead of the bundled version') + + # depends_on('libtool', type='build') # if sys.platform != 'darwin' + depends_on('pkg-config', type='build') + depends_on('python@2.7:', type='build') + # depends_on('bash-completion', when="+bash-completion") + depends_on('icu4c', when='+icu4c') + depends_on('openssl', when='+openssl') + + def install(self, spec, prefix): + options = [] + options.extend(['--prefix={0}'.format(prefix)]) + + # Note: npm is updated more regularly than node.js, so we build the + # package instead of using the bundled version + options.extend(['--without-npm']) + + # On OSX, the system libtool must be used + # So, we ensure that this is the case by... + if sys.platform == 'darwin': + result_which = subprocess.check_output(["which", "libtool"]) + result_whereis = subprocess.check_output(["whereis", "libtool"]) + assert result_which == result_whereis, ( + 'On OSX the system libtool must be used. Please' + '(temporarily) remove \n %s or its link to libtool from' + 'path') + + # TODO: Add bash-completion + + if '+debug' in spec: + options.extend(['--debug']) + + if '+openssl' in spec: + options.extend([ + '--shared-openssl', + '--shared-openssl-includes=%s' % spec['openssl'].prefix.include, # NOQA: ignore=E501 + '--shared-openssl-libpath=%s' % spec['openssl'].prefix.lib, + ]) + + if '+zlib' in spec: + options.extend([ + '--shared-zlib', + '--shared-zlib-includes=%s' % spec['zlib'].prefix.include, + '--shared-zlib-libpath=%s' % spec['zlib'].prefix.lib, + ]) + + if '+icu4c' in spec: + options.extend(['--with-intl=full-icu']) + # else: + # options.extend(['--with-intl=system-icu']) + + configure(*options) + + if self.run_tests: + make('test') + make('test-addons') + + if '+doc' in spec: + make('doc') + + make('install') diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py new file mode 100644 index 00000000000..36f460e1a29 --- /dev/null +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Npm(Package): + """npm: A package manager for javascript.""" + + homepage = "https://github.com/npm/npm" + # base http://www.npmjs.com/ + url = "https://registry.npmjs.org/npm/-/npm-3.10.5.tgz" + + version('3.10.5', '46002413f4a71de9b0da5b506bf1d992') + + depends_on('node-js', type='build') + + def install(self, spec, prefix): + configure('--prefix={0}'.format(prefix)) + + if self.run_tests: + make('test') + + make('install') diff --git a/var/spack/repos/builtin/packages/py-backports-abc/package.py b/var/spack/repos/builtin/packages/py-backports-abc/package.py new file mode 100644 index 00000000000..d39cec83c89 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-backports-abc/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBackportsAbc(Package): + """Backports_ABC: A backport of recent additions to the 'collections.abc' + module.""" + homepage = "https://github.com/cython/backports_abc" + # base https://pypi.python.org/pypi/backports_abc/ + url = "https://github.com/cython/backports_abc/archive/0.4.tar.gz" + + version('0.4', 'e4246ae689221c9cbe84369fdb59e8c74d02b298') + + extends('python') + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py new file mode 100644 index 00000000000..996a90df8ed --- /dev/null +++ b/var/spack/repos/builtin/packages/py-certifi/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCertifi(Package): + """Certifi: A carefully curated collection of Root Certificates for validating + the trustworthiness of SSL certificates while verifying the identity of TLS + hosts.""" + homepage = "https://github.com/certifi/python-certifi" + # base https://pypi.python.org/pypi/certifi/ + url = "https://github.com/certifi/python-certifi/archive/2016.02.28.tar.gz" + + version('2016.02.28', '5ccfc23bd5e931863f0b01ef3e9d2dbd3bef0e1b') + + extends('python') + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py new file mode 100644 index 00000000000..275d75f4ac1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-functools32/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFunctools32(Package): + """Backport of the functools module from Python 3.2.3 for use on 2.7 and + PyPy.""" + + homepage = "https://github.com/MiCHiLU/python-functools32" + # base https://pypi.python.org/pypi/functools32 + url = "https://pypi.python.org/packages/source/f/functools32/functools32-3.2.3-2.tar.gz" + + version('3.2.3-2', '09f24ffd9af9f6cd0f63cb9f4e23d4b2') + + extends('python', type=nolink) + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py new file mode 100644 index 00000000000..7f6c52a970d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyJsonschema(Package): + """Jsonschema: An(other) implementation of JSON Schema for Python.""" + + homepage = "http://github.com/Julian/jsonschema" + # base https://pypi.python.org/pypi/jsonschema + url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-2.5.1.tar.gz" + + version('2.5.1', '374e848fdb69a3ce8b7e778b47c30640') + + extends('python') + depends_on('py-setuptools', type='build') + depends_on('py-vcversioner') + depends_on('py-functools32') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py new file mode 100644 index 00000000000..9f93c1ca44e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pycurl/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPycurl(Package): + """PycURL is a Python interface to libcurl. PycURL can be used to fetch + objects identified by a URL from a Python program.""" + + homepage = "http://pycurl.io/" + url = "https://pypi.python.org/packages/source/p/pycurl/pycurl-7.43.0.tar.gz" + + version('7.43.0', 'c94bdba01da6004fa38325e9bd6b9760') + + extends('python') + depends_on('py-setuptools', type='build') + depends_on('curl') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py new file mode 100644 index 00000000000..78ead799592 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyTornado(Package): + """Tornado is a Python web framework and asynchronous networking + library.""" + homepage = "https://github.com/tornadoweb/tornado" + # base https://pypi.python.org/pypi/tornado/ + url = "https://github.com/tornadoweb/tornado/archive/v4.4.0.tar.gz" + + version('4.4.0', 'c28675e944f364ee96dda3a8d2527a87ed28cfa3') + + extends('python') + depends_on('py-setuptools', type='build') + depends_on('py-backports-abc') + depends_on('py-certifi') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-vcversioner/package.py b/var/spack/repos/builtin/packages/py-vcversioner/package.py new file mode 100644 index 00000000000..246a3b7b439 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-vcversioner/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyVcversioner(Package): + """Vcversioner: Take version numbers from version control.""" + + homepage = "https://github.com/habnabit/vcversioner" + # base https://pypi.python.org/pypi/vcversioner/ + url = "https://pypi.python.org/packages/source/v/vcversioner/vcversioner-2.16.0.0.tar.gz" + + version('2.16.0.0', 'aab6ef5e0cf8614a1b1140ed5b7f107d') + + extends('python') + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-zmq/package.py b/var/spack/repos/builtin/packages/py-zmq/package.py new file mode 100644 index 00000000000..1dfe07a8fb0 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-zmq/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyZmq(Package): + """PyZMQ: Python bindings for zeromq.""" + homepage = "https://github.com/zeromq/pyzmq" + # base https://pypi.python.org/pypi/pyzmq/ + url = "https://github.com/zeromq/pyzmq/archive/v14.7.0.tar.gz" + + version('14.7.0', 'bf304fb73d72aee314ff82d3554328c179938ecf') + + extends('python') + depends_on('py-setuptools', type='build') + depends_on('py-cython') + depends_on('zeromq') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) From 8c650303ffdd02c4be273efbce1674706c0182cd Mon Sep 17 00:00:00 2001 From: Matthew Krafczyk Date: Fri, 11 Nov 2016 22:16:30 -0500 Subject: [PATCH 22/22] Add dependencies and finish the py-tornado package. This adds the following packages: py-backports-shutil-get-terminal-size py-nbformat py-backports-ssl-match-hostname py-pathlib2 py-entrypoints py-pickleshare py-futures py-pip py-ipykernel py-prompt-toolkit py-ipython-genutils py-ptyprocess py-ipywidgets py-simplegeneric py-jupyter-client py-singledispatch py-jupyter-console py-terminado py-jupyter-core py-traitlets py-jupyter-notebook py-wcwidth py-monotonic py-widgetsnbextension py-nbconvert --- .../repos/builtin/packages/node-js/package.py | 29 ++++---- .../repos/builtin/packages/npm/package.py | 11 +++- .../package.py | 43 ++++++++++++ .../package.py | 41 ++++++++++++ .../packages/py-entrypoints/package.py | 40 +++++++++++ .../packages/py-functools32/package.py | 2 +- .../builtin/packages/py-futures/package.py | 41 ++++++++++++ .../builtin/packages/py-ipykernel/package.py | 56 ++++++++++++++++ .../packages/py-ipython-genutils/package.py | 42 ++++++++++++ .../builtin/packages/py-ipython/package.py | 9 ++- .../builtin/packages/py-ipywidgets/package.py | 45 +++++++++++++ .../builtin/packages/py-jsonschema/package.py | 2 +- .../packages/py-jupyter-client/package.py | 52 +++++++++++++++ .../packages/py-jupyter-console/package.py | 51 ++++++++++++++ .../packages/py-jupyter-core/package.py | 52 +++++++++++++++ .../packages/py-jupyter-notebook/package.py | 66 +++++++++++++++++++ .../builtin/packages/py-monotonic/package.py | 41 ++++++++++++ .../builtin/packages/py-nbconvert/package.py | 54 +++++++++++++++ .../builtin/packages/py-nbformat/package.py | 47 +++++++++++++ .../builtin/packages/py-pathlib2/package.py | 42 ++++++++++++ .../builtin/packages/py-pexpect/package.py | 6 +- .../packages/py-pickleshare/package.py | 41 ++++++++++++ .../repos/builtin/packages/py-pip/package.py | 41 ++++++++++++ .../packages/py-prompt-toolkit/package.py | 43 ++++++++++++ .../builtin/packages/py-ptyprocess/package.py | 41 ++++++++++++ .../builtin/packages/py-pycurl/package.py | 3 +- .../packages/py-simplegeneric/package.py | 43 ++++++++++++ .../packages/py-singledispatch/package.py | 43 ++++++++++++ .../builtin/packages/py-terminado/package.py | 43 ++++++++++++ .../builtin/packages/py-tornado/package.py | 14 ++-- .../builtin/packages/py-traitlets/package.py | 51 ++++++++++++++ .../builtin/packages/py-wcwidth/package.py | 41 ++++++++++++ .../packages/py-widgetsnbextension/package.py | 43 ++++++++++++ .../repos/builtin/packages/py-zmq/package.py | 5 +- 34 files changed, 1199 insertions(+), 25 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py create mode 100644 var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py create mode 100644 var/spack/repos/builtin/packages/py-entrypoints/package.py create mode 100644 var/spack/repos/builtin/packages/py-futures/package.py create mode 100644 var/spack/repos/builtin/packages/py-ipykernel/package.py create mode 100644 var/spack/repos/builtin/packages/py-ipython-genutils/package.py create mode 100644 var/spack/repos/builtin/packages/py-ipywidgets/package.py create mode 100644 var/spack/repos/builtin/packages/py-jupyter-client/package.py create mode 100644 var/spack/repos/builtin/packages/py-jupyter-console/package.py create mode 100644 var/spack/repos/builtin/packages/py-jupyter-core/package.py create mode 100644 var/spack/repos/builtin/packages/py-jupyter-notebook/package.py create mode 100644 var/spack/repos/builtin/packages/py-monotonic/package.py create mode 100644 var/spack/repos/builtin/packages/py-nbconvert/package.py create mode 100644 var/spack/repos/builtin/packages/py-nbformat/package.py create mode 100644 var/spack/repos/builtin/packages/py-pathlib2/package.py create mode 100644 var/spack/repos/builtin/packages/py-pickleshare/package.py create mode 100644 var/spack/repos/builtin/packages/py-pip/package.py create mode 100644 var/spack/repos/builtin/packages/py-prompt-toolkit/package.py create mode 100644 var/spack/repos/builtin/packages/py-ptyprocess/package.py create mode 100644 var/spack/repos/builtin/packages/py-simplegeneric/package.py create mode 100644 var/spack/repos/builtin/packages/py-singledispatch/package.py create mode 100644 var/spack/repos/builtin/packages/py-terminado/package.py create mode 100644 var/spack/repos/builtin/packages/py-traitlets/package.py create mode 100644 var/spack/repos/builtin/packages/py-wcwidth/package.py create mode 100644 var/spack/repos/builtin/packages/py-widgetsnbextension/package.py diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 55d7aabc547..8f129bd3e09 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -34,22 +34,23 @@ class NodeJs(Package): homepage = "https://nodejs.org/" url = "https://nodejs.org/download/release/v6.3.0/node-v6.3.0.tar.gz" + version('7.1.0', '1db5df2cb025f9c70e83d9cf21c4266a') version('6.3.0', '8c14e5c89d66d4d060c91b3ba15dfd31') version('6.2.2', '1120e8bf191fdaee42206d031935210d') # variant('bash-completion', default=False, description='Build with bash-completion support for npm') # NOQA: ignore=E501 - variant('debug', default=False, description='Include debugger support') - variant('doc', default=False, description='Compile with documentation') - variant('icu4c', default=False, description='Build with support for all locales instead of just English') - variant('openssl', default=True, description='Build with Spacks OpenSSL instead of the bundled version') - variant('zlib', default=True, description='Build with Spacks zlib instead of the bundled version') + variant('debug', default=False, description='Include debugger support') + variant('doc', default=False, description='Compile with documentation') + variant('icu4c', default=False, description='Build with support for all locales instead of just English') + variant('openssl', default=True, description='Build with Spacks OpenSSL instead of the bundled version') + variant('zlib', default=True, description='Build with Spacks zlib instead of the bundled version') - # depends_on('libtool', type='build') # if sys.platform != 'darwin' - depends_on('pkg-config', type='build') - depends_on('python@2.7:', type='build') + depends_on('libtool', type='build', when=sys.platform != 'darwin') + depends_on('pkg-config', type='build') + depends_on('python@2.7:2.7.999', type='build') # depends_on('bash-completion', when="+bash-completion") - depends_on('icu4c', when='+icu4c') - depends_on('openssl', when='+openssl') + depends_on('icu4c', when='+icu4c') + depends_on('openssl', when='+openssl') def install(self, spec, prefix): options = [] @@ -62,8 +63,12 @@ def install(self, spec, prefix): # On OSX, the system libtool must be used # So, we ensure that this is the case by... if sys.platform == 'darwin': - result_which = subprocess.check_output(["which", "libtool"]) - result_whereis = subprocess.check_output(["whereis", "libtool"]) + process_pipe = subprocess.Popen(["which", "libtool"], + stdout=subprocess.PIPE) + result_which = process_pipe.communicate()[0] + process_pipe = subprocess.Popen(["whereis", "libtool"], + stdout=subprocess.PIPE) + result_whereis = process_pipe.communicate()[0] assert result_which == result_whereis, ( 'On OSX the system libtool must be used. Please' '(temporarily) remove \n %s or its link to libtool from' diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py index 36f460e1a29..7910a8af9ba 100644 --- a/var/spack/repos/builtin/packages/npm/package.py +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -22,6 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os from spack import * @@ -32,9 +33,17 @@ class Npm(Package): # base http://www.npmjs.com/ url = "https://registry.npmjs.org/npm/-/npm-3.10.5.tgz" + version('3.10.9', 'ec1eb22b466ce87cdd0b90182acce07f') version('3.10.5', '46002413f4a71de9b0da5b506bf1d992') - depends_on('node-js', type='build') + depends_on('node-js') + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + npm_config_cache_dir = "%s/npm-cache" % dependent_spec.prefix + if not os.path.isdir(npm_config_cache_dir): + mkdir(npm_config_cache_dir) + run_env.set('npm_config_cache', npm_config_cache_dir) + spack_env.set('npm_config_cache', npm_config_cache_dir) def install(self, spec, prefix): configure('--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py new file mode 100644 index 00000000000..5158fa3ad4a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBackportsShutilGetTerminalSize(Package): + """A backport of the get_terminal_size function + from Python 3.3's shutil.""" + + homepage = "https://pypi.python.org/pypi/backports.shutil_get_terminal_size" + url = "https://pypi.io/packages/source/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz" + + version('1.0.0', '03267762480bd86b50580dc19dff3c66') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@:3.2.999') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py new file mode 100644 index 00000000000..13b3a1abd48 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBackportsSslMatchHostname(Package): + """The ssl.match_hostname() function from Python 3.5""" + + homepage = "https://pypi.python.org/pypi/backports.ssl_match_hostname" + url = "https://pypi.io/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.5.0.1.tar.gz" + + version('3.5.0.1', 'c03fc5e2c7b3da46b81acf5cbacfe1e6') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py new file mode 100644 index 00000000000..944999d69b8 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyEntrypoints(Package): + """Discover and load entry points from installed packages.""" + + homepage = "https://pypi.python.org/pypi/entrypoints" + url = "https://files.pythonhosted.org/packages/f8/ad/0e77a853c745a15981ab51fa9a0cb4eca7a7a007b4c1970106ee6ba01e0c/entrypoints-0.2.2-py2.py3-none-any.whl" + + version('0.2.2', '73bd7ce92c19b25dc5a20aff41be996a', expand=False) + + depends_on('py-pip', type='build') + + def install(self, spec, prefix): + pip = which('pip') + pip('install', self.stage.archive_file, '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py index 275d75f4ac1..dc4e49d278f 100644 --- a/var/spack/repos/builtin/packages/py-functools32/package.py +++ b/var/spack/repos/builtin/packages/py-functools32/package.py @@ -35,7 +35,7 @@ class PyFunctools32(Package): version('3.2.3-2', '09f24ffd9af9f6cd0f63cb9f4e23d4b2') - extends('python', type=nolink) + extends('python') def install(self, spec, prefix): setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-futures/package.py b/var/spack/repos/builtin/packages/py-futures/package.py new file mode 100644 index 00000000000..20bf4c7dae7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-futures/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFutures(Package): + """Backport of the concurrent.futures package from Python 3.2""" + + homepage = "https://pypi.python.org/pypi/futures" + url = "https://pypi.io/packages/source/f/futures/futures-3.0.5.tar.gz" + + version('3.0.5', 'ced2c365e518242512d7a398b515ff95') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py new file mode 100644 index 00000000000..d68cfa2ae4a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyIpykernel(Package): + """IPython Kernel for Jupyter""" + + homepage = "https://pypi.python.org/pypi/ipykernel" + url = "https://github.com/ipython/ipykernel/archive/4.5.0.tar.gz" + + version('4.5.0', 'ea6aaf431b100452905aaca208edac72') + version('4.4.1', 'c0033e524aa9e05ed18879641ffe6e0f') + version('4.4.0', '8e626a1708ceff83412180d2ff2f3e57') + version('4.3.1', '971eee85d630eb4bafcd52531c79673f') + version('4.3.0', '5961164fe908faf798232a265ed48c73') + version('4.2.2', '4ac8ae11f1eef4920bf4a5383e13ab50') + version('4.2.1', 'de583ee9c84db6296269ce7de0afb63f') + version('4.2.0', 'fc535e4e020a41cd2b55508302b155bb') + version('4.1.1', '51376850c46fb006e1f8d1cd353507c5') + version('4.1.0', '638a43e4f8a15872f749090c3f0827b6') + + extends('python') + + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-setuptools', type='build') + depends_on('py-traitlets@4.1.0:') + depends_on('py-tornado@4.0:') + depends_on('py-ipython@4.0:') + depends_on('py-jupyter-client') + depends_on('py-pexpect') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py new file mode 100644 index 00000000000..75b20e08e9d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyIpythonGenutils(Package): + """Vestigial utilities from IPython""" + + homepage = "https://pypi.python.org/pypi/ipython_genutils" + url = "https://pypi.io/packages/source/i/ipython_genutils/ipython_genutils-0.1.0.tar.gz" + + version('0.1.0', '9a8afbe0978adbcbfcb3b35b2d015a56') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index d7ee2e3c95b..0c7cb7ab678 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -29,14 +29,19 @@ class PyIpython(Package): """IPython provides a rich toolkit to help you make the most out of using Python interactively.""" homepage = "https://pypi.python.org/pypi/ipython" - url = "https://pypi.python.org/packages/source/i/ipython/ipython-2.3.1.tar.gz" + url = "https://pypi.io/packages/source/i/ipython/ipython-2.3.1.tar.gz" - version('2.3.1', '2b7085525dac11190bfb45bb8ec8dcbf') + version('5.1.0', '47c8122420f65b58784cb4b9b4af35e3') version('3.1.0', 'a749d90c16068687b0ec45a27e72ef8f') + version('2.3.1', '2b7085525dac11190bfb45bb8ec8dcbf') extends('python') depends_on('py-pygments', type=nolink) depends_on('py-setuptools', type=nolink) + depends_on('py-backports-shutil-get-terminal-size', when="^python@:3.2.999") + depends_on('py-pathlib2', when="^python@:3.3.999") + depends_on('py-pickleshare') + depends_on('py-simplegeneric') def install(self, spec, prefix): setup_py('install', '--prefix=%s' % prefix) diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py new file mode 100644 index 00000000000..c9b2e9c168d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyIpywidgets(Package): + """IPython widgets for the Jupyter Notebook""" + + homepage = "https://github.com/ipython/ipywidgets" + url = "https://github.com/ipython/ipywidgets/archive/5.2.2.tar.gz" + + version('5.2.2', '112f3daa4aa0f42f8dda831cea3649c8') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-ipython@4.0.0:') + depends_on('py-ipykernel@4.2.2:') + depends_on('py-traitlets@4.2.1:') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py index 7f6c52a970d..d41ee439dbb 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -37,7 +37,7 @@ class PyJsonschema(Package): extends('python') depends_on('py-setuptools', type='build') depends_on('py-vcversioner') - depends_on('py-functools32') + depends_on('py-functools32', when="^python@2.7") def install(self, spec, prefix): setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-jupyter-client/package.py b/var/spack/repos/builtin/packages/py-jupyter-client/package.py new file mode 100644 index 00000000000..c8268c8aa2d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jupyter-client/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyJupyterClient(Package): + """Jupyter protocol client APIs""" + + homepage = "https://github.com/jupyter/jupyter_client" + url = "https://github.com/jupyter/jupyter_client/archive/4.4.0.tar.gz" + + version('4.4.0', 'a0bd6fe6ba7c504fbc962a88a2a56a90') + version('4.3.0', '257d9f5429dac4d9511db84d201d3a9e') + version('4.2.2', '988ea87554215a83c6ad52e554d8d8c4') + version('4.2.1', '16994e5cace322c777456bc5a26502d7') + version('4.2.0', '61c43c9f243e42f1945fae5d56d0d23c') + version('4.1.1', '8436e4a3266a442f576cdfef39dc0e19') + version('4.1.0', 'cf42048b889c8434fbb5813a9eec1d34') + version('4.0.0', '00fa63c67cb3adf359d09dc4d803aff5') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-traitlets') + depends_on('py-jupyter-core') + depends_on('py-zmq@13:') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py new file mode 100644 index 00000000000..1cc432e2e09 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyJupyterConsole(Package): + """Jupyter Terminal Console""" + + homepage = "https://github.com/jupyter/jupyter_console" + url = "https://github.com/jupyter/jupyter_console/archive/5.0.0.tar.gz" + + version('5.0.0', '08a9fde32a45c9e2e0b4cec6eca249c2') + version('4.1.1', 'a8b077ae0a5c57e9518ac039ad5febb8') + version('4.1.0', '9c655076262760bdbeeada9d7f586237') + version('4.0.3', '0e928ea261e7f8154698cf69ed4f2459') + version('4.0.2', 'f2e174938c91136549b908bd39fa5d59') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-jupyter-client') + depends_on('py-ipython') + depends_on('py-ipykernel') + depends_on('py-pygments') + depends_on('py-prompt-toolkit@1.0.0:1.999.999') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py new file mode 100644 index 00000000000..ae4f1924370 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyJupyterCore(Package): + """Core Jupyter functionality""" + + homepage = "http://jupyter-core.readthedocs.io/" + url = "https://github.com/jupyter/jupyter_core/archive/4.2.0.tar.gz" + + version('4.2.0', '25c1fc68b1b73c0a2e616c76f02bf061') + version('4.1.1', '2fce5ff60291bc01b39b1f00b3cbb784') + version('4.1.0', 'b7e928f965f68aef13fea1bf9d6384aa') + version('4.0.6', '50a73c3a4a8ed047a3674d2b5274cc3b') + version('4.0.5', 'c09bd3be58f141b49b90cdb2ba22f77f') + version('4.0.4', '5b6ca0e73bf559f4fe6106a6e412f913') + version('4.0.3', 'f2608f6e92f992ec8e37646b52c922a6') + version('4.0.2', 'ae0d0197c4febf43c050a97ac6277263') + version('4.0.1', 'f849136b2badaaba2a8a3b397bf04639') + version('4.0' , 'b6b37cb4f40bd0fcd20433cb2cc7a4c1') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-traitlets') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py new file mode 100644 index 00000000000..c9eb51d2d4e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyJupyterNotebook(Package): + """Jupyter Interactive Notebook""" + + homepage = "https://github.com/jupyter/notebook" + url = "https://github.com/jupyter/notebook/archive/4.2.3.tar.gz" + + version('4.2.3', '5c6b0b1303adacd8972c4db21eda3e98') + version('4.2.2', '7f9717ae4fed930d187a44c0707b6379') + version('4.2.1', '4286f1eaf608257bd69cad4042c7c2fe') + version('4.2.0', '136be6b72fe9db7f0269dc7fa5652a62') + version('4.1.0', '763ab54b3fc69f6225b9659b6994e756') + version('4.0.6', 'd70d8a6d01893f4b64df9edbc0e13b52') + version('4.0.5', '2681a70e4c62aafe7ce69f1da5799ac8') + version('4.0.4', 'ab72f28f6af8107d71241a4110e92c05') + version('4.0.3', '119beea793865ee4b1673a50043ead2a') + version('4.0.2', '77f371e9a23a840d14d8a60fee7ba1b7') + + variant('terminal', default=False, description="Enable terminal functionality") + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('npm', type='build') + depends_on('py-jinja2') + depends_on('py-tornado@4:') + depends_on('py-ipython-genutils') + depends_on('py-traitlets') + depends_on('py-jupyter-core') + depends_on('py-jupyter-client') + depends_on('py-jupyter-console') + depends_on('py-nbformat') + depends_on('py-nbconvert') + depends_on('py-ipykernel') + depends_on('py-terminado@0.3.3:', when="+terminal") + depends_on('py-ipywidgets', when="+terminal") + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py new file mode 100644 index 00000000000..6584aa248c4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-monotonic/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyMonotonic(Package): + """An implementation of time.monotonic() for Python 2 & < 3.3""" + + homepage = "https://pypi.python.org/pypi/monotonic" + url = "https://pypi.io/packages/source/m/monotonic/monotonic-1.2.tar.gz" + + version('1.2', 'd14c93aabc3d6af25ef086b032b123cf') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py new file mode 100644 index 00000000000..41a1c896869 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyNbconvert(Package): + """Jupyter Notebook Conversion""" + + homepage = "https://github.com/jupyter/nbconvert" + url = "https://github.com/jupyter/nbconvert/archive/4.2.0.tar.gz" + + version('4.2.0' , '8bd88771cc00f575d5edcd0b5197f964') + version('4.1.0' , '06655576713ba1ff7cece2b92760c187') + version('4.0.0' , '9661620b1e10a7b46f314588d2d0932f') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('py-pycurl', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-mistune') + depends_on('py-jinja2') + depends_on('py-pygments') + depends_on('py-traitlets') + depends_on('py-jupyter-core') + depends_on('py-nbformat') + depends_on('py-entrypoints') + depends_on('py-tornado') + depends_on('py-jupyter-client') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py new file mode 100644 index 00000000000..f45236fc34a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nbformat/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyNbformat(Package): + """The Jupyter Notebook format""" + + homepage = "https://github.com/jupyter/nbformat" + url = "https://github.com/jupyter/nbformat/archive/4.1.0.tar.gz" + + version('4.1.0', '826b4fc4ec42553b20144f53b57b4e7b') + version('4.0.1', 'ab7172e517c9d561c0c01eef5631b4c8') + version('4.0.0', '7cf61359fa4e9cf3ef5e969e2fcb909e') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('py-ipython-genutils') + depends_on('py-traitlets') + depends_on('py-jsonschema') + depends_on('py-jupyter-core') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py new file mode 100644 index 00000000000..8db18261b80 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPathlib2(Package): + """Backport of pathlib from python 3.4""" + + homepage = "https://pypi.python.org/pypi/pathlib2" + url = "https://pypi.io/packages/source/p/pathlib2/pathlib2-2.1.0.tar.gz" + + version('2.1.0', '38e4f58b4d69dfcb9edb49a54a8b28d2') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@:3.3.999') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py index 9e43e4526eb..99b69fc30bb 100644 --- a/var/spack/repos/builtin/packages/py-pexpect/package.py +++ b/var/spack/repos/builtin/packages/py-pexpect/package.py @@ -28,11 +28,13 @@ class PyPexpect(Package): """Pexpect allows easy control of interactive console applications.""" homepage = "https://pypi.python.org/pypi/pexpect" - url = "https://pypi.python.org/packages/source/p/pexpect/pexpect-3.3.tar.gz" + url = "https://pypi.io/packages/source/p/pexpect/pexpect-4.2.1.tar.gz" - version('3.3', '0de72541d3f1374b795472fed841dce8') + version('4.2.1', '3694410001a99dff83f0b500a1ca1c95') extends('python') + + depends_on('py-ptyprocess') def install(self, spec, prefix): setup_py('install', '--prefix=%s' % prefix) diff --git a/var/spack/repos/builtin/packages/py-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py new file mode 100644 index 00000000000..09a810869db --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPickleshare(Package): + """Tiny 'shelve'-like database with concurrency support""" + + homepage = "https://pypi.python.org/pypi/pickleshare" + url = "https://pypi.io/packages/source/p/pickleshare/pickleshare-0.7.4.tar.gz" + + version('0.7.4', '6a9e5dd8dfc023031f6b7b3f824cab12') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py new file mode 100644 index 00000000000..dca73f763f3 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPip(Package): + """The PyPA recommended tool for installing Python packages.""" + + homepage = "https://pypi.python.org/pypi/pip" + url = "https://pypi.io/packages/source/p/pip/pip-9.0.1.tar.gz" + + version('9.0.1', '35f01da33009719497f01a4ba69d63c9') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py new file mode 100644 index 00000000000..5c81cf17010 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPromptToolkit(Package): + """Library for building powerful interactive command lines in Python""" + + homepage = "https://pypi.python.org/pypi/prompt_toolkit" + url = "https://pypi.io/packages/source/p/prompt_toolkit/prompt_toolkit-1.0.9.tar.gz" + + version('1.0.9', 'a39f91a54308fb7446b1a421c11f227c') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('py-six@1.9.0:') + depends_on('py-wcwidth') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-ptyprocess/package.py b/var/spack/repos/builtin/packages/py-ptyprocess/package.py new file mode 100644 index 00000000000..fc65e617baf --- /dev/null +++ b/var/spack/repos/builtin/packages/py-ptyprocess/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPtyprocess(Package): + """Run a subprocess in a pseudo terminal""" + + homepage = "https://pypi.python.org/pypi/ptyprocess" + url = "https://pypi.io/packages/source/p/ptyprocess/ptyprocess-0.5.1.tar.gz" + + version('0.5.1', '94e537122914cc9ec9c1eadcd36e73a1') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py index 9f93c1ca44e..ab62440f8ea 100644 --- a/var/spack/repos/builtin/packages/py-pycurl/package.py +++ b/var/spack/repos/builtin/packages/py-pycurl/package.py @@ -35,8 +35,9 @@ class PyPycurl(Package): version('7.43.0', 'c94bdba01da6004fa38325e9bd6b9760') extends('python') + depends_on('python@2.6:') depends_on('py-setuptools', type='build') - depends_on('curl') + depends_on('curl@7.19.0:') def install(self, spec, prefix): setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-simplegeneric/package.py b/var/spack/repos/builtin/packages/py-simplegeneric/package.py new file mode 100644 index 00000000000..b2ee72822b9 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-simplegeneric/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySimplegeneric(Package): + """Simple generic functions (similar to Python's own len(), + pickle.dump(), etc.)""" + + homepage = "https://pypi.python.org/pypi/simplegeneric" + url = "https://pypi.io/packages/source/s/simplegeneric/simplegeneric-0.8.zip" + + version('0.8.1', 'f9c1fab00fd981be588fc32759f474e3') + version('0.8', 'eaa358a5f9517a8b475d03fbee3ec90f') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-singledispatch/package.py b/var/spack/repos/builtin/packages/py-singledispatch/package.py new file mode 100644 index 00000000000..05d8c16b44b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-singledispatch/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySingledispatch(Package): + """This library brings functools.singledispatch to Python 2.6-3.3.""" + + homepage = "https://pypi.python.org/pypi/singledispatch" + url = "https://pypi.io/packages/source/s/singledispatch/singledispatch-3.4.0.3.tar.gz" + + version('3.4.0.3', 'af2fc6a3d6cc5a02d0bf54d909785fcb') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('py-six') + depends_on('py-ordereddict', when="^python@:2.6.999") + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py new file mode 100644 index 00000000000..e9db560cd56 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-terminado/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyTerminado(Package): + """Terminals served to term.js using Tornado websockets""" + + homepage = "https://pypi.python.org/pypi/terminado" + url = "https://pypi.io/packages/source/t/terminado/terminado-0.6.tar.gz" + + version('0.6', '5b6c65da27fe1ed07a9f80f0588cdaba') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('py-tornado@4:') + depends_on('py-ptyprocess') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index 78ead799592..0de77a2d574 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -33,11 +33,17 @@ class PyTornado(Package): url = "https://github.com/tornadoweb/tornado/archive/v4.4.0.tar.gz" version('4.4.0', 'c28675e944f364ee96dda3a8d2527a87ed28cfa3') - + extends('python') + depends_on('py-setuptools', type='build') - depends_on('py-backports-abc') - depends_on('py-certifi') - + + # requirements from setup.py + depends_on('py-backports-ssl-match-hostname', when='^python@:2.7.8') + depends_on('py-singledispatch', when='^python@:3.3') + depends_on('py-certifi', when='^python@:3.3') + depends_on('py-backports-abc@0.4:', when='^python@:3.4') + def install(self, spec, prefix): + setup_py('build') setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py new file mode 100644 index 00000000000..c414dba758d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-traitlets/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyTraitlets(Package): + """Traitlets Python config system""" + + homepage = "https://pypi.python.org/pypi/traitlets" + url = "https://github.com/ipython/traitlets/archive/4.3.1.tar.gz" + + version('4.3.1', '146a4885ea64079f62a33b2049841543') + version('4.3.0', '17af8d1306a401c42dbc92a080722422') + version('4.2.2', 'ffc03056dc5c8d1fc5dbd6eac76e1e46') + version('4.2.1', 'fc7f46a76b99ebc5068f99033d268dcf') + version('4.2.0', '53553a10d124e264fd2e234d0571b7d0') + version('4.1.0', 'd5bc75c7bd529afb40afce86c2facc3a') + version('4.0.0', 'b5b95ea5941fd9619b4704dfd8201568') + version('4.0' , '14544e25ccf8e920ed1cbf833852481f') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('py-decorator', type=nolink) + depends_on('py-ipython-genutils') + depends_on('py-enum34', when='^python@:3.3') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py new file mode 100644 index 00000000000..2740d749b59 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyWcwidth(Package): + """Measures number of Terminal column cells of wide-character codes""" + + homepage = "https://pypi.python.org/pypi/wcwidth" + url = "https://pypi.io/packages/source/w/wcwidth/wcwidth-0.1.7.tar.gz" + + version('0.1.7', 'b3b6a0a08f0c8a34d1de8cf44150a4ad') + + extends('python') + + depends_on('py-setuptools', type='build') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py new file mode 100644 index 00000000000..c0833806f87 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyWidgetsnbextension(Package): + """IPython HTML widgets for Jupyter""" + + homepage = "https://pypi.python.org/pypi/widgetsnbextension" + url = "https://pypi.io/packages/source/w/widgetsnbextension/widgetsnbextension-1.2.6.tar.gz" + + version('1.2.6', '0aa4e152c9ba2d704389dc2453f448c7') + + extends('python') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.7.999,3.3:') + depends_on('py-jupyter-notebook@4.2.0:') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/py-zmq/package.py b/var/spack/repos/builtin/packages/py-zmq/package.py index 1dfe07a8fb0..ff2373c2f4c 100644 --- a/var/spack/repos/builtin/packages/py-zmq/package.py +++ b/var/spack/repos/builtin/packages/py-zmq/package.py @@ -31,11 +31,14 @@ class PyZmq(Package): # base https://pypi.python.org/pypi/pyzmq/ url = "https://github.com/zeromq/pyzmq/archive/v14.7.0.tar.gz" + version('16.0.2', '4cf14a2995742253b2b009541f4436f4') version('14.7.0', 'bf304fb73d72aee314ff82d3554328c179938ecf') extends('python') depends_on('py-setuptools', type='build') - depends_on('py-cython') + depends_on('py-cython@0.16:') + depends_on('py-py') + depends_on('py-cffi') depends_on('zeromq') def install(self, spec, prefix):