Skip to content

Commit

Permalink
Merge pull request #270 from snlab-ch/develop
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
jhollway authored Jun 14, 2023
2 parents e1fd98d + 30a1ef6 commit 6ee6e54
Show file tree
Hide file tree
Showing 172 changed files with 3,154 additions and 12,302 deletions.
17 changes: 8 additions & 9 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@

# Checklist:

- Documentation
- [ ] Any longer functions are commented inline so that it is easier to debug in the future
- [ ] Any new or modified functions or data have roxygen style documentation in their .R scripts
- [ ] DESCRIPTION file version is bumped by the appropriate increment (major, minor, patch)
- PR form
- [ ] This pull request has an informative title
- [ ] Description above itemizes changes under subtitles, e.g. "## Data""
- [ ] Any closed, fixed, or related issues are referenced and explained in the description above, e.g. "Fixed #0 by adding A"
- [ ] Package builds on my OS without issues
- [ ] Title indicates expected version number
- [ ] PR description above and the NEWS.md file are aligned
- [ ] Any closed, fixed, or related issues are referenced and described, e.g. "Fixed #0 by adding A"
- PR checks all pass for latest commit
- [ ] Package builds on my OS without issues
- [ ] CodeFactor check: Package improves or maintains good style
- [ ] Package builds on Mac
- [ ] Package builds on Windows
- [ ] Package builds on Linux
- [ ] CodeCov check: Package improves or maintains good test coverage
- Documentation
- [ ] Any new or modified functions or data have roxygen style documentation in their .R scripts
- [ ] Any longer functions are commented inline so that it is easier to debug in the future
- [ ] PR description above and the NEWS.md file are aligned
- [ ] DESCRIPTION file version is bumped by the appropriate increment (major, minor, patch)
35 changes: 13 additions & 22 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: migraph
Title: Tools for Multimodal Network Analysis
Version: 0.13.2
Date: 2022-12-20
Title: Multimodal Network Analysis and More
Version: 1.0.0
Date: 2023-06-13
Description: A set of tools for analysing multimodal networks.
All functions operate with matrices, edge lists,
and 'igraph', 'network', and 'tidygraph' objects,
Expand All @@ -14,25 +14,22 @@ Description: A set of tools for analysing multimodal networks.
and includes various datasets used in the book in addition to other network data.
URL: https://github.com/snlab-ch/migraph
BugReports: https://github.com/snlab-ch/migraph/issues
Depends: R (>= 3.6.0)
License: MIT + file LICENSE
Language: en-GB
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.2.2
RoxygenNote: 7.2.3
Depends:
R (>= 3.6.0),
manynet
Imports:
BiocManager,
dplyr,
dplyr (>= 1.1.0),
generics,
ggforce,
ggplot2,
ggraph,
igraph,
methods,
network,
future,
furrr,
patchwork,
pillar,
purrr,
rlang,
Expand All @@ -43,13 +40,8 @@ Suggests:
concaveman,
covr,
ggdendro,
knitr,
minMSE,
oaqc,
readxl,
Rgraphviz,
RSiena,
rmarkdown,
roxygen2,
rsconnect,
testthat,
Expand All @@ -60,6 +52,10 @@ Authors@R:
role = c("cre", "aut", "ctb"),
email = "james.hollway@graduateinstitute.ch",
comment = c("IHEID", ORCID = "0000-0002-8361-9647")),
person(given = "Henrique",
family = "Sposito",
role = "ctb",
comment = c("IHEID", ORCID = "0000-0003-3420-6085")),
person(given = "Jael",
family = "Tan",
role = "ctb",
Expand All @@ -69,11 +65,6 @@ Authors@R:
family = "Bieri",
role = c("ctb"),
email = "bernhard.bieri@graduateinstitute.ch",
comment = c(ORCID = "0000-0001-5943-9059")),
person(given = "Henrique",
family = "Sposito",
role = "ctb",
comment = c("IHEID", ORCID = "0000-0003-3420-6085"))
comment = c(ORCID = "0000-0001-5943-9059"))
)
Roxygen: list(markdown = TRUE, roclets = c("namespace", "rd"))
VignetteBuilder: knitr
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2020
YEAR: 2021
COPYRIGHT HOLDER: James Hollway
Loading

0 comments on commit 6ee6e54

Please sign in to comment.