From 1965efecc9dc22f46610f07c6bcea6fd50d52d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Wed, 21 Jun 2023 18:40:08 +0200 Subject: [PATCH 1/5] Prepare CRAN release --- .Rbuildignore | 1 + DESCRIPTION | 2 +- NEWS.md | 57 ++++++++---------------------------------------- cran-comments.md | 1 + 4 files changed, 12 insertions(+), 49 deletions(-) create mode 100644 cran-comments.md diff --git a/.Rbuildignore b/.Rbuildignore index fe74ce5..c08d7ac 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,3 +6,4 @@ ^\.Rproj\.user$ ^\.github$ ^README\.Rmd$ +^cran-comments\.md$ diff --git a/DESCRIPTION b/DESCRIPTION index b1636b1..cb4be1d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: igraphdata Title: A Collection of Network Data Sets for the 'igraph' Package -Version: 1.0.1.9005 +Version: 1.0.2 Authors@R: c( person("Gábor", "Csárdi", , role = "aut", comment = c(ORCID = "0000-0001-7098-9676")), diff --git a/NEWS.md b/NEWS.md index f6ea995..cb60927 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,65 +1,26 @@ + - -# igraphdata 1.0.1.9005 - -## Chore - -- Change maintainer (#7). - - -# igraphdata 1.0.1.9004 - -## Chore - -- Update download link for yeast (#8, #9). - - -# igraphdata 1.0.1.9003 - -## Chore - -- Load igraph package when loading this package. - -- Compress as xz, in version 2. - - -# igraphdata 1.0.1.9002 +# igraphdata 1.0.2 ## Features -- Import igraph. +- Import the igraph package, load it when loading igraphdata. This ensures that all graph objects print correctly just by loading igraphdata. - Upgrade graphs to igraph 1.5.0. -## Chore - -- Igraph on CRAN now. - -- Turn off Travis and AppVeyor (#10). - -- Move README.\* to root. - - -# igraphdata 1.0.1.9001 - -## Features - -- New `lesmis_*()` functions (@krlmlr, #3). +- New `lesmis_*()` functions (#3). ## Chore -- Add tests (#5). - -- Convert documentation to roxygen2 and Markdown (@krlmlr, #4). +- Kirill Müller is the new maintainer (#7). -- Build-ignore. - -- README tweaks. +- Update download link for yeast (#8, #9). +- Turn off Travis and AppVeyor (#10). -# igraphdata 1.0.1.9000 +- Add tests (#5). -- Internal changes only. +- Convert documentation to roxygen2 and Markdown (#4). # igraphdata 1.0.1 diff --git a/cran-comments.md b/cran-comments.md new file mode 100644 index 0000000..6bcf9f3 --- /dev/null +++ b/cran-comments.md @@ -0,0 +1 @@ +igraphdata 1.0.2 From 4423b442cede0163f1ee50e2165ccd6205355e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Wed, 21 Jun 2023 19:00:47 +0200 Subject: [PATCH 2/5] Fix URLs --- DESCRIPTION | 2 +- R/UKfaculty.R | 2 +- R/USairports.R | 3 +-- R/macaque.R | 2 +- R/yeast.R | 2 +- README.Rmd | 4 ++-- README.md | 6 +++--- man/UKfaculty.Rd | 2 +- man/USairports.Rd | 3 +-- man/igraphdata-package.Rd | 2 +- man/macaque.Rd | 2 +- man/yeast.Rd | 2 +- 12 files changed, 15 insertions(+), 17 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index cb4be1d..3123fb9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,7 +17,7 @@ Description: A small collection of various network data sets, to use with Koenigsberg's bridges, visuotactile brain areas of the macaque monkey, UK faculty friendship network, domestic US flights network, etc. License: CC BY-SA 4.0 + file LICENSE -URL: http://igraph.org +URL: https://igraph.org/ BugReports: https://github.com/igraph/igraphdata/issues Depends: R (>= 2.10) diff --git a/R/UKfaculty.R b/R/UKfaculty.R index 1d589aa..5060b65 100644 --- a/R/UKfaculty.R +++ b/R/UKfaculty.R @@ -20,7 +20,7 @@ #' #' This dataset is licensed under a Creative Commons #' Attribution-Share Alike 2.0 UK: England & Wales License, -#' see for details. +#' see for details. #' Please cite the reference below if you use this dataset. #' @references Nepusz T., Petroczi A., Negyessy L., Bazso F.: Fuzzy #' communities and the concept of bridgeness in complex diff --git a/R/USairports.R b/R/USairports.R index 75edf30..4e5b3ec 100644 --- a/R/USairports.R +++ b/R/USairports.R @@ -44,8 +44,7 @@ #' } #' @source #' Most of this information was downloaded from The Research and -#' Innovative Technology Administration (RITA). See -#' for details. The airport +#' Innovative Technology Administration (RITA). The airport #' position information was collected from Wikipedia and other public #' online sources. #' @keywords datasets diff --git a/R/macaque.R b/R/macaque.R index ff608a6..5925995 100644 --- a/R/macaque.R +++ b/R/macaque.R @@ -18,7 +18,7 @@ #' #' This dataset is licensed under a Creative Commons #' Attribution-Share Alike 2.0 UK: England & Wales License, -#' see for details. +#' see for details. #' Please cite the reference below if you use this dataset. #' @references Negyessy L., Nepusz T., Kocsis L., Bazso F.: Prediction of #' the main cortical areas and connections involved in the tactile diff --git a/R/yeast.R b/R/yeast.R index 3628b6d..45e7877 100644 --- a/R/yeast.R +++ b/R/yeast.R @@ -61,6 +61,6 @@ #' Michael Cornell, Stephen G. Oliver, Stanley Fields and Peer #' Bork. *Nature* 417, 399-403 (2002) #' @source The data was downloaded from -#' . +#' . #' @keywords datasets NULL diff --git a/README.Rmd b/README.Rmd index 3efd4e3..c44f401 100644 --- a/README.Rmd +++ b/README.Rmd @@ -22,7 +22,7 @@ options(pager = function(files, header, title, delete.file) { # Data sets for the igraph R package -[![Linux build status](https://travis-ci.org/igraph/igraphdata.png)](https://travis-ci.org/igraph/igraphdata) +[![Linux build status](https://app.travis-ci.com/igraph/igraphdata.png)](https://app.travis-ci.com/igraph/igraphdata) [![Windows build status](https://ci.appveyor.com/api/projects/status/6wov9hh8oprrpkhs?svg=true)](https://ci.appveyor.com/project/gaborcsardi/igraphdata) This is a data R package, that contains network data sets, @@ -37,7 +37,7 @@ install.packages("igraphdata") ``` You can install the development version from Github, using the -[devtools package](https://github.com/hadley/devtools): +[devtools package](https://github.com/r-lib/devtools): ```{r, eval = FALSE} devtools::install_github("igraph/igraphdata") diff --git a/README.md b/README.md index cc5795b..0703324 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Data sets for the igraph R package -[![Linux build status](https://travis-ci.org/igraph/igraphdata.png)](https://travis-ci.org/igraph/igraphdata) [![Windows build status](https://ci.appveyor.com/api/projects/status/6wov9hh8oprrpkhs?svg=true)](https://ci.appveyor.com/project/gaborcsardi/igraphdata) +[![Linux build status](https://app.travis-ci.com/igraph/igraphdata.png)](https://app.travis-ci.com/igraph/igraphdata) [![Windows build status](https://ci.appveyor.com/api/projects/status/6wov9hh8oprrpkhs?svg=true)](https://ci.appveyor.com/project/gaborcsardi/igraphdata) This is a data R package, that contains network data sets, to be used with the igraph R package. @@ -13,7 +13,7 @@ From CRAN: 
 install.packages("igraphdata")
-You can install the development version from Github, using the [devtools package](https://github.com/hadley/devtools): +You can install the development version from Github, using the [devtools package](https://github.com/r-lib/devtools): 
 devtools::install_github("igraph/igraphdata")
@@ -21,7 +21,7 @@ You can install the development version from Github, using the [devtools package ## Usage 
-library(igraphdata)
+library(igraphdata)
 data(package = "igraphdata")
 #> Data sets in package 'igraphdata':
diff --git a/man/UKfaculty.Rd b/man/UKfaculty.Rd
index 34fe16e..5bbf804 100644
--- a/man/UKfaculty.Rd
+++ b/man/UKfaculty.Rd
@@ -11,7 +11,7 @@ attribute \sQuote{weight}, i.e. the graph is weighted.
 
 This dataset is licensed under a Creative Commons
 Attribution-Share Alike 2.0 UK: England & Wales License,
-see \url{http://creativecommons.org/licenses/by-sa/2.0/uk/} for details.
+see \url{https://creativecommons.org/licenses/by-sa/2.0/uk/} for details.
 Please cite the reference below if you use this dataset.
 }
 \source{
diff --git a/man/USairports.Rd b/man/USairports.Rd
index 0f72cc6..9d6096a 100644
--- a/man/USairports.Rd
+++ b/man/USairports.Rd
@@ -32,8 +32,7 @@ carried out by a given airline, using a given aircraft type.}
 }
 \source{
 Most of this information was downloaded from The Research and
-Innovative Technology Administration (RITA). See
-\url{http://www.rita.dot.gov/about_rita/} for details. The airport
+Innovative Technology Administration (RITA). The airport
 position information was collected from Wikipedia and other public
 online sources.
 }
diff --git a/man/igraphdata-package.Rd b/man/igraphdata-package.Rd
index 7902410..118b931 100644
--- a/man/igraphdata-package.Rd
+++ b/man/igraphdata-package.Rd
@@ -11,7 +11,7 @@ A small collection of various network data sets, to use with the 'igraph' packag
 \seealso{
 Useful links:
 \itemize{
-  \item \url{http://igraph.org}
+  \item \url{https://igraph.org/}
   \item Report bugs at \url{https://github.com/igraph/igraphdata/issues}
 }
 
diff --git a/man/macaque.Rd b/man/macaque.Rd
index 85fdee5..bd2fedf 100644
--- a/man/macaque.Rd
+++ b/man/macaque.Rd
@@ -10,7 +10,7 @@ A directed \code{igraph} graph object with vertex attributes
 
 This dataset is licensed under a Creative Commons
 Attribution-Share Alike 2.0 UK: England & Wales License,
-see \url{http://creativecommons.org/licenses/by-sa/2.0/uk/} for details.
+see \url{https://creativecommons.org/licenses/by-sa/2.0/uk/} for details.
 Please cite the reference below if you use this dataset.
 }
 \source{
diff --git a/man/yeast.Rd b/man/yeast.Rd
index 4d5e484..30cbfab 100644
--- a/man/yeast.Rd
+++ b/man/yeast.Rd
@@ -46,7 +46,7 @@ attributes are \code{NA} for these.
 }
 \source{
 The data was downloaded from
-\url{http://www.nature.com/nature/journal/v417/n6887/suppinfo/nature750.html}.
+\url{https://www.nature.com/articles/nature750}.
 }
 \usage{
 yeast

From 42d33b414af1139fc336e6c4abf956a41e67dc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= 
Date: Wed, 21 Jun 2023 19:05:47 +0200
Subject: [PATCH 3/5] Update badges

---
 README.Rmd | 9 +++++++--
 README.md  | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/README.Rmd b/README.Rmd
index c44f401..dd99d1f 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -22,8 +22,13 @@ options(pager = function(files, header, title, delete.file) {
 
 # Data sets for the igraph R package
 
-[![Linux build status](https://app.travis-ci.com/igraph/igraphdata.png)](https://app.travis-ci.com/igraph/igraphdata)
-[![Windows build status](https://ci.appveyor.com/api/projects/status/6wov9hh8oprrpkhs?svg=true)](https://ci.appveyor.com/project/gaborcsardi/igraphdata)
+
+[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
+[![R build status](https://github.com/igraph/igraphdata/workflows/rcc/badge.svg)](https://github.com/igraph/igraphdata/actions)
+[![Codecov test coverage](https://codecov.io/gh/igraph/igraphdata/branch/main/graph/badge.svg)](https://app.codecov.io/gh/igraph/igraphdata?branch=main)
+[![CRAN status](https://www.r-pkg.org/badges/version/igraphdata)](https://CRAN.R-project.org/package=igraphdata)
+[![Launch rstudio.cloud](https://img.shields.io/badge/rstudio-cloud-blue.svg)](https://rstudio.cloud/project/523482)
+
 
 This is a data R package, that contains network data sets,
 to be used with the igraph R package.
diff --git a/README.md b/README.md
index 0703324..87a79e7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,11 @@
 
 # Data sets for the igraph R package
 
-[![Linux build status](https://app.travis-ci.com/igraph/igraphdata.png)](https://app.travis-ci.com/igraph/igraphdata) [![Windows build status](https://ci.appveyor.com/api/projects/status/6wov9hh8oprrpkhs?svg=true)](https://ci.appveyor.com/project/gaborcsardi/igraphdata)
+
+
+[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![R build status](https://github.com/igraph/igraphdata/workflows/rcc/badge.svg)](https://github.com/igraph/igraphdata/actions) [![Codecov test coverage](https://codecov.io/gh/igraph/igraphdata/branch/main/graph/badge.svg)](https://app.codecov.io/gh/igraph/igraphdata?branch=main) [![CRAN status](https://www.r-pkg.org/badges/version/igraphdata)](https://CRAN.R-project.org/package=igraphdata) [![Launch rstudio.cloud](https://img.shields.io/badge/rstudio-cloud-blue.svg)](https://rstudio.cloud/project/523482)
+
+
 
 This is a data R package, that contains network data sets, to be used with the igraph R package.
 

From fbc9195e256abbccb3d1e10a112fb2c7ce8a1678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= 
Date: Wed, 21 Jun 2023 19:17:58 +0200
Subject: [PATCH 4/5] URL

---
 R/Koenigsberg.R    | 2 +-
 man/Koenigsberg.Rd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/Koenigsberg.R b/R/Koenigsberg.R
index 5415e47..81029f1 100644
--- a/R/Koenigsberg.R
+++ b/R/Koenigsberg.R
@@ -33,6 +33,6 @@
 #'
 #'   This dataset is in the public domain.
 #' @source Wikipedia,
-#'   
+#'   
 #' @keywords datasets
 NULL
diff --git a/man/Koenigsberg.Rd b/man/Koenigsberg.Rd
index 23f6d9b..61829d9 100644
--- a/man/Koenigsberg.Rd
+++ b/man/Koenigsberg.Rd
@@ -15,7 +15,7 @@ This dataset is in the public domain.
 }
 \source{
 Wikipedia,
-\url{http://de.wikipedia.org/wiki/K\%C3\%B6nigsberger_Br\%C3\%BCcken}
+\url{https://de.wikipedia.org/wiki/K\%C3\%B6nigsberger_Br\%C3\%BCcken}
 }
 \usage{
 Koenigsberg

From 9d1f30603886b59679ebff92ce1f1529d5be198c Mon Sep 17 00:00:00 2001
From: krlmlr 
Date: Sat, 16 Nov 2024 05:48:01 +0000
Subject: [PATCH 5/5] chore: Auto-update from GitHub Actions

Run: https://github.com/igraph/igraphdata/actions/runs/11867678721
---
 .github/dep-suggests-matrix.json | 0
 .github/versions-matrix.json     | 1 -
 2 files changed, 1 deletion(-)
 delete mode 100644 .github/dep-suggests-matrix.json
 delete mode 100644 .github/versions-matrix.json

diff --git a/.github/dep-suggests-matrix.json b/.github/dep-suggests-matrix.json
deleted file mode 100644
index e69de29..0000000
diff --git a/.github/versions-matrix.json b/.github/versions-matrix.json
deleted file mode 100644
index 5af4434..0000000
--- a/.github/versions-matrix.json
+++ /dev/null
@@ -1 +0,0 @@
-{"include":[{"os":"macos-latest","r":"4.4"},{"os":"macos-latest","r":"4.3"},{"os":"windows-latest","r":"devel"},{"os":"windows-latest","r":"4.4"},{"os":"windows-latest","r":"4.3"},{"os":"ubuntu-22.04","r":"devel","http-user-agent":"release"},{"os":"ubuntu-22.04","r":"4.4"},{"os":"ubuntu-22.04","r":"4.3"},{"os":"ubuntu-22.04","r":"4.2"},{"os":"ubuntu-22.04","r":"4.1"},{"os":"ubuntu-22.04","r":"4.0"},{"os":"ubuntu-22.04","r":"4.4","covr":"true","desc":"with covr"}]}