From 8cd79672f5b4ec6fbf1c92fc860aea1d560c8f08 Mon Sep 17 00:00:00 2001 From: Katrin Leinweber <9948149+katrinleinweber@users.noreply.github.com> Date: Fri, 7 Jun 2019 10:03:03 +0200 Subject: [PATCH 1/4] Repair hyperlink --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d271921..63d123d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/inbo/git2rdata.svg) ![GitHub repo size](https://img.shields.io/github/repo-size/inbo/git2rdata.svg) -

Please visit the git2rdata website at https://inbo.github.io/git2rdata/. The vignette code on the website link to a rendered version of the vignette. Functions have a link to their help file.

+

Please visit the git2rdata website at https://ropensci.github.io/git2rdata/. The vignette code on the website link to a rendered version of the vignette. Functions have a link to their help file.

## Rationale @@ -107,7 +107,7 @@ Please use the output of `citation("git2rdata")` - `testthat`: R scripts with unit tests using the [testthat](http://testthat.r-lib.org/) framework - `vignettes`: source code for the vignettes describing the package - `man-roxygen`: templates for documentation in Roxygen format -- `pkgdown`: additional source files for the `git2rdata` [website](https://inbo.github.io/git2rdata/) +- `pkgdown`: additional source files for the `git2rdata` [website](https://ropensci.github.io/git2rdata/) - `.github`: guidelines and templates for contributors - `sticker`: source code for the `git2rdata` hex sticker From 0b47c0d16522690f3d7fefde1dc6923478c054c8 Mon Sep 17 00:00:00 2001 From: Katrin Leinweber Date: Fri, 7 Jun 2019 10:15:56 +0200 Subject: [PATCH 2/4] Update badge URLs --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 63d123d..52c0aa7 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.5.0-6666ff.svg)](https://cran.r-project.org/) [![DOI](https://zenodo.org/badge/147685405.svg)](https://zenodo.org/badge/latestdoi/147685405) -[![Travis-CI Build Status](https://travis-ci.org/inbo/git2rdata.svg?branch=master)](https://travis-ci.org/inbo/git2rdata) +[![Travis-CI Build Status](https://travis-ci.org/ropensci/git2rdata.svg?branch=master)](https://travis-ci.org/ropensci/git2rdata) [![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/a3idhi9f6ls9xu8r/branch/master?svg=true)](https://ci.appveyor.com/project/ThierryO/git2rdata/branch/master) -[![codecov](https://codecov.io/gh/inbo/git2rdata/branch/master/graph/badge.svg)](https://codecov.io/gh/inbo/git2rdata) +[![codecov](https://codecov.io/gh/ropensci/git2rdata/branch/master/graph/badge.svg)](https://codecov.io/gh/ropensci/git2rdata) -![GitHub forks](https://img.shields.io/github/forks/inbo/git2rdata.svg?style=social) -![GitHub stars](https://img.shields.io/github/stars/inbo/git2rdata.svg?style=social) -![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/inbo/git2rdata.svg) -![GitHub repo size](https://img.shields.io/github/repo-size/inbo/git2rdata.svg) +![GitHub forks](https://img.shields.io/github/forks/ropensci/git2rdata.svg?style=social) +![GitHub stars](https://img.shields.io/github/stars/ropensci/git2rdata.svg?style=social) +![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ropensci/git2rdata.svg) +![GitHub repo size](https://img.shields.io/github/repo-size/ropensci/git2rdata.svg)

Please visit the git2rdata website at https://ropensci.github.io/git2rdata/. The vignette code on the website link to a rendered version of the vignette. Functions have a link to their help file.

From e819fe80cb2559fbda68b3327b58baad1f9b627c Mon Sep 17 00:00:00 2001 From: Katrin Leinweber Date: Fri, 7 Jun 2019 10:16:33 +0200 Subject: [PATCH 3/4] Preempt URL redirects --- DESCRIPTION | 4 ++-- README.md | 4 ++-- _pkgdown.yml | 2 +- codemeta.json | 8 ++++---- man/git2rdata-package.Rd | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f5f818e..f6c9b63 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -31,8 +31,8 @@ Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) RoxygenNote: 6.1.1 -URL: https://github.com/inbo/git2rdata, https://doi.org/10.5281/zenodo.1485309 -BugReports: https://github.com/inbo/git2rdata/issues +URL: https://github.com/ropensci/git2rdata, https://doi.org/10.5281/zenodo.1485309 +BugReports: https://github.com/ropensci/git2rdata/issues Collate: 'clean_data_path.R' 'git2rdata-package.R' diff --git a/README.md b/README.md index 52c0aa7..d2d6859 100644 --- a/README.md +++ b/README.md @@ -54,13 +54,13 @@ Install the development version # install with vignettes (recommended) remotes::install_github( - "inbo/git2rdata", + "ropensci/git2rdata", build = TRUE, dependencies = TRUE, build_opts = c("--no-resave-data", "--no-manual") ) # install without vignettes -remotes::install_github("inbo/git2rdata")) +remotes::install_github("ropensci/git2rdata")) ``` ## Usage in a Nutshell diff --git a/_pkgdown.yml b/_pkgdown.yml index 0020739..d980e22 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -21,7 +21,7 @@ navbar: href: CONTRIBUTING.html right: - icon: fa-github fa-lg - href: https://github.com/inbo/git2rdata + href: https://github.com/ropensci/git2rdata - icon: fa-twitter fa-lg href: https://twitter.com/INBOVlaanderen - icon: fa-facebook fg-lg diff --git a/codemeta.json b/codemeta.json index e45203f..3cfa5b7 100644 --- a/codemeta.json +++ b/codemeta.json @@ -7,9 +7,9 @@ "identifier": "git2rdata", "description": "Make versioning of data.frame easy and efficient using git repositories.", "name": "git2rdata: Store and Retrieve Data.frames in a Git Repository", - "codeRepository": "https://github.com/inbo/git2rdata", + "codeRepository": "https://github.com/ropensci/git2rdata", "relatedLink": "https://doi.org/10.5281/zenodo.1485309", - "issueTracker": "https://github.com/inbo/git2rdata/issues", + "issueTracker": "https://github.com/ropensci/git2rdata/issues", "license": "https://spdx.org/licenses/GPL-3.0", "version": "0.0.5", "programmingLanguage": { @@ -172,8 +172,8 @@ "sameAs": "https://CRAN.R-project.org/package=yaml" } ], - "releaseNotes": "https://github.com/inbo/git2rdata/blob/master/NEWS.md", - "readme": "https://github.com/inbo/git2rdata/blob/master/README.md", + "releaseNotes": "https://github.com/ropensci/git2rdata/blob/master/NEWS.md", + "readme": "https://github.com/ropensci/git2rdata/blob/master/README.md", "fileSize": "348.673KB", "contIntegration": [ "https://travis-ci.org/inbo/git2rdata", diff --git a/man/git2rdata-package.Rd b/man/git2rdata-package.Rd index d2c4fe8..79ddaa2 100644 --- a/man/git2rdata-package.Rd +++ b/man/git2rdata-package.Rd @@ -13,9 +13,9 @@ Make versioning of data.frame easy and efficient using git repositories. \seealso{ Useful links: \itemize{ - \item \url{https://github.com/inbo/git2rdata} + \item \url{https://github.com/ropensci/git2rdata} \item \url{https://doi.org/10.5281/zenodo.1485309} - \item Report bugs at \url{https://github.com/inbo/git2rdata/issues} + \item Report bugs at \url{https://github.com/ropensci/git2rdata/issues} } } From dc22e46f6100e5d5b5dfedbb4f97bb994049b7b3 Mon Sep 17 00:00:00 2001 From: ThierryO Date: Thu, 13 Jun 2019 21:08:29 +0200 Subject: [PATCH 4/4] try PKGTYPE win.binary to fix AppVeyor error --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 49837ae..45d9160 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,6 +33,7 @@ on_failure: environment: GITHUB_PAT: secure: VXO22OHLkl4YhVIomSMwCZyOTx03Xf2WICaVng9xH7gISlAg8a+qrt1DtFtk8sK5 + PKGTYPE: 'win.binary' artifacts: - path: '*.Rcheck\**\*.log'