From d88f0b8e6df15f3c04e5d676902b25f33bacde08 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 26 Mar 2018 14:27:12 -0500 Subject: [PATCH] New package r-tidyverse and r-tidyselect (#6507) * r-rlang: added version 0.1.4 * r-lubridate: added version 1.7.1 and dependency * r-tidyselect: new package * r-dplyr: added version 0.7.4 * r-rstudioapi: added version 0.7 * r-tidyr: added version 0.7.2 and other dependencies * r-tidyverse: new package * r-tidyr: updated dependencies * r-tidyverse: added dependency r-rlang * r-tidyverse: edited docstring * r-tidyverse: fixed typo * fix typo again --- .../repos/builtin/packages/r-dplyr/package.py | 3 +- .../builtin/packages/r-lubridate/package.py | 4 +- .../repos/builtin/packages/r-rlang/package.py | 3 +- .../builtin/packages/r-rstudioapi/package.py | 3 +- .../repos/builtin/packages/r-tidyr/package.py | 10 ++- .../builtin/packages/r-tidyselect/package.py | 42 ++++++++++++ .../builtin/packages/r-tidyverse/package.py | 65 +++++++++++++++++++ 7 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 var/spack/repos/builtin/packages/r-tidyselect/package.py create mode 100644 var/spack/repos/builtin/packages/r-tidyverse/package.py diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index b84b8739e2..8abc3883b7 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -30,9 +30,10 @@ class RDplyr(RPackage): in memory and out of memory.""" homepage = "https://github.com/hadley/dplyr" - url = "https://cran.rstudio.com/src/contrib/dplyr_0.7.3.tar.gz" + url = "https://cran.r-project.org/src/contrib/dplyr_0.7.4.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/dplyr" + version('0.7.4', '9edee9b2db9831c2438054d0d2c1647d') version('0.7.3', 'f9760b796917747e9dcd927ebb531c7d') version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef') diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 9877277aa6..2e8aab8e00 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -34,9 +34,11 @@ class RLubridate(RPackage): fun.""" homepage = "https://cran.r-project.org/web/packages/lubridate/index.html" - url = "https://cran.r-project.org/src/contrib/lubridate_1.5.6.tar.gz" + url = "https://cran.r-project.org/src/contrib/lubridate_1.7.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/lubridate" + version('1.7.1', '17dcb4c6a95189941bbdcffecf61b83b') version('1.5.6', 'a5dc44817548ee219d26a10bae92e611') + depends_on('r-rcpp@0.11:', type=('build', 'run')) depends_on('r-stringr', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index 1550c6b11b..69cd847f93 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -30,8 +30,9 @@ class RRlang(RPackage): condition system, and core 'Tidyverse' features like tidy evaluation.""" homepage = "https://cran.r-project.org/web/packages/rlang/index.html" - url = "https://cran.r-project.org/src/contrib/rlang_0.1.2.tar.gz" + url = "https://cran.r-project.org/src/contrib/rlang_0.1.4.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rlang" + version('0.1.4', 'daed5104d557c0cbfb4a654ec8ffb579') version('0.1.2', '170f8cf7b61898040643515a1746a53a') version('0.1.1', '38a51a0b8f8487eb52b4f3d986313682') diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index 3c3fcf0def..37558bbe96 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -30,8 +30,9 @@ class RRstudioapi(RPackage): messages when it's not.""" homepage = "https://cran.r-project.org/web/packages/rstudioapi/index.html" - url = "https://cran.r-project.org/src/contrib/rstudioapi_0.5.tar.gz" + url = "https://cran.r-project.org/src/contrib/rstudioapi_0.7.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rstudioapi" + version('0.7', 'ee4ab567a7a9fdfac1a6fd01fe38de4a') version('0.6', 'fdb13bf46aab02421557e713fceab66b') version('0.5', '6ce1191da74e7bcbf06b61339486b3ba') diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index a2d1b55dfd..743a3ac917 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -31,14 +31,18 @@ class RTidyr(RPackage): pipelines.""" homepage = "https://github.com/hadley/tidyr" - url = "https://cran.r-project.org/src/contrib/tidyr_0.5.1.tar.gz" + url = "https://cran.r-project.org/src/contrib/tidyr_0.7.2.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/tidyr" + version('0.7.2', '42d723bf04c5c1c59e27a8be14f3a6b6') version('0.5.1', '3cadc869510c054ed93d374ab44120bd') depends_on('r-tibble', type=('build', 'run')) - depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-dplyr@0.7.0:', type=('build', 'run')) depends_on('r-stringi', type=('build', 'run')) - depends_on('r-lazyeval', type=('build', 'run')) depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-glue', type=('build', 'run')) depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-tidyselect', type=('build', 'run')) + depends_on('r-rlang', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-tidyselect/package.py b/var/spack/repos/builtin/packages/r-tidyselect/package.py new file mode 100644 index 0000000000..f1378c63b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tidyselect/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, 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/spack/spack +# Please also see the NOTICE and LICENSE files 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 RTidyselect(RPackage): + """A backend for the selecting functions of the 'tidyverse'. It makes it + easy to implement select-like functions in your own packages in a way + that is consistent with other 'tidyverse' interfaces for selection.""" + + homepage = "https://cran.r-project.org/package=tidyselect" + url = "https://cran.r-project.org/src/contrib/tidyselect_0.2.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/tidyselect" + + version('0.2.3', 'c9dbd895ad7ce209bacfad6d19de91c9') + + depends_on('r-glue', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-rlang@0.1:', type=('build', 'run')) + depends_on('r-rcpp@0.12.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-tidyverse/package.py b/var/spack/repos/builtin/packages/r-tidyverse/package.py new file mode 100644 index 0000000000..586ba8e41e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tidyverse/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2017, 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/spack/spack +# Please also see the NOTICE and LICENSE files 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 RTidyverse(RPackage): + """The 'tidyverse' is a set of packages that work in harmony because they + share common data representations and 'API' design. This package is + designed to make it easy to install and load multiple 'tidyverse' + packages in a single step.""" + + homepage = "http://tidyverse.tidyverse.org/" + url = "https://cran.r-project.org/src/contrib/tidyverse_1.2.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/tidyverse" + + version('1.2.1', '7e2ca0b72ab668342c02fd0f52c082e1') + + depends_on('r-broom@0.4.2:', type=('build', 'run')) + depends_on('r-cli@1.0.0:', type=('build', 'run')) + depends_on('r-crayon@1.3.4:', type=('build', 'run')) + depends_on('r-dplyr@0.7.4:', type=('build', 'run')) + depends_on('r-dbplyr@1.1.0:', type=('build', 'run')) + depends_on('r-forcats@0.2.0:', type=('build', 'run')) + depends_on('r-ggplot2@2.2.1:', type=('build', 'run')) + depends_on('r-haven@1.1.0:', type=('build', 'run')) + depends_on('r-hms@0.3:', type=('build', 'run')) + depends_on('r-httr@1.3.1:', type=('build', 'run')) + depends_on('r-jsonlite@1.5:', type=('build', 'run')) + depends_on('r-lubridate@1.7.1:', type=('build', 'run')) + depends_on('r-magrittr@1.5:', type=('build', 'run')) + depends_on('r-modelr@0.1.1:', type=('build', 'run')) + depends_on('r-purrr@0.2.4:', type=('build', 'run')) + depends_on('r-readr@1.1.1:', type=('build', 'run')) + depends_on('r-readxl@1.0.0:', type=('build', 'run')) + depends_on('r-reprex@0.1.1:', type=('build', 'run')) + depends_on('r-rlang@0.1.4:', type=('build', 'run')) + depends_on('r-rstudioapi@0.7:', type=('build', 'run')) + depends_on('r-rvest@0.3.2:', type=('build', 'run')) + depends_on('r-stringr@1.2.0:', type=('build', 'run')) + depends_on('r-tibble@1.3.4:', type=('build', 'run')) + depends_on('r-tidyr@0.7.2:', type=('build', 'run')) + depends_on('r-xml2@1.1.1:', type=('build', 'run')) + depends_on('r-rlang@0.1.4:', type=('build', 'run'))