zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix r-devtools package (#18981)

Browse Source 
The r-devtools package was not installable due to a few issues.

- The rstudioapi spec was for 0.11.0 but the rstudioapi version is
  actually 0.11. This caused an error during concretization.
- Set r-usethis to depend on rlang@0.4.3: rather than r-lang@0.4.3.
- Set r-usethis to depend on r-gh@1.1.0: rather than r-gh@1.1.0.
- Added version r-gh-1.1.0 as it is not currently present in spack.
This commit is contained in:
Glenn Johnson 2020-10-12 06:22:41 -05:00 committed by GitHub
parent d431fcd904
commit eb03e648ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/r-devtools/package.py
View File

@ -52,7 +52,7 @@ class RDevtools(RPackage):
depends_on('r-roxygen2@6.1.1:', when='@2.0.0:', type=('build', 'run'))
depends_on('r-roxygen2@7.1.0:', when='@2.3.0:', type=('build', 'run'))
depends_on('r-rstudioapi@0.7.0:', type=('build', 'run'))
depends_on('r-rstudioapi@0.11.0:', when='@2.3.0:', type=('build', 'run'))
depends_on('r-rstudioapi@0.11:', when='@2.3.0:', type=('build', 'run'))
depends_on('r-rversions@2.0.1:', when='@2.3.0:', type=('build', 'run'))
depends_on('r-sessioninfo@1.1.1:', when='@2.0.0:', type=('build', 'run'))
depends_on('r-testthat@2.1.1:', when='@2.0.0:', type=('build', 'run'))

3
var/spack/repos/builtin/packages/r-gh/package.py
View File

@ -13,8 +13,11 @@ class RGh(RPackage):
url = "https://cloud.r-project.org/src/contrib/gh_1.0.1.tar.gz"
list_url = "https://cloud.r-project.org/src/contrib/Archive/gh"
version('1.1.0', sha256='de9faf383c3fe5e87a75391d82cf71b1331b3c80cd00c4203146a303825d89ad')
version('1.0.1', sha256='f3c02b16637ae390c3599265852d94b3de3ef585818b260d00e7812595b391d2')
depends_on('r-ini', type=('build', 'run'))
depends_on('r-jsonlite', type=('build', 'run'))
depends_on('r-httr', type=('build', 'run'))
depends_on('r-httr@1.2:', when='@1.1.0:', type=('build', 'run'))
depends_on('r-cli', when='@1.1.0:', type=('build', 'run'))

4
var/spack/repos/builtin/packages/r-usethis/package.py
View File

@ -28,13 +28,13 @@ class RUsethis(RPackage):
depends_on('r-desc', type=('build', 'run'))
depends_on('r-fs@1.3.0:', type=('build', 'run'))
depends_on('r-gh', type=('build', 'run'))
depends_on('r-gh@1.1.0', when='@1.6.1:', type=('build', 'run'))
depends_on('r-gh@1.1.0:', when='@1.6.1:', type=('build', 'run'))
depends_on('r-git2r@0.23:', type=('build', 'run'))
depends_on('r-glue@1.3.0:', type=('build', 'run'))
depends_on('r-purrr', type=('build', 'run'))
depends_on('r-rematch2', when='@1.6.1:', type=('build', 'run'))
depends_on('r-rlang', type=('build', 'run'))
depends_on('r-rlang@0.4.3', when='@1.6.1:', type=('build', 'run'))
depends_on('r-rlang@0.4.3:', when='@1.6.1:', type=('build', 'run'))
depends_on('r-rprojroot@1.2:', type=('build', 'run'))
depends_on('r-rstudioapi', type=('build', 'run'))
depends_on('r-whisker', type=('build', 'run'))