diff options
254 files changed, 1999 insertions, 228 deletions
diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst index 5db2ca0285..93c2ee33c6 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 bee75cec4b..f1a5bc5cdb 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -215,7 +215,7 @@ class PythonGuess(DefaultGuess): 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 @@ class BuildSystemGuesser(object): (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/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index 790090d9db..7acab1cbcb 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 @@ class Cnl(OperatingSystem): 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 @@ class Cnl(OperatingSystem): compilers.append(comp) - # Restore modulepath environment variable - if paths: - os.environ['MODULEPATH'] = old_modulepath - return compilers diff --git a/lib/spack/spack/test/build_system_guess.py b/lib/spack/spack/test/build_system_guess.py index 97a9d67b47..86c1c9da13 100644 --- a/lib/spack/spack/test/build_system_guess.py +++ b/lib/spack/spack/test/build_system_guess.py @@ -36,7 +36,7 @@ import spack.stage ('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 3cc5c70a5f..b7cad503a3 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -240,7 +240,7 @@ class TestConcretize(object): 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/conftest.py b/lib/spack/spack/test/conftest.py index 11127d8735..79d9018c27 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 diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index d2ebf8dfb4..f10c3a37e9 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 13219ef878..e5e60e3045 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -129,7 +129,7 @@ class TestMirror(object): 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 @@ class TestMirror(object): 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 c3c3923855..c75d7cdcc7 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 @@ class PackageSanityTest(unittest.TestCase): # 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 39bbe4a954..6ae8a33a24 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/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 1466698dbf..c4718d56b8 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -154,6 +154,20 @@ class UrlParseTest(unittest.TestCase): 'foo-bar', '1.21', 'http://example.com/foo_bar-1.21.tar.gz') + def test_version_gitlab(self): + self.check( + 'vtk', '7.0.0', + 'https://gitlab.kitware.com/vtk/vtk/repository/' + 'archive.tar.bz2?ref=v7.0.0') + self.check( + 'icet', '1.2.3', + 'https://gitlab.kitware.com/icet/icet/repository/' + 'archive.tar.gz?ref=IceT-1.2.3') + self.check( + 'foo', '42.1337', + 'http://example.com/org/foo/repository/' + 'archive.zip?ref=42.1337bar') + def test_version_github(self): self.check( 'yajl', '1.0.5', diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 85311ba64c..a1eec6067e 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -106,19 +106,22 @@ def split_url_extension(path): 1. https://github.com/losalamos/CLAMR/blob/packages/PowerParser_v2.0.7.tgz?raw=true 2. http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin.tar.gz + 3. https://gitlab.kitware.com/vtk/vtk/repository/archive.tar.bz2?ref=v7.0.0 In (1), the query string needs to be stripped to get at the - extension, but in (2), the filename is IN a single final query + extension, but in (2) & (3), the filename is IN a single final query argument. This strips the URL into three pieces: prefix, ext, and suffix. The suffix contains anything that was stripped off the URL to get at the file extension. In (1), it will be '?raw=true', but - in (2), it will be empty. e.g.: + in (2), it will be empty. In (3) the suffix is a parameter that follows + after the file extension, e.g.: 1. ('https://github.com/losalamos/CLAMR/blob/packages/PowerParser_v2.0.7', '.tgz', '?raw=true') 2. ('http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin', '.tar.gz', None) + 3. ('https://gitlab.kitware.com/vtk/vtk/repository/archive', '.tar.bz2', '?ref=v7.0.0') """ prefix, ext, suffix = path, '', '' @@ -203,6 +206,15 @@ def parse_version_offset(path, debug=False): # https://github.com/hpc/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz (r'github.com/[^/]+/[^/]+/releases/download/v?([^/]+)/.*$', path), + # GitLab syntax: + # {baseUrl}{/organization}{/projectName}/repository/archive.{fileEnding}?ref={gitTag} + # as with github releases, we hope a version can be found in the + # git tag + # Search dotted versions: + # e.g., https://gitlab.kitware.com/vtk/vtk/repository/archive.tar.bz2?ref=v7.0.0 + # e.g., https://example.com/org/repo/repository/archive.tar.bz2?ref=SomePrefix-2.1.1 + (r'\?ref=(?:.*-|v)*((\d+\.)+\d+).*$', suffix), + # e.g. boost_1_39_0 (r'((\d+_)+\d+)$', stem), @@ -291,6 +303,7 @@ def parse_name_offset(path, v=None, debug=False): (r'/([^/]+)/(tarball|zipball)/', path), (r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % v, path), (r'github.com/[^/]+/([^/]+)/archive', path), + (r'[^/]+/([^/]+)/repository/archive', path), # gitlab (r'([^/]+)[_.-]v?%s' % v, stem), # prefer the stem (r'([^/]+)%s' % v, stem), diff --git a/var/spack/repos/builtin.mock/packages/direct_mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py index f38589ad4d..f38589ad4d 100644 --- a/var/spack/repos/builtin.mock/packages/direct_mpich/package.py +++ b/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 index bbbf196129..77b8022b1c 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 index 3f135b002e..3f135b002e 100644 --- a/var/spack/repos/builtin.mock/packages/simple_inheritance/package.py +++ b/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 index 2129d9788b..2129d9788b 100644 --- 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 diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index 61e6dca433..3bd1f0b5d0 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/espressopp/package.py b/var/spack/repos/builtin/packages/espressopp/package.py new file mode 100644 index 0000000000..ddc98f07c5 --- /dev/null +++ b/var/spack/repos/builtin/packages/espressopp/package.py @@ -0,0 +1,79 @@ +############################################################################## +# 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 Espressopp(CMakePackage): + """ESPResSo++ is an extensible, flexible, fast and parallel simulation + software for soft matter research. It is a highly versatile software + package for the scientific simulation and analysis of coarse-grained + atomistic or bead-spring models as they are used in soft matter research + """ + homepage = "https://espressopp.github.io" + url = "https://github.com/espressopp/espressopp/tarball/v1.9.4.1" + + version('develop', git='https://github.com/espressopp/espressopp.git', branch='master') + version('1.9.4.1', '0da74a6d4e1bfa6a2a24fca354245a4f') + version('1.9.4', 'f2a27993a83547ad014335006eea74ea') + + variant('debug', default=False, description='Build debug version') + variant('ug', default=False, description='Build user guide') + variant('pdf', default=False, description='Build user guide in pdf format') + variant('dg', default=False, description='Build developer guide') + + depends_on("cmake@2.8:", type='build') + depends_on("mpi") + depends_on("boost+serialization+filesystem+system+python+mpi", when='@1.9.4:') + extends("python") + depends_on("python@2:2.7.13") + depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type='nolink') + depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type='nolink') + depends_on("fftw") + depends_on("py-sphinx", when="+ug", type='build') + depends_on("py-sphinx", when="+pdf", type='build') + depends_on("texlive", when="+pdf", type='build') + depends_on("doxygen", when="+dg", type='build') + + def cmake_args(self): + spec = self.spec + options = [] + options.extend(['-DEXTERNAL_MPI4PY=ON', '-DEXTERNAL_BOOST=ON']) + if '+debug' in spec: + options.extend(['-DCMAKE_BUILD_TYPE:STRING=Debug']) + else: + options.extend(['-DCMAKE_BUILD_TYPE:STRING=Release']) + + return options + + def build(self, spec, prefix): + with working_dir(self.build_directory()): + make() + if '+ug' in spec: + make("ug", parallel=False) + if '+pdf' in spec: + make("ug-pdf", parallel=False) + if '+dg' in spec: + make("doc", parallel=False) diff --git a/var/spack/repos/builtin/packages/etsf_io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py index c1e6f2eded..c1e6f2eded 100644 --- a/var/spack/repos/builtin/packages/etsf_io/package.py +++ b/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 index 04b4d24b39..04b4d24b39 100644 --- a/var/spack/repos/builtin/packages/fastx_toolkit/package.py +++ b/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 index 5cec13a5af..5cec13a5af 100644 --- a/var/spack/repos/builtin/packages/globus_toolkit/package.py +++ b/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 d8ae8b6506..dda00420a3 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 index 0b474285ce..9efb0cd368 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 3725724ee3..89db570b81 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -222,7 +222,7 @@ class Julia(Package): 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 index 414498a37a..414498a37a 100644 --- a/var/spack/repos/builtin/packages/libNBC/package.py +++ b/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 index 244c63c8fb..5f7de8ff06 100644 --- a/var/spack/repos/builtin/packages/LuaJIT/package.py +++ b/var/spack/repos/builtin/packages/lua-jit/package.py @@ -26,7 +26,7 @@ import os 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 index d577a1b285..d577a1b285 100644 --- a/var/spack/repos/builtin/packages/Mitos/package.py +++ b/var/spack/repos/builtin/packages/mitos/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 0000000000..8f129bd3e0 --- /dev/null +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -0,0 +1,110 @@ +############################################################################## +# 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('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') + + 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') + + 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': + 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' + '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 0000000000..7910a8af9b --- /dev/null +++ b/var/spack/repos/builtin/packages/npm/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 +############################################################################## +import os +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.9', 'ec1eb22b466ce87cdd0b90182acce07f') + version('3.10.5', '46002413f4a71de9b0da5b506bf1d992') + + 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)) + + if self.run_tests: + make('test') + + make('install') diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index aa521899e5..df144c8bbb 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 @@ class Octave(Package): 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 adb760f06d..a100f7896a 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 index f6466a7954..f6466a7954 100644 --- a/var/spack/repos/builtin/packages/pmgr_collective/package.py +++ b/var/spack/repos/builtin/packages/pmgr-collective/package.py 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 0000000000..d39cec83c8 --- /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-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 0000000000..5158fa3ad4 --- /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 0000000000..13b3a1abd4 --- /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-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py new file mode 100644 index 0000000000..996a90df8e --- /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-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 5b0394a138..904f138d12 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-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py new file mode 100644 index 0000000000..944999d69b --- /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 new file mode 100644 index 0000000000..dc4e49d278 --- /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') + + 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 0000000000..20bf4c7dae --- /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 0000000000..d68cfa2ae4 --- /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 0000000000..75b20e08e9 --- /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 d7ee2e3c95..0c7cb7ab67 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 0000000000..c9b2e9c168 --- /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 new file mode 100644 index 0000000000..d41ee439db --- /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', 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 0000000000..c8268c8aa2 --- /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 0000000000..1cc432e2e0 --- /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 0000000000..ae4f192437 --- /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 0000000000..c9eb51d2d4 --- /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-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py index e66cdc8479..b8ca85eb3b 100644 --- a/var/spack/repos/builtin/packages/py-logilab-common/package.py +++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py @@ -33,7 +33,7 @@ class PyLogilabCommon(Package): version('1.2.0', 'f7b51351b7bfe052746fa04c03253c0b') - extends("python") + extends('python', ignore=r'bin/pytest') depends_on("py-setuptools", type='build') depends_on("py-six", 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 38859ebe15..8661a3f721 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-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py new file mode 100644 index 0000000000..6584aa248c --- /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 0000000000..41a1c89686 --- /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 0000000000..f45236fc34 --- /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 0000000000..8db18261b8 --- /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 9e43e4526e..99b69fc30b 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 @@ from spack import * 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 0000000000..09a810869d --- /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 0000000000..dca73f763f --- /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 0000000000..5c81cf1701 --- /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 0000000000..fc65e617ba --- /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 new file mode 100644 index 0000000000..ab62440f8e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pycurl/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 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('python@2.6:') + depends_on('py-setuptools', type='build') + 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-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 10f60f0ab9..8b7c52c740 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -33,7 +33,10 @@ class PyPylint(Package): version('1.4.1', 'df7c679bdcce5019389038847e4de622') version('1.4.3', '5924c1c7ca5ca23647812f5971d0ea44') - extends('python') + extends('python', ignore=r'bin/pytest') + depends_on('py-six', type=nolink) + depends_on('py-astroid', type=nolink) + depends_on('py-logilab-common', type=nolink) depends_on('py-nose', type='build') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index e575864fab..e6c115027e 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -38,6 +38,7 @@ class PyPyside(Package): extends('python') depends_on('py-setuptools', type='build') + depends_on('py-sphinx', type=nolink) depends_on('qt@4.5:4.9') depends_on('libxml2@2.6.32:') depends_on('libxslt@1.1.19:') diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py index 289d76242b..30d8fab87a 100644 --- a/var/spack/repos/builtin/packages/py-pytables/package.py +++ b/var/spack/repos/builtin/packages/py-pytables/package.py @@ -31,6 +31,8 @@ class PyPytables(Package): homepage = "http://www.pytables.org/" url = "https://github.com/PyTables/PyTables/archive/v.3.2.2.tar.gz" + version('3.3.0', '056c161ae0fd2d6e585b766adacf3b0b', + url='https://github.com/PyTables/PyTables/archive/v3.3.0.tar.gz') version('3.2.2', '7cbb0972e4d6580f629996a5bed92441') extends('python') diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index 9db55e949b..ec3ced22f1 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -39,6 +39,7 @@ class PyRpy2(Package): version('2.5.6', 'a36e758b633ce6aec6a5f450bfee980f') extends('python') + depends_on('py-six', type=nolink) depends_on('py-setuptools', type='build') depends_on('R') 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 0000000000..b2ee72822b --- /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 0000000000..05d8c16b44 --- /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-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index e7b7177586..6298f39f32 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -34,7 +34,7 @@ class PySix(Package): version('1.10.0', '34eed507548117b2ab523ab14b2f8b55') version('1.9.0', '476881ef4012262dfc8adc645ee786c4') - extends('python') + extends('python', ignore=r'bin/pytest') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-SQLAlchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index 73e144b00e..73e144b00e 100644 --- a/var/spack/repos/builtin/packages/py-SQLAlchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py 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 0000000000..e9db560cd5 --- /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 new file mode 100644 index 0000000000..0de77a2d57 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -0,0 +1,49 @@ +############################################################################## +# 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') + + # 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 0000000000..c414dba758 --- /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-vcversioner/package.py b/var/spack/repos/builtin/packages/py-vcversioner/package.py new file mode 100644 index 0000000000..246a3b7b43 --- /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-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py new file mode 100644 index 0000000000..2740d749b5 --- /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 0000000000..c0833806f8 --- /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 new file mode 100644 index 0000000000..ff2373c2f4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-zmq/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 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('16.0.2', '4cf14a2995742253b2b009541f4436f4') + version('14.7.0', 'bf304fb73d72aee314ff82d3554328c179938ecf') + + extends('python') + depends_on('py-setuptools', type='build') + depends_on('py-cython@0.16:') + depends_on('py-py') + depends_on('py-cffi') + depends_on('zeromq') + + def install(self, spec, prefix): + setup_py('install', '--prefix={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 9360ecdec0..f9b953a009 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -44,6 +44,7 @@ class Python(Package): list_url = "https://www.python.org/downloads/" list_depth = 2 + version('3.6.0', '3f7062ccf8be76491884d0e47ac8b251') version('3.5.2', '3fe8434643a78630c61c6464fe2e7e72') version('3.5.1', 'be78e48cdfc1a7ad90efff146dce6cfe') version('3.5.0', 'a56c0c0b45d75a0ec9c6dee933c41c36') diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 96f623a096..f691ae13ea 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 4070b6fe8d..fe0c400aaa 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 4c5d14a90f..2289f40e4f 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 a0f30b779f..4b2b4ca11d 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 index 5a6ce72a4b..ce93356541 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 6399202aba..7421ea4658 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 1f2f541fec..0b78c202b8 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 111606d576..10bbccf1de 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 e9b582b52f..6ce917521d 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 f4a3824983..fa2cc407b8 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 460526c7d3..bfc2db5780 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 adc64e269c..b2daa14c6b 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 9cd9d76e9e..9393ac416f 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 f541ea3611..627cce808c 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 0fdf2ce5de..2deb053322 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 bea2f78c82..206e4c09a5 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 a7622cad95..48c50191ac 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 1e0befbca9..f0578a7c81 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 1d8f837922..4ae21947ae 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 24c0eadb2d..71f28d4609 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 fb0b2f1053..f0d2247d36 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 a1e06d5100..b0146ffb27 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 16aacccd0e..9f5302ce16 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 75506dd257..01adc6e327 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 7ff3b8548b..420e4d803a 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 663e5295af..240bfc3be7 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 1d11afb139..f573638b1b 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 7cebfd9e58..c78624d6d8 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 ded7651278..2e0f43b726 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 f134ee8913..2612ce3a57 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 9b01d7aa18..94441dd6d5 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 c2e7166403..ef29cc3318 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 5583c0ed68..c9a980a2c5 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 a09b458eaf..2b92013db8 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 2a7324ae99..7f2b1e63a8 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 df38fc5680..a248518f58 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 4c92e1f34b..3935ee9000 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 3c4347ee50..cd5b0b41e9 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 0a09a1145b..2897ad922d 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 21ae07fd41..dec9a3939e 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 2dfca19b51..d6c6d53c21 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 a8cf21930f..c0c37d9164 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 29b2069ae9..9c6720b4aa 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 646299b97b..08910b0fe1 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 1f08379d6e..1387581306 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 af6e1d1b63..895c066e57 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 bcb7caa0fb..54e1d397a6 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 a2f55b4470..1afc1af3ac 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 537426d42f..582cd39b85 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 74dee0b3d5..a633e8273f 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 367bb30f87..6676ec1be3 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 5d2972ff96..b9a7e612c3 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 f977a7302f..e9fb7c34d5 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 21cdbe9184..aa776f3929 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 8090776f06..615936c585 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 57025d3a3c..c353dacc5f 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 227594fc0d..bf7ce4dccb 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 37925d4e02..8c1a6252ba 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 dd525daf2b..8102954daa 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 35eb8ca76f..0694af6d34 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 a3c49feb93..00de6b35ac 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 34b5c3c363..4890d95b3e 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 42cc142e8a..caae09930c 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 f5a3489e7d..7e6fb9890d 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 ef940720f8..2ec11e744b 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 d1cb4b52c1..d01caf1f95 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 4976e12b45..4ad22cf33f 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 02e5da9d85..daf971bf44 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 a798b1ce65..9308a869a2 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 f80fb4d272..138691759f 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 2a91100c34..ab7fd2c48a 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 c52d9d0e27..2f9ee3e48f 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 31a36f1f7e..ff98eeadcf 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 2e5661fa4d..125762de1e 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 2b8f95351a..ff32903125 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 11476c3d1e..c41f4eff8f 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 0f8bbe199b..bace22a125 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 1e0bfd2d43..8cbb646643 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 8d045a4ed4..df9254e187 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 c34727d2b0..9648412e50 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 1ab01d2256..eda7dccabf 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 1b45dc55ca..02f193dd9b 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 3cdce6fea6..62adab7f15 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 81f3ff1dab..da93131554 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 4c49462ba2..5b8f04a84c 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 5e78889a76..55d40c5663 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 16cff20b41..a38f00f9ab 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 54416502d9..b32bea6249 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 b96b90f9c7..4250b00ec2 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 b3f7db60c6..956ae6bc44 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 11bf7abb38..3949967022 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 8884f7cf1b..2374b78d7b 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 1b6bb114e1..02a0836fd8 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 58cb585c49..8b5e947710 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 c30a1ac101..e33a9364d4 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 be048f5ad0..6f5e7d6504 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 bff7d0f195..1ee6105576 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 3e77923d76..f5442b102f 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 9520952bd7..f978b9f779 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 dff9099c07..ab994ce4d2 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 b5a9546124..e6c546e921 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 40b6f96927..0bd749abe1 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 87daec5ad0..5c9e5496e7 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 d1d61dbc4d..ec02193d40 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 fe4512347a..cc9c19b98a 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 d3a80a4e16..aa3d4f3c69 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 102d86d2fa..dba2289311 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 07ace3ad29..109ea5fe4f 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 acd502b536..e9cbab3878 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 ecfbf49055..bf27e1a41b 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 89a26070ba..81aa242ee8 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 index 0b75888e79..cb5593f6fc 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 1066c217f4..4d56210c99 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 39f4256703..017838428c 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 074c545534..c410acaba2 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 b81ec2561c..4734a1674f 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 94580a8700..1637faca03 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 ecf9256ab3..f0aebb54f0 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 119a84718a..89402cfbff 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 2e1f6126f9..11d43cf7ea 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 769e82aff9..1fd8067bbe 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 0d28b68b94..0e0d94a3d3 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 41af3a4392..e18fc2499c 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 47804bd7fc..e1de4b77ff 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 94ca45f485..db25a92916 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 b56dfbe21d..a62f17abf7 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 c379388314..c65ff7df9b 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 bc42c51ca9..4164dd3721 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 2f33cd9f88..2c06306f31 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 11fe0ace56..af142c841a 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 4f4b8dcafa..1c017d7898 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 999fb4a1b9..3f7b64693f 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 7684792ba1..fad75827d4 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 c7d41f0fb3..a22421ed87 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 1d0052563b..4f580d7853 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 bf9b35fe5b..1a20fc226b 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 472e706e72..d013c8889c 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 ffd62b1b14..a9d39d37f9 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 44bd5a5a2a..0072de8f5f 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 a80860f4a5..4617e8a0b2 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 bb7589d490..ecb75203bb 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 c4dabf5c15..1bd8835d5a 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 c77b5aa8b6..681969f18d 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 cc57caf8cd..5a5f4ee18a 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 08ded95833..43bae9bbf0 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 646793f7a4..619f22cb59 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 cfba9298fe..71652c2bcc 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 a85aa8baef..a6b5fbddd3 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 a10b55d66c..2f2b0f3c4f 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 60dfd2afcd..8d4d174128 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 e1cf050181..a389da3045 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 89ecce8bfc..e3aa271b3e 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 c601de3c88..6d59a40147 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 d82ae278fe..c83d75b6fd 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 c9b40a8262..355ba6ca3c 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 97541bc3b8..9a2455017b 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 06e609b1ef..f7c0b25369 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 90d55bbb2f..6cce369325 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 f338d150f1..8edea7e840 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 5ce7437c84..92b941b32f 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 458045ff74..586a99f76f 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 332c80fb92..64b95f84e0 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 26e822d2b7..37dbed2783 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 6fed09296d..4c7b8ee15d 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 19f0006ce9..22bda6e83f 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 5affe7f08a..416491cbe6 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 46434b4842..8c675e1b3b 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 d8a4b62d27..678a9f4bf4 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 b68f26e9b8..d8a3c9bacc 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 d889cacbee..27295c7afc 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 index a60fa8122c..a60fa8122c 100644 --- a/var/spack/repos/builtin/packages/R/package.py +++ b/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 index 1adf0cf721..1adf0cf721 100644 --- a/var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch +++ b/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 index e0648290d6..e0648290d6 100644 --- a/var/spack/repos/builtin/packages/SAMRAI/package.py +++ b/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 index 5df207ac55..5df207ac55 100644 --- a/var/spack/repos/builtin/packages/sdl2_image/package.py +++ b/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 index eeddf194ea..eeddf194ea 100644 --- a/var/spack/repos/builtin/packages/the_platinum_searcher/package.py +++ b/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 index c98e964efa..c98e964efa 100644 --- a/var/spack/repos/builtin/packages/the_silver_searcher/package.py +++ b/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 b1b7dada6f..b0c6c8a42f 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)) |