diff --git a/CHANGELOG.md b/CHANGELOG.md index 194b823..f482d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Replace CRAN by https://packagemanager.rstudio.com/cran/__linux__/focal/2023-02-16 as package source. +- Added missing system deps ``libpoppler-glib-dev``, ``tcl-dev`` +- Install ``R.utils`` enabling reading of .gz files in LAVA +- Rebuilt container ``f9438a80d50831b4b0e244d455d40d43 magma.sif`` + ## [1.0.0] - 2022-11-30 ### Added diff --git a/containers/magma.sif b/containers/magma.sif index f655948..7747a96 100644 --- a/containers/magma.sif +++ b/containers/magma.sif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bcd1bb2beedd0890f7cc0f17933951e003c3273b7e10681befc1957ceb553af -size 1409867776 +oid sha256:a89794d68111f31b93bb95f20642d9fd8d6b6f40e02ac04e5b80793d5a5e60b9 +size 1416265728 diff --git a/src/scripts/R/cran.R b/src/scripts/R/cran.R index 021ff3c..812ad29 100644 --- a/src/scripts/R/cran.R +++ b/src/scripts/R/cran.R @@ -1,5 +1,10 @@ require(devtools) -devtools::install_version('BiocManager', version='1.30.18', repos='https://cloud.r-project.org') -devtools::install_version('data.table', version='1.14.2', repos='https://cloud.r-project.org') -devtools::install_version('matrixsampling', version='2.0.0', repos='https://cloud.r-project.org') +url <- "https://packagemanager.rstudio.com/cran/__linux__/focal/2023-02-16" +dependencies <- c('Depends', 'Imports', 'LinkingTo') +upgrade <- 'default' +devtools::install_version('BiocManager', version='1.30.19', repos=url, dependencies=dependencies, upgrade=upgrade) +devtools::install_version('BRugs', version='0.9-1', repos=url, dependencies=dependencies, upgrade=upgrade) +devtools::install_version('data.table', version='1.14.6', repos=url, dependencies=dependencies, upgrade=upgrade) +devtools::install_version('matrixsampling', version='2.0.0', repos=url, dependencies=dependencies, upgrade=upgrade) +devtools::install_version('R.utils', version='2.12.2', repos=url, dependencies=dependencies, upgrade=upgrade) diff --git a/src/scripts/apt_get_essential.sh b/src/scripts/apt_get_essential.sh index 682f498..6140b0b 100644 --- a/src/scripts/apt_get_essential.sh +++ b/src/scripts/apt_get_essential.sh @@ -21,6 +21,7 @@ apt-get update && apt-get install -y --no-install-recommends \ libgsl-dev=2.5+dfsg-6build1 \ libnss3=2:3.49.1-1ubuntu1.8 \ libpcre2-dev=10.34-7ubuntu0.1 \ + libpoppler-glib-dev=0.86.1-0ubuntu1.1 \ libxt-dev=1:1.1.5-1 \ pandoc=2.5-3build2 \ pandoc-citeproc=0.15.0.1-1build4 \ @@ -28,6 +29,7 @@ apt-get update && apt-get install -y --no-install-recommends \ perl=5.30.0-9ubuntu0.3 \ pkg-config=0.29.1-0ubuntu4 \ tar=1.30+dfsg-7ubuntu0.20.04.2 \ + tcl-dev=8.6.9+1 \ tofrodos=1.7.13+ds-4 \ unzip=6.0-25ubuntu1.1 \ vim=2:8.1.2269-1ubuntu5.9 \ diff --git a/tests/extras/check_libraries.R b/tests/extras/check_libraries.R new file mode 100644 index 0000000..5fa2413 --- /dev/null +++ b/tests/extras/check_libraries.R @@ -0,0 +1,10 @@ +# check that all libraries are installed +library(BiocGenerics) +library(BiocManager) +library(BRugs) +library(data.table) +library(LAVA) +library(matrixsampling) +library(R.utils) +library(snpStats) +library(zlibbioc) diff --git a/tests/test_magma.py b/tests/test_magma.py index eda6a66..4ce317e 100644 --- a/tests/test_magma.py +++ b/tests/test_magma.py @@ -64,6 +64,14 @@ def test_R_script(): assert out.returncode == 0 +def test_R_libraries(): + """test that the R libraries are installed""" + pwd = os.getcwd() if PREFIX.rfind('docker') >= 0 else '.' + call = f'{PREFIX_MOUNT} R {pwd}/tests/extras/check_libraries.R' + out = subprocess_run(call) + assert out.returncode == 0 + + # py.test tests/test_magma.py -k test_magma_binary def test_magma_binary(): call=f'{PREFIX} magma --version'