diff --git a/DESCRIPTION b/DESCRIPTION index 8c7b473a926351593fd3c27a2146eb26184cf25c..c6d2b9f0a438a9ecaef3c9dc2f32cfcb4c86babc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,16 +8,15 @@ Authors@R: c( License: Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ Description: This package is a collection of functions to apply sequential neutral zone classification based on linear mixed models. -Details: Blabla blabla +Details: Package under deveopment .. URL: https://git.upd.unibe.ch/openscience/POSEIDON BugReports: https://git.upd.unibe.ch/openscience/poseidon/-/issues Encoding: UTF-8 LazyData: true Depends: R (>= 4.0.3), emdbook (>= 1.3.12), nlme (>= 3.1), rmarkdown -Remotes: - github::m-clark/mixedup +Remotes: m-clark/mixedup Imports: - usethis, MASS, lifecycle + usethis, MASS, lifecycle, mixedup RoxygenNote: 7.1.2 Suggests: rmarkdown, knitr, testthat (>= 3.0.0) diff --git a/Dockerfile b/Dockerfile index ae3689f3517f5c45311e4f909fdaa642ab222b0b..bb6108384828292e67c5dfdda5e9cc2e79099da7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ # syntax=docker/dockerfile:1 FROM ubuntu:20.04 RUN apt-get update -qq -RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y gnupg2 wget software-properties-common apt-transport-https git +RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends gnupg2 wget software-properties-common apt-transport-https git RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc RUN add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" -RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq r-base build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev -RUN R -e 'install.packages("remotes")' -RUN R -e 'remotes::install_git(url = "https://git.upd.unibe.ch/openscience/POSEIDON.git")' +RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends build-essential libcurl4-gnutls-dev libxml2-dev libssl-dev +RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq r-base +RUN R --version +RUN R -e 'install.packages("remotes", Ncpus = 4)' +RUN R -e 'remotes::install_git(url = "https://git.upd.unibe.ch/openscience/POSEIDON.git", Ncpus = 6, dependencies = TRUE)' RUN R --version diff --git a/README.Rmd b/README.Rmd index f2f24dc7099bbbdc88007ff14a4ae7052124fb6d..c11cd813c7a8a7ef6abd011e48d00a5e628d149c 100644 --- a/README.Rmd +++ b/README.Rmd @@ -37,7 +37,8 @@ In `R` (tested with version 4.1.1 on Windows 10/11 and Linux), install the requi ```r install.packages("remotes") -remotes::install_git("https://git.upd.unibe.ch/openscience/POSEIDON") +remotes::install_git("https://git.upd.unibe.ch/openscience/POSEIDON", + Ncpu = 4, dependencies = TRUE) ``` diff --git a/README.md b/README.md index 06b65f01665bd41a751d8196396c4fc8393b0ebd..656706580cb7873e74e92a37db0250383f70da17 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,8 @@ the required packages as follows. ``` r install.packages("remotes") -remotes::install_git("https://git.upd.unibe.ch/openscience/POSEIDON") +remotes::install_git("https://git.upd.unibe.ch/openscience/POSEIDON", + Ncpu = 4, dependencies = TRUE) ``` ## Training data