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

r: do not create dir in setup_dependent_package (#46282)

Browse Source
This commit is contained in:
Harmen Stoppels 2024-09-10 09:04:09 +02:00 committed by GitHub
parent 16dba78288
commit 0905edf592
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/spack/spack/build_systems/r.py
View File

@ -5,6 +5,7 @@
from typing import Optional, Tuple from typing import Optional, Tuple
import llnl.util.lang as lang import llnl.util.lang as lang
from llnl.util.filesystem import mkdirp
from spack.directives import extends from spack.directives import extends
@ -36,6 +37,7 @@ def configure_vars(self):
def install(self, pkg, spec, prefix): def install(self, pkg, spec, prefix):
"""Installs an R package.""" """Installs an R package."""
mkdirp(pkg.module.r_lib_dir)
config_args = self.configure_args() config_args = self.configure_args()
config_vars = self.configure_vars() config_vars = self.configure_vars()
@ -43,12 +45,12 @@ def install(self, pkg, spec, prefix):
args = ["--vanilla", "CMD", "INSTALL"] args = ["--vanilla", "CMD", "INSTALL"]
if config_args: if config_args:
args.append("--configure-args={0}".format(" ".join(config_args))) args.append(f"--configure-args={' '.join(config_args)}")
if config_vars: if config_vars:
args.append("--configure-vars={0}".format(" ".join(config_vars))) args.append(f"--configure-vars={' '.join(config_vars)}")
args.extend(["--library={0}".format(self.pkg.module.r_lib_dir), self.stage.source_path]) args.extend([f"--library={pkg.module.r_lib_dir}", self.stage.source_path])
pkg.module.R(*args) pkg.module.R(*args)
@ -79,27 +81,21 @@ class RPackage(Package):
@lang.classproperty @lang.classproperty
def homepage(cls): def homepage(cls):
if cls.cran: if cls.cran:
return "https://cloud.r-project.org/package=" + cls.cran return f"https://cloud.r-project.org/package={cls.cran}"
elif cls.bioc: elif cls.bioc:
return "https://bioconductor.org/packages/" + cls.bioc return f"https://bioconductor.org/packages/{cls.bioc}"
@lang.classproperty @lang.classproperty
def url(cls): def url(cls):
if cls.cran: if cls.cran:
return ( return f"https://cloud.r-project.org/src/contrib/{cls.cran}_{str(list(cls.versions)[0])}.tar.gz"
"https://cloud.r-project.org/src/contrib/"
+ cls.cran
+ "_"
+ str(list(cls.versions)[0])
+ ".tar.gz"
)
@lang.classproperty @lang.classproperty
def list_url(cls): def list_url(cls):
if cls.cran: if cls.cran:
return "https://cloud.r-project.org/src/contrib/Archive/" + cls.cran + "/" return f"https://cloud.r-project.org/src/contrib/Archive/{cls.cran}/"
@property @property
def git(self): def git(self):
if self.bioc: if self.bioc:
return "https://git.bioconductor.org/packages/" + self.bioc return f"https://git.bioconductor.org/packages/{self.bioc}"

5
var/spack/repos/builtin/packages/r/package.py
View File

@ -297,8 +297,3 @@ def setup_dependent_package(self, module, dependent_spec):
# Add variable for library directry # Add variable for library directry
module.r_lib_dir = join_path(dependent_spec.prefix, self.r_lib_dir) module.r_lib_dir = join_path(dependent_spec.prefix, self.r_lib_dir)
# Make the site packages directory for extensions, if it does not exist
# already.
if dependent_spec.package.is_extension:
mkdirp(module.r_lib_dir)