Merge pull request easybuilders#20324 from bedroge/fix_bioconductor_a…

…rrow-r change arrow-R dependency of Bioconductor v3.18 to v14.0.1 (which depends on required matching Arrow v14.0.1)
garadar · Apr 17, 2024 · 10a6454 · 10a6454
2 parents 6862b21 + ed61636
commit 10a6454
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/easybuild/easyconfigs/a/arrow-R/arrow-R-11.0.0.3-foss-2022b-R-4.2.2.eb b/easybuild/easyconfigs/a/arrow-R/arrow-R-11.0.0.3-foss-2022b-R-4.2.2.eb
@@ -19,7 +19,7 @@ checksums = ['eb939471f5f4218e6cfd62f58ccd2a0a5283d4a19a2902741c7fb25e2f016eaf']
 
 dependencies = [
     ('R', '4.2.2'),
-    ('Arrow', '11.0.0'),
+    ('Arrow', '11.0.0'),  # arrow-R x.y.z[.N] only works with Arrow x.y.z
 ]
 
 preinstallopts = "export LIBARROW_BINARY=true && "

diff --git a/...-R/arrow-R-14.0.0.2-foss-2023a-R-4.3.2.eb → ...ow-R/arrow-R-14.0.1-foss-2023a-R-4.3.2.eb b/...-R/arrow-R-14.0.0.2-foss-2023a-R-4.3.2.eb → ...ow-R/arrow-R-14.0.1-foss-2023a-R-4.3.2.eb
@@ -1,7 +1,7 @@
 easyblock = 'RPackage'
 
 name = 'arrow-R'
-version = '14.0.0.2'
+version = '14.0.1'
 versionsuffix = '-R-%(rver)s'
 
 homepage = 'https://cran.r-project.org/web/packages/arrow'
@@ -13,16 +13,18 @@ source_urls = [
     'https://cran.r-project.org/src/contrib/Archive/arrow',  # package archive
     'https://cran.r-project.org/src/contrib/',  # current version of packages
     'https://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    'https://archive.apache.org/dist/arrow/arrow-%(version)s',  # full Arrow source tarballs
 ]
-sources = ['arrow_%(version)s.tar.gz']
-checksums = ['7138a52d66f1b94ec31c25e8929d6f92b1640df852a10817600a82ab68ba8ab7']
+sources = ['apache-arrow-%(version)s.tar.gz']
+checksums = ['5c70eafb1011f9d124bafb328afe54f62cc5b9280b7080e1e3d668f78c0e407e']
 
 dependencies = [
     ('R', '4.3.2'),
     ('R-bundle-CRAN', '2023.12'),
-    ('Arrow', '14.0.1'),
+    ('Arrow', '14.0.1'),  # arrow-R x.y.z[.N] only works with Arrow x.y.z
 ]
 
+start_dir = 'r'
 preinstallopts = "export LIBARROW_BINARY=true && "
 
 sanity_check_paths = {

diff --git a/...uild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb b/...uild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('Boost', '1.82.0'),  # for mzR
     ('GSL', '2.7'),  # for flowClust
     ('HDF5', '1.14.0'),  # for rhdf5
-    ('arrow-R', '14.0.0.2', versionsuffix),  # required by RcisTarget
+    ('arrow-R', '14.0.1', versionsuffix),  # required by RcisTarget
 ]
 
 exts_default_options = {