Skip to content

Commit

Permalink
Merge pull request #151 from AgroCares/development
Browse files Browse the repository at this point in the history
Release/v2.0.0
  • Loading branch information
SvenVw authored Jan 11, 2022
2 parents 5d4ee8a + e444ab6 commit af41464
Show file tree
Hide file tree
Showing 255 changed files with 27,207 additions and 11,948 deletions.
4 changes: 3 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
^docs$
^Meta$
^dev$
^DEV$
^DEV$
^\.github$
^codecov\.yml$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
46 changes: 46 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

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

steps:
- uses: actions/checkout@v2

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

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: rcmdcheck

- uses: r-lib/actions/check-r-package@v1
35 changes: 35 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

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

- uses: r-lib/actions/setup-r@v1
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: pkgdown
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)'
30 changes: 30 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master, development]
pull_request:
branches: [main, master, development]

name: test-coverage

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: covr

- name: Test coverage
run: covr::codecov()
shell: Rscript {0}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Meta
dev/*.tif
dev/*.gpkg
dev/*brp19.Rdata
dev/brp*.rds
dev/brp*.rds
20 changes: 12 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Package: OBIC
Type: Package
Title: Functions for the Open Bodem Index (OBI)
Version: 1.0.4
Title: Calculate the Open Bodem Index (OBI) score
Version: 2.0.0
Authors@R: c(
person("Sven", "Verweij", email = "[email protected]", role = c("aut","cre")),
person("Gerard", "Ros", email = "[email protected]", role = "aut"),
person("Job", "de Pater", email = "[email protected]", role = "ctb"),
person("Yuki", "Fujita", email = "[email protected]", role = "ctb"),
person("Nutriënten Managment Instituut", email = "nmi@nmi-agro.nl", role = "cph"),
person("Brent", "Riechelman", email = 'brent.riechelman@nmi-agro.nl', role = "ctb"))
Description: This package can be used to calculate the Open Bodem Index (OBI).
The OBI is a tool that evaluate the soil of agricultural fields based on four main criteria: chemical, physical, biological and managment.
person("Brent", "Riechelman", email = 'brent.riechelman@nmi-agro.nl', role = "ctb"),
person("Nutriënten Managment Instituut", email = "nmi@nmi-agro.nl", role = "cph"))
Description: The Open Bodem Index (OBI) is a method to evaluate soils of agricultural fields.
This score is base on four main criteria: chemical, physical, biological and managment.
These four criteria consist of more than 21 indicators to get an comprehensive picture of the soil.
The OBIC is an implementation of the the Open Bodem Index (OBI) and can be used to calculate the scores, indicators and derivatives that are used by the OBI
More information about the Open Bodem Index can be found a https://www.openbodemindex.nl/.
Depends:
R (>= 3.5.0)
Expand All @@ -23,9 +24,12 @@ URL: https://github.com/AgroCares/Open-Bodem-Index-Calculator
BugReports: https://github.com/AgroCares/Open-Bodem-Index-Calculator/issues
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.1
RoxygenNote: 7.1.2
Suggests:
testthat (>= 2.1.0),
knitr,
rmarkdown
rmarkdown,
ggplot2,
patchwork,
covr
VignetteBuilder: knitr
Loading

0 comments on commit af41464

Please sign in to comment.