From a805b8e46d7607ee31a427fecfc2003254394c85 Mon Sep 17 00:00:00 2001 From: Tim Cadman <41470917+timcadman@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:19:30 +0200 Subject: [PATCH 1/2] docs: updated English --- CONTRIBUTING.md | 2 +- README.Rmd | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1335349c..63da54e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ When fixing bugs or adding features we need you to state what it is in one of yo - bug: fixing out of memory > This will increment the bug number (third) from the version number 1.2.3 to 1.2.4 -- feat: adding new function +- feat: adding new functionality > This will increment the minor number (second) from the version number 1.2.3 to 1.3.3 - breaking: comply to new upstream version of X > This will increment the major number (first) from the version number 1.2.3 to 1.3.3 diff --git a/README.Rmd b/README.Rmd index 207a14d9..d7a6e256 100644 --- a/README.Rmd +++ b/README.Rmd @@ -25,10 +25,6 @@ Client to share data in a [MOLGENIS Armadillo DataSHIELD Service](https://github ## Purpose This library can be used by data managers to share datasets on a MOLGENIS Armadillo server. -Researchers can then analyse these datasets and datasets shared on other servers -using DataSHIELD. -Researchers will only be able to access aggregate information and cannot see -individual rows. ## Overview The datasets are stored in shared folders on a MinIO file store. The MOLGENIS @@ -56,7 +52,7 @@ Listing the tables. armadillo.list_tables("project") ``` -Removing the data from the storage. First you need to remove the content of a project before you can throw away the project. +Removing the data from the storage. First you need to remove the content of a project before you can delete the project. ``` R armadillo.delete_table("project", "folder", "iris") armadillo.delete_project("project") From 9b908e3bcf68049dc2641cfbf4d11ac5f32e3bb1 Mon Sep 17 00:00:00 2001 From: Tim Cadman <41470917+timcadman@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:49:28 +0200 Subject: [PATCH 2/2] chore: revert to old R version to try to fix CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a822a748..92d1fa87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ jobs: - run: name: Install R deps takes 15min, but no worries we skipinstalled from cache when this PR has installed them before command: | - install2.r --skipinstalled --repo https://cloud.r-project.org pkgdown markdown rmarkdown mockery webmockr httr urltools xml2 arrow MolgenisAuth DSMolgenisArmadillo git2r ellipsis vctrs covr desc rlist httr2 devtools + install2.r --skipinstalled --repo https://cloud.r-project.org utils pkgdown markdown rmarkdown mockery webmockr httr urltools xml2 arrow MolgenisAuth DSMolgenisArmadillo git2r ellipsis vctrs covr desc rlist httr2 devtools install2.r --repo https://cloud.r-project.org testthat Rscript -e "git2r::config(user.email = 'molgenis+ci@gmail.com', user.name = 'MOLGENIS Jenkins')"