1
0
mirror of https://github.com/msberends/AMR.git synced 2024-12-26 08:06:12 +01:00

switch to gitlab

This commit is contained in:
dr. M.S. (Matthijs) Berends 2018-10-23 16:49:40 +02:00
parent 707aa20a37
commit 87757748bd
7 changed files with 18 additions and 78 deletions

View File

@ -1,7 +1,8 @@
^.*\.Rproj$ ^.*\.Rproj$
^\.Rproj\.user$ ^\.Rproj\.user$
.travis.yml .travis.yml
appveyor.yml
.gitlab-ci.yml
.zenodo.json .zenodo.json
^cran-comments\.md$
^appveyor\.yml$
_noinclude _noinclude
^cran-comments\.md$

View File

@ -1,10 +1,10 @@
# from https://stackoverflow.com/questions/51866926 # from https://stackoverflow.com/questions/51866926
image: rocker/r-base image: rocker/r-base
test: gitlab:
script: script:
- apt-get update - apt-get update
- apt-get install --yes --no-install-recommends r-cran-testthat r-cran-devtools - apt-get install --yes --no-install-recommends r-cran-testthat r-cran-devtools
- R -e "devtools::install_deps()" - R -e "devtools::install_deps(dependencies = TRUE)"
- R CMD build . --no-build-vignettes --no-manual - R CMD build . --no-build-vignettes --no-manual
- PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1) - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1)
- R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual - R CMD check "${PKG_FILE_NAME}" --no-manual --as-cran

View File

@ -1,52 +0,0 @@
# Setting up R deps
language: r
jobs:
include:
- r: 3.1
os: linux
warnings_are_errors: false
- r: 3.2
os: linux
- r: 3.2
os: osx
- r: 3.3
os: linux
- r: 3.3
os: osx
- r: 3.4
os: linux
- r: 3.4
os: osx
- r: release
os: linux
- r: release
os: osx
- r: devel
os: linux
warnings_are_errors: false
matrix:
allow_failures:
- r: 3.2
os: osx
- r: 3.3
os: osx
- r: 3.4
os: osx
r_packages: covr
cache: packages
cran: https://cran.rstudio.com
install:
- Rscript -e "install.packages(c('devtools', 'backports', 'clipr', 'curl', 'data.table', 'dplyr', 'hms', 'knitr', 'readr', 'rlang', 'rvest', 'xml2', 'covr', 'ggplot2', 'rmarkdown', 'testthat', 'tidyr'))"
- if [ $TRAVIS_OS_NAME = osx ]; then Rscript -e "devtools::install_github('r-lib/rlang')"; fi
# postrun
after_success:
- Rscript -e 'covr::codecov()'
notifications:
email:
recipients:
- m.s.berends@umcg.nl
# - c.f.luz@umcg.nl
on_success: change
on_failure: change

View File

@ -1,5 +1,5 @@
Package: AMR Package: AMR
Version: 0.4.0.9006 Version: 0.4.0.9007
Date: 2018-10-23 Date: 2018-10-23
Title: Antimicrobial Resistance Analysis Title: Antimicrobial Resistance Analysis
Authors@R: c( Authors@R: c(
@ -62,8 +62,8 @@ Suggests:
rstudioapi, rstudioapi,
testthat (>= 1.0.2) testthat (>= 1.0.2)
VignetteBuilder: knitr VignetteBuilder: knitr
URL: https://github.com/msberends/AMR URL: https://gitlab.com/msberends/AMR
BugReports: https://github.com/msberends/AMR/issues BugReports: https://gitlab.com/msberends/AMR/issues
License: GPL-2 | file LICENSE License: GPL-2 | file LICENSE
Encoding: UTF-8 Encoding: UTF-8
LazyData: true LazyData: true

View File

@ -1,6 +1,7 @@
# 0.4.0.90xx (latest development version) # 0.4.0.90xx (latest development version)
#### New #### New
* Repository moved to GitLab: https://gitlab.com/msberends/AMR
* Function `count_all` to get all available isolates (that like all `portion_*` and `count_*` functions also supports `summarise` and `group_by`), the old `n_rsi` is now an alias of `count_all` * Function `count_all` to get all available isolates (that like all `portion_*` and `count_*` functions also supports `summarise` and `group_by`), the old `n_rsi` is now an alias of `count_all`
#### Changed #### Changed

View File

@ -5,7 +5,7 @@ This R package was created for academic research by PhD students of the Faculty
:arrow_forward: Get it with `install.packages("AMR")` or see below for other possibilities. :arrow_forward: Get it with `install.packages("AMR")` or see below for other possibilities.
:arrow_forward: Read the [changelog here](https://github.com/msberends/AMR/blob/master/NEWS.md). :arrow_forward: Read the [changelog here](https://gitlab.com/msberends/AMR/blob/master/NEWS.md).
## Authors ## Authors
Matthijs S. Berends <a href="https://orcid.org/0000-0001-7620-1800"><img src="https://cran.r-project.org/web/orcid.svg" height="16px"></a> <sup>1,2,a</sup>, Matthijs S. Berends <a href="https://orcid.org/0000-0001-7620-1800"><img src="https://cran.r-project.org/web/orcid.svg" height="16px"></a> <sup>1,2,a</sup>,
@ -32,7 +32,7 @@ Bhanu Sinha <a href="https://orcid.org/0000-0003-1634-0010"><img src="https://cr
* [How to get it?](#how-to-get-it) * [How to get it?](#how-to-get-it)
* [Install from CRAN](#install-from-cran) * [Install from CRAN](#install-from-cran)
* [Install from Zenodo](#install-from-zenodo) * [Install from Zenodo](#install-from-zenodo)
* [Install from GitHub](#install-from-github) * [Install from GitLab](#install-from-gitlab)
* [How to use it?](#how-to-use-it) * [How to use it?](#how-to-use-it)
* [New classes](#new-classes) * [New classes](#new-classes)
* [Overwrite/force resistance based on EUCAST rules](#overwriteforce-resistance-based-on-eucast-rules) * [Overwrite/force resistance based on EUCAST rules](#overwriteforce-resistance-based-on-eucast-rules)
@ -134,20 +134,20 @@ All stable versions of this package [are published on CRAN](http://cran.r-projec
This package was also published on Zenodo (stable releases only): https://doi.org/10.5281/zenodo.1305355 This package was also published on Zenodo (stable releases only): https://doi.org/10.5281/zenodo.1305355
### Install from GitHub ### Install from GitLab
This is the latest **development version**. Although it may contain bugfixes and even new functions compared to the latest released version on CRAN, it is also subject to change and may be unstable or behave unexpectedly. Always consider this a beta version. All below 'badges' should be green: This is the latest **development version**. Although it may contain bugfixes and even new functions compared to the latest released version on CRAN, it is also subject to change and may be unstable or behave unexpectedly. Always consider this a beta version. All below 'badges' should be green:
Development Test | Result | Reference Development Test | Result | Reference
--- | :---: | --- --- | :---: | ---
All functions checked on Linux and macOS | [![Travis_Build](https://travis-ci.org/msberends/AMR.svg?branch=master)](https://travis-ci.org/msberends/AMR) | Travis CI, GmbH [[ref 1]](https://travis-ci.org/msberends/AMR) All functions checked on Linux and macOS | [(click view)](https://gitlab.com/msberends/AMR/pipelines) | GitLab [[ref 1]](https://gitlab.com/msberends/AMR/pipelines)
All functions checked on Windows | [![AppVeyor_Build](https://ci.appveyor.com/api/projects/status/github/msberends/AMR?branch=master&svg=true)](https://ci.appveyor.com/project/msberends/AMR) | Appveyor Systems Inc. [[ref 2]](https://ci.appveyor.com/project/msberends/AMR) All functions checked on Windows | [![AppVeyor_Build](https://ci.appveyor.com/api/projects/status/gitlab/msberends/AMR?branch=master&svg=true)](https://ci.appveyor.com/project/msberends/amr-svxon) | Appveyor Systems Inc. [[ref 2]](https://ci.appveyor.com/project/msberends/amr-svxon)
Percentage of syntax lines checked | [![Code_Coverage](https://codecov.io/gh/msberends/AMR/branch/master/graph/badge.svg)](https://codecov.io/gh/msberends/AMR) | Codecov LLC [[ref 3]](https://codecov.io/gh/msberends/AMR) Percentage of syntax lines checked | [![Code_Coverage](https://codecov.io/gl/msberends/AMR/branch/master/graph/badge.svg)](https://codecov.io/gl/msberends/AMR) | Codecov LLC [[ref 3]](https://codecov.io/gl/msberends/AMR)
If so, try it with: If so, try it with:
```r ```r
install.packages("devtools") install.packages("devtools")
devtools::install_github("msberends/AMR") devtools::install_git("https://gitlab.com/msberends/AMR")
``` ```
## How to use it? ## How to use it?
@ -558,9 +558,8 @@ microbenchmark(A = mo_species("aureus"),
Of course, when running `mo_phylum("Firmicutes")` the function has zero knowledge about the actual microorganism, namely *S. aureus*. But since the result would be `"Firmicutes"` too, there is no point in calculating the result. And since this package 'knows' all phyla of all known microorganisms (according to ITIS), it can just return the initial value immediately. Of course, when running `mo_phylum("Firmicutes")` the function has zero knowledge about the actual microorganism, namely *S. aureus*. But since the result would be `"Firmicutes"` too, there is no point in calculating the result. And since this package 'knows' all phyla of all known microorganisms (according to ITIS), it can just return the initial value immediately.
## Copyright ## Copyright
[![License](https://img.shields.io/github/license/msberends/AMR.svg?colorB=3679BC)](https://github.com/msberends/AMR/blob/master/LICENSE)
This R package is licensed under the [GNU General Public License (GPL) v2.0](https://github.com/msberends/AMR/blob/master/LICENSE). In a nutshell, this means that this package: This R package is licensed under the [GNU General Public License (GPL) v2.0](https://gitlab.com/msberends/AMR/blob/master/LICENSE). In a nutshell, this means that this package:
- May be used for commercial purposes - May be used for commercial purposes

View File

@ -25,15 +25,6 @@ environment:
- R_VERSION: release - R_VERSION: release
- R_VERSION: devel - R_VERSION: devel
notifications:
- provider: Email
to: m.s.berends@umcg.nl
subject: 'AppVeyor: status changed'
message: The status of https://ci.appveyor.com/project/msberends/amr has changed.
on_build_success: false
on_build_failure: false
on_build_status_changed: true
build_script: build_script:
- travis-tool.sh install_deps - travis-tool.sh install_deps