diff --git a/.Rbuildignore b/.Rbuildignore
index fad9f2b1..68f59973 100755
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,7 +1,8 @@
^.*\.Rproj$
^\.Rproj\.user$
.travis.yml
+appveyor.yml
+.gitlab-ci.yml
.zenodo.json
-^cran-comments\.md$
-^appveyor\.yml$
_noinclude
+^cran-comments\.md$
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07aefec6..4440355a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,10 @@
# from https://stackoverflow.com/questions/51866926
image: rocker/r-base
-test:
+gitlab:
script:
- apt-get update
- 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
- 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
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100755
index 187650ed..00000000
--- a/.travis.yml
+++ /dev/null
@@ -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
diff --git a/DESCRIPTION b/DESCRIPTION
index cd2545ef..d3d844f9 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: AMR
-Version: 0.4.0.9006
+Version: 0.4.0.9007
Date: 2018-10-23
Title: Antimicrobial Resistance Analysis
Authors@R: c(
@@ -62,8 +62,8 @@ Suggests:
rstudioapi,
testthat (>= 1.0.2)
VignetteBuilder: knitr
-URL: https://github.com/msberends/AMR
-BugReports: https://github.com/msberends/AMR/issues
+URL: https://gitlab.com/msberends/AMR
+BugReports: https://gitlab.com/msberends/AMR/issues
License: GPL-2 | file LICENSE
Encoding: UTF-8
LazyData: true
diff --git a/NEWS.md b/NEWS.md
index 4b3ff0ac..a4df0567 100755
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,7 @@
# 0.4.0.90xx (latest development version)
#### 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`
#### Changed
diff --git a/README.md b/README.md
index 544d8bb8..c5c788bf 100755
--- a/README.md
+++ b/README.md
@@ -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: 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
Matthijs S. Berends 1,2,a,
@@ -32,7 +32,7 @@ Bhanu Sinha