move corrplot to exts

easybuilders · Oct 18, 2024 · ffcf242 · ffcf242
1 parent f5c852c
commit ffcf242
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/easybuild/easyconfigs/c/cisDIVERSITY/cisDIVERSITY-1.1-foss-2023a-Python-2.7.18.eb b/easybuild/easyconfigs/c/cisDIVERSITY/cisDIVERSITY-1.1-foss-2023a-Python-2.7.18.eb
@@ -19,16 +19,38 @@ checksums = ['4ba5967fa754ec78b9dd6b6dc9d2ee5de87dbb4d7906d47e57e73aec87897725']
 
 dependencies = [
     ('Python', '2.7.18'),
+    ('R', '4.3.2'),
     ('numpy', '1.16.6', versionsuffix),
-    ('corrplot', '0.95'),
 ]
+
+exts_defaultclass = 'RPackage'
+exts_default_options = {
+    'source_urls': [
+        'https://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'https://cran.r-project.org/src/contrib/',      # current version of packages
+        'https://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': '%(name)s_%(version)s.tar.gz',
+}
+
+exts_list = [
+    ('corrplot', '0.95', {
+        'checksums': ['84a31f675041e589201b4d640753302abc10ccc2c0ca0a409b5153861989d776'],
+    }),
+]
+
 files_to_copy = [(['learnDiverseModules'], 'bin')]
 
+modextrapaths = {'R_LIBS_SITE': ''}
+
 sanity_check_paths = {
     'files': ['bin/learnDiverseModules'],
-    'dirs': [],
+    'dirs': ['corrplot'],
 }
 
-sanity_check_commands = ['learnDiverseModules -h']
+sanity_check_commands = [
+    'learnDiverseModules -h',
+    'Rscript -e "library(corrplot)"',
+]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/corrplot/corrplot-0.95-foss-2023a.eb b/easybuild/easyconfigs/c/corrplot/corrplot-0.95-foss-2023a.eb