Skip to content

Commit

Permalink
Merge pull request #279 from luukvdmeer/v1.0
Browse files Browse the repository at this point in the history
V1.0
  • Loading branch information
luukvdmeer authored Nov 17, 2024
2 parents 2eb08cf + e22c290 commit bcad014
Show file tree
Hide file tree
Showing 145 changed files with 15,321 additions and 6,910 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
^pkgdown$
^revdep$
^bench$
^data-raw$
^CODE_OF_CONDUCT\.md$
^CONTRIBUTING\.md$
^LICENSE\.md$
Expand All @@ -17,3 +18,5 @@
^hexlogo\.R$
^\.todo$
^vignettes/.*\.html$
^vignettes/*_files$
^man/figures-raw$
33 changes: 17 additions & 16 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master, develop]
branches: [main, master]
pull_request:
branches: [main, master, develop]
branches: [main, master]

name: R-CMD-check
name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
R: [ 'release' ]

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.R }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
error-on: '"error"'
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
18 changes: 12 additions & 6 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand All @@ -26,8 +26,14 @@ jobs:
extra-packages: any::pkgdown, local::.
needs: website

- name: Deploy package
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
5 changes: 3 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ The type should be one of the defined types listed below. If you feel artistic,
- **feat**: Implementation of a new feature. `:gift:` :gift:
- **fix**: A bug fix. `:wrench:` :wrench:
- **style**: Changes to code formatting. No change to program logic. `:art:` :art:
- **refactor**: Changes to code which do not change behaviour, e.g. renaming variables or splitting functions. `:construction:` :construction:
- **docs**: Adding, removing or updating user documentation or to code comments. `:books:` :books:
- **refactor**: Changes to existing functionality that do not change behaviour. `:construction:` :construction:
- **breaking**: Changes to existing functionality that are not backwards compatible. `:warning:` :warning:
- **docs**: Adding, removing or updating user documentation. `:books:` :books:
- **logs**: Adding, removing or updating log messages. `:sound:` :sound:
- **test**: Adding, removing or updating tests. No changes to user code. `:test_tube:` :test_tube:
- **cicd**: Adding, removing or updating CI/CD workflows. No changes to user code. `:robot:` :robot:
Expand Down
34 changes: 23 additions & 11 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: sfnetworks
Title: Tidy Geospatial Networks
Version: 0.6.4
Version: 1.0.0
Authors@R:
c(person(given = "Lucas",
family = "van der Meer",
Expand Down Expand Up @@ -34,33 +34,45 @@ BugReports: https://github.com/luukvdmeer/sfnetworks/issues/
Depends:
R (>= 3.6)
Imports:
crayon,
dplyr,
cli (>= 3.0.0),
dplyr (>= 1.1.0),
graphics,
igraph,
igraph (>= 2.1.0),
lifecycle (>= 1.0.0),
lwgeom,
rlang,
sf,
sfheaders,
methods,
pillar,
rlang (>= 1.0.0),
sf (>= 1.0-11),
sfheaders (>= 0.2.2),
stats,
tibble,
tidygraph,
units,
tidygraph (>= 1.3.0),
tidyselect (>= 1.0.0),
units (>= 0.4.6),
utils
Suggests:
dbscan,
dodgr,
fansi,
geodist,
ggplot2 (>= 3.0.0),
ggraph (>= 2.2.0),
knitr,
osmdata,
purrr,
quarto,
rmarkdown,
s2 (>= 1.0.1),
spatstat.geom,
spatstat.linnet,
spdep,
testthat,
TSP
VignetteBuilder:
knitr
knitr,
quarto
ByteCompile: true
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Loading

0 comments on commit bcad014

Please sign in to comment.