Skip to content

Commit bcad014

Browse files
authored
Merge pull request #279 from luukvdmeer/v1.0
V1.0
2 parents 2eb08cf + e22c290 commit bcad014

File tree

145 files changed

+15321
-6910
lines changed

Some content is hidden

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

145 files changed

+15321
-6910
lines changed

.Rbuildignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
^pkgdown$
66
^revdep$
77
^bench$
8+
^data-raw$
89
^CODE_OF_CONDUCT\.md$
910
^CONTRIBUTING\.md$
1011
^LICENSE\.md$
@@ -17,3 +18,5 @@
1718
^hexlogo\.R$
1819
^\.todo$
1920
^vignettes/.*\.html$
21+
^vignettes/*_files$
22+
^man/figures-raw$

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
push:
5-
branches: [main, master, develop]
5+
branches: [main, master]
66
pull_request:
7-
branches: [main, master, develop]
7+
branches: [main, master]
88

9-
name: R-CMD-check
9+
name: R-CMD-check.yaml
10+
11+
permissions: read-all
1012

1113
jobs:
1214
R-CMD-check:
1315
runs-on: ubuntu-latest
16+
1417
strategy:
18+
fail-fast: false
1519
matrix:
1620
R: [ 'release' ]
21+
1722
env:
1823
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1924
R_KEEP_PKG_SOURCE: yes
25+
2026
steps:
2127
- uses: actions/checkout@v4
2228

29+
- uses: r-lib/actions/setup-pandoc@v2
30+
2331
- uses: r-lib/actions/setup-r@v2
2432
with:
2533
r-version: ${{ matrix.R }}
2634
use-public-rspm: true
2735

2836
- uses: r-lib/actions/setup-r-dependencies@v2
2937
with:
30-
extra-packages: rcmdcheck
38+
extra-packages: any::rcmdcheck
39+
needs: check
3140

3241
- uses: r-lib/actions/check-r-package@v2
33-
34-
- name: Show testthat output
35-
if: always()
36-
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
37-
shell: bash
38-
39-
- name: Upload check results
40-
if: failure()
41-
uses: actions/upload-artifact@main
4242
with:
43-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
44-
path: check
43+
error-on: '"error"'
44+
upload-snapshots: true
45+
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/pkgdown.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
- uses: r-lib/actions/setup-pandoc@v2
1919

@@ -26,8 +26,14 @@ jobs:
2626
extra-packages: any::pkgdown, local::.
2727
needs: website
2828

29-
- name: Deploy package
30-
run: |
31-
git config --local user.name "$GITHUB_ACTOR"
32-
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
33-
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
29+
- name: Build site
30+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
31+
shell: Rscript {0}
32+
33+
- name: Deploy to GitHub pages 🚀
34+
if: github.event_name != 'pull_request'
35+
uses: JamesIves/github-pages-deploy-action@v4.5.0
36+
with:
37+
clean: false
38+
branch: gh-pages
39+
folder: docs

CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ The type should be one of the defined types listed below. If you feel artistic,
2727
- **feat**: Implementation of a new feature. `:gift:` :gift:
2828
- **fix**: A bug fix. `:wrench:` :wrench:
2929
- **style**: Changes to code formatting. No change to program logic. `:art:` :art:
30-
- **refactor**: Changes to code which do not change behaviour, e.g. renaming variables or splitting functions. `:construction:` :construction:
31-
- **docs**: Adding, removing or updating user documentation or to code comments. `:books:` :books:
30+
- **refactor**: Changes to existing functionality that do not change behaviour. `:construction:` :construction:
31+
- **breaking**: Changes to existing functionality that are not backwards compatible. `:warning:` :warning:
32+
- **docs**: Adding, removing or updating user documentation. `:books:` :books:
3233
- **logs**: Adding, removing or updating log messages. `:sound:` :sound:
3334
- **test**: Adding, removing or updating tests. No changes to user code. `:test_tube:` :test_tube:
3435
- **cicd**: Adding, removing or updating CI/CD workflows. No changes to user code. `:robot:` :robot:

DESCRIPTION

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: sfnetworks
22
Title: Tidy Geospatial Networks
3-
Version: 0.6.4
3+
Version: 1.0.0
44
Authors@R:
55
c(person(given = "Lucas",
66
family = "van der Meer",
@@ -34,33 +34,45 @@ BugReports: https://github.com/luukvdmeer/sfnetworks/issues/
3434
Depends:
3535
R (>= 3.6)
3636
Imports:
37-
crayon,
38-
dplyr,
37+
cli (>= 3.0.0),
38+
dplyr (>= 1.1.0),
3939
graphics,
40-
igraph,
40+
igraph (>= 2.1.0),
41+
lifecycle (>= 1.0.0),
4142
lwgeom,
42-
rlang,
43-
sf,
44-
sfheaders,
43+
methods,
44+
pillar,
45+
rlang (>= 1.0.0),
46+
sf (>= 1.0-11),
47+
sfheaders (>= 0.2.2),
48+
stats,
4549
tibble,
46-
tidygraph,
47-
units,
50+
tidygraph (>= 1.3.0),
51+
tidyselect (>= 1.0.0),
52+
units (>= 0.4.6),
4853
utils
4954
Suggests:
5055
dbscan,
56+
dodgr,
5157
fansi,
58+
geodist,
5259
ggplot2 (>= 3.0.0),
60+
ggraph (>= 2.2.0),
5361
knitr,
62+
osmdata,
5463
purrr,
64+
quarto,
5565
rmarkdown,
5666
s2 (>= 1.0.1),
5767
spatstat.geom,
5868
spatstat.linnet,
69+
spdep,
5970
testthat,
6071
TSP
6172
VignetteBuilder:
62-
knitr
73+
knitr,
74+
quarto
6375
ByteCompile: true
6476
Encoding: UTF-8
6577
LazyData: true
66-
RoxygenNote: 7.3.1
78+
RoxygenNote: 7.3.2

0 commit comments

Comments
 (0)