Skip to content

Commit edbb220

Browse files
committed
Merge main, resolve conflicts, remove spurious .dd system headers
2 parents 4536066 + 4d7a05f commit edbb220

File tree

146 files changed

+12660
-6652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+12660
-6652
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,12 @@ jobs:
223223
env:
224224
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225225
run: |
226-
# Check status of this workflow
227-
state="pending"
226+
# Set status to success if job succeeded, failure otherwise
227+
if [ "${{ job.status }}" == "success" ]; then
228+
state="success"
229+
else
230+
state="failure"
231+
fi
228232
sha=${{ inputs.ref }}
229233
if [ -z "${sha}" ]; then
230234
sha=${{ github.sha }}

.github/workflows/vendor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- "vendor-one.sh"
88
workflow_dispatch:
99
schedule:
10-
- cron: "0 * * * *"
10+
- cron: "* 0 * * *"
1111

1212
concurrency:
1313
group: ${{ github.workflow }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ cran
2525
/tests/testthat/testthat-problems.rds
2626
/covr
2727
/.vscode/launch.json
28+
/_codeql_detected_source_root

AGENTS.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ pak::pak(dependencies = "Config/Needs/build")
3737

3838
- Load package for development: `pkgload::load_all()`
3939
- Run tests: `testthat::test_local(reporter = "check")`
40+
- Run tests for a single file `test-foo.R`: `testthat::test_local(filter = "foo", reporter = "check")`
4041
- Build package: `devtools::build()`
4142
- Check package: `devtools::check()`
42-
- Update documentation: `devtools::document()`
43+
- Update `.Rd` documentation: `devtools::document()`
4344
- Format code: `air format .`
4445

4546
## Code Style and Documentation
@@ -48,6 +49,7 @@ pak::pak(dependencies = "Config/Needs/build")
4849

4950
- IMPORTANT: PR titles end up in `NEWS.md` grouped by conventional commit label. PRs and commits use the conventional commit style with backticks for code references such as `function_call()`
5051
- PRs are generally squashed, a clean history within a PR is not necessary
52+
- Before resuming work on a PR, always merge the current base branch (typically `main`)
5153

5254
### Comment Style
5355

@@ -59,15 +61,18 @@ pak::pak(dependencies = "Config/Needs/build")
5961
### R Code Conventions
6062

6163
- Follow the [tidyverse style guide](https://style.tidyverse.org) and the [tidyverse design guide](https://design.tidyverse.org)
62-
- Use `snake_case` for new functions
64+
- Use `snake_case` for new functions and all arguments
6365
- Use explicit package prefixes (e.g., `withr::local_db_connection()`) for clarity
6466
- Maintain consistent indentation (2 spaces) and spacing patterns
6567
- Use meaningful variable names that reflect context
6668
- Run `air format .` before committing changes to ensure consistent formatting
69+
- Never change deprecated functions
70+
- Avoid `.Call()` outside `*_impl()` in `aaa-auto.R`
6771

6872
### Documentation
6973

7074
- Use roxygen2 with Markdown syntax for all function documentation
75+
- Use explicit `@description` and `@details` sections, aim for a complete description and move only excess details to `@details`
7176
- Use math notation for formulas: `\eqn{...}` for inline, `\deqn{...}` for display equations
7277
- Keep each sentence on its own line in roxygen2 comments for better readability
7378
- Document all arguments and return values
@@ -88,8 +93,16 @@ All new functions must include:
8893
- Proper documentation, including arguments and return values
8994
- A concept so that it exists in the pkgdown reference index
9095
- An "experimental" badge via `r lifecycle::badge("experimental")`
96+
- All arguments in `snake_case`, with documentation and suitable defaults
97+
- An ellipsis guarded with `check_dots_empty()` separating mandatory and optional arguments
98+
- Argument validation using built-in `check_*()` functions or `igraph_arg_match()`
9199

92-
If exporting a new function from the C library, ensure it is autogenerated and add tests for the `_impl` function.
100+
If exporting a new function from the C library:
101+
102+
- Ensure it is autogenerated
103+
- Add tests for the `_impl` function
104+
- Name all arguments in all calls to the `_impl` function
105+
- For graph constructors, prefer `GATTR` and `GATTR-PARAM` in Stimulus over manually assigning attributes
93106

94107
## File Structure and Organization
95108

@@ -111,9 +124,11 @@ See `tools/README.md` for guidelines on code generation using the Stimulus frame
111124

112125
### Build Artifacts
113126

114-
Do not commit: `*.dd`, `*.d`, `*.o`, `*.so` files in `src/`, and `tests/testthat/testthat-problems.rds`.
127+
Do not commit: `*.d`, `*.o`, `*.so` files in `src/`, and `tests/testthat/testthat-problems.rds`.
115128
These are build artifacts that are regenerated automatically (see `src/README.md` for details on dependency tracking).
116129

130+
Careful with changes to `*.dd`, keep system headers out, only expect changes if new source files are added or their local dependencies change.
131+
117132
## Testing
118133

119134
- Add test cases for all new functionality

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: igraph
22
Title: Network Analysis and Visualization
3-
Version: 2.2.1.9000
3+
Version: 2.2.1.9006
44
Authors@R: c(
55
person("Gábor", "Csárdi", , "csardi.gabor@gmail.com", role = "aut",
66
comment = c(ORCID = "0000-0001-7098-9676")),

NAMESPACE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ export(centralize)
222222
export(centralize.scores)
223223
export(chordal_ring)
224224
export(chung_lu)
225+
export(circulant)
225226
export(cit_cit_types)
226227
export(cit_types)
227228
export(cited.type.game)
@@ -272,9 +273,11 @@ export(count.multiple)
272273
export(count_automorphisms)
273274
export(count_components)
274275
export(count_isomorphisms)
276+
export(count_loops)
275277
export(count_max_cliques)
276278
export(count_motifs)
277279
export(count_multiple)
280+
export(count_reachable)
278281
export(count_subgraph_isomorphisms)
279282
export(count_triangles)
280283
export(create.communities)
@@ -366,6 +369,7 @@ export(from_prufer)
366369
export(full_bipartite_graph)
367370
export(full_citation_graph)
368371
export(full_graph)
372+
export(full_multipartite)
369373
export(get.adjacency)
370374
export(get.adjedgelist)
371375
export(get.adjlist)
@@ -649,6 +653,7 @@ export(local_scan)
649653
export(make_)
650654
export(make_bipartite_graph)
651655
export(make_chordal_ring)
656+
export(make_circulant)
652657
export(make_clusters)
653658
export(make_de_bruijn_graph)
654659
export(make_directed_graph)
@@ -658,6 +663,7 @@ export(make_from_prufer)
658663
export(make_full_bipartite_graph)
659664
export(make_full_citation_graph)
660665
export(make_full_graph)
666+
export(make_full_multipartite)
661667
export(make_graph)
662668
export(make_kautz_graph)
663669
export(make_lattice)
@@ -666,7 +672,9 @@ export(make_neighborhood_graph)
666672
export(make_ring)
667673
export(make_star)
668674
export(make_tree)
675+
export(make_turan)
669676
export(make_undirected_graph)
677+
export(make_wheel)
670678
export(match_vertices)
671679
export(max_bipartite_match)
672680
export(max_cardinality)
@@ -682,6 +690,7 @@ export(maximal.independent.vertex.sets)
682690
export(maximal_ivs)
683691
export(maximum.bipartite.matching)
684692
export(maximum.cardinality.search)
693+
export(mean_degree)
685694
export(mean_distance)
686695
export(membership)
687696
export(merge_coords)
@@ -866,11 +875,13 @@ export(topo_sort)
866875
export(topological.sort)
867876
export(traits)
868877
export(traits_callaway)
878+
export(transitive_closure)
869879
export(transitivity)
870880
export(tree)
871881
export(triad.census)
872882
export(triad_census)
873883
export(triangles)
884+
export(turan)
874885
export(undirected_graph)
875886
export(unfold.tree)
876887
export(unfold_tree)
@@ -892,6 +903,7 @@ export(walktrap.community)
892903
export(watts.strogatz.game)
893904
export(weighted_clique_num)
894905
export(weighted_cliques)
906+
export(wheel)
895907
export(which_loop)
896908
export(which_multiple)
897909
export(which_mutual)

0 commit comments

Comments
 (0)