From 6794abe06d6ed968f1cee91dd1dd12ca0f5f4faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 1 Dec 2024 20:59:02 +0100 Subject: [PATCH 1/5] CRAN comments --- cran-comments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index 384ebf18b4..b1264f2101 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -igraph 2.1.1.9900 +igraph 2.1.2 ## Cran Repository Policy From 11d7d4dec193b12fd4d7883dd3dc5f1d10a4126b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 1 Dec 2024 20:59:03 +0100 Subject: [PATCH 2/5] fledge: Bump version to 2.1.2 --- DESCRIPTION | 2 +- NEWS.md | 97 ++++------------------------------------------------- 2 files changed, 8 insertions(+), 91 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3b779cf83c..6459b4e8a0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: igraph Title: Network Analysis and Visualization -Version: 2.1.1.9907 +Version: 2.1.2 Authors@R: c( person("Gábor", "Csárdi", , "csardi.gabor@gmail.com", role = "aut", comment = c(ORCID = "0000-0001-7098-9676")), diff --git a/NEWS.md b/NEWS.md index 00bfad89d7..87fcd6bad4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,13 +1,6 @@ -# igraph 2.1.1.9907 - -## Chore - -- Build-ignore rchk artifacts. - - -# igraph 2.1.1.9906 +# igraph 2.1.2 ## Bug fixes @@ -15,6 +8,12 @@ - Fix protection errors reported by rchk (#1592). +- Fix the incorrect handling of the `sample` parameter in `sample_motifs()` and ensure that the default `sample.size` is integer (#1568). + +## Chore + +- Build-ignore rchk artifacts. + ## Continuous integration - Change `Makevars` only after installation of R. @@ -41,84 +40,6 @@ - Tweak NEWS \[ci skip\]. - -# igraph 2.1.1.9905 - -## Continuous integration - -- Import from actions-sync, check carefully (#1600). - -- Remove covr, handled elsewhere. - -- Fix extra workflow. - -- Remove noise. - -- Sync workflows (#1589). - -## Documentation - -- Tweak NEWS \[ci skip\]. - - -# igraph 2.1.1.9904 - -## Continuous integration - -- Import from actions-sync, check carefully (#1600). - -- Remove covr, handled elsewhere. - -- Fix extra workflow. - -- Remove noise. - -- Sync workflows (#1589). - -## Documentation - -- Tweak NEWS \[ci skip\]. - - -# igraph 2.1.1.9903 - -## Continuous integration - -- Import from actions-sync, check carefully (#1600). - -- Remove covr, handled elsewhere. - -- Fix extra workflow. - -- Remove noise. - -- Sync workflows (#1589). - - -# igraph 2.1.1.9902 - -## Continuous integration - -- Remove covr, handled elsewhere. - -- Fix extra workflow. - -- Remove noise. - -- Sync workflows (#1589). - - -# igraph 2.1.1.9901 - -## Continuous integration - -- Sync workflows (#1589). - - -# igraph 2.1.1.9900 - -## Documentation - - Clarify what type of graph each community detection function supports. - Improve `?read_graph` and `?write_graph` documentation. @@ -127,10 +48,6 @@ - `cluster_optimal()` does support directed graphs. -## Bug fixes - -- Fix the incorrect handling of the `sample` parameter in `sample_motifs()` and ensure that the default `sample.size` is integer (#1568). - # igraph 2.1.1 From 5af1d6b3561a4754eba7d3fe23aa21d63da80f7e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 20:00:18 +0000 Subject: [PATCH 3/5] Update CITATION.cff --- CITATION.cff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index b6aa529c41..0f383f53c0 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "igraph" in publications use:' type: software license: GPL-2.0-or-later title: 'igraph: Network Analysis and Visualization' -version: 2.1.1 +version: 2.1.2 identifiers: - type: doi value: 10.32614/CRAN.package.igraph @@ -93,7 +93,7 @@ references: - family-names: Müller given-names: Kirill year: '2024' - notes: R package version 2.1.1 + notes: R package version 2.1.2 doi: 10.5281/zenodo.7682609 url: https://CRAN.R-project.org/package=igraph - type: software From 9df8a5c12115ed34408d9770a3e8b7d7206412cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 1 Dec 2024 21:01:28 +0100 Subject: [PATCH 4/5] NEWS --- NEWS.md | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/NEWS.md b/NEWS.md index 87fcd6bad4..e333474a84 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,36 +10,8 @@ - Fix the incorrect handling of the `sample` parameter in `sample_motifs()` and ensure that the default `sample.size` is integer (#1568). -## Chore - -- Build-ignore rchk artifacts. - -## Continuous integration - -- Change `Makevars` only after installation of R. - -- Use GLPK on macOS. - -- Add required rgl version (#1584). - -- Install GLPK on macOS. - -- Bring back extra workflow. - -- Import from actions-sync, check carefully (#1600). - -- Remove covr, handled elsewhere. - -- Fix extra workflow. - -- Remove noise. - -- Sync workflows (#1589). - ## Documentation -- Tweak NEWS \[ci skip\]. - - Clarify what type of graph each community detection function supports. - Improve `?read_graph` and `?write_graph` documentation. @@ -48,6 +20,10 @@ - `cluster_optimal()` does support directed graphs. +## Testing + +- Test handling of `"return.vs.es"` in several functions (@stibu81, #1610). + # igraph 2.1.1 From 32bd6533e93db31160180ea909f9593779a2272c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 1 Dec 2024 22:06:49 +0100 Subject: [PATCH 5/5] Move rchk files out of sight --- .Rbuildignore | 4 +--- .gitignore | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 0434384cf2..073411ed5d 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -56,6 +56,4 @@ ^man/dot-extract_constructor_and_modifiers\.Rd$ ^man/dot-apply_modifiers\.Rd$ ^man/handle_vertex_type_arg\.Rd$ -^build$ -^libs$ -^libsonly$ +^rchk$ diff --git a/.gitignore b/.gitignore index 207bc92798..da6abc2afb 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,4 @@ cran /docs /compile_commands.json /.cache -build/ -libs/ -libsonly/ +/rchk