Skip to content

Commit b4f6981

Browse files
hsonnehsonne
authored
Merge pull request #2 from KWB-R/dev
Prepare Release v0.3.0
2 parents 94d17a4 + 3b97002 commit b4f6981

File tree

121 files changed

+3674
-2100
lines changed

Some content is hidden

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

121 files changed

+3674
-2100
lines changed

‎.Rbuildignore

+3
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ README\.md$
1111
^\.gitignore$
1212
^docs$
1313
^.gitlab-ci\.yml$
14+
^\.github$
15+
^README\.md$
16+
^index\.md$

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

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
- main
6+
- dev
7+
pull_request:
8+
branches:
9+
- master
10+
- main
11+
- dev
12+
13+
name: R-CMD-check
14+
15+
jobs:
16+
R-CMD-check:
17+
runs-on: ${{ matrix.config.os }}
18+
19+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
config:
25+
- {os: macOS-latest, r: 'release'}
26+
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
27+
- {os: windows-latest, r: 'devel'}
28+
- {os: windows-latest, r: 'oldrel'}
29+
- {os: windows-latest, r: 'release'}
30+
31+
env:
32+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
33+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
34+
RSPM: ${{ matrix.config.rspm }}
35+
36+
steps:
37+
- uses: actions/checkout@v2
38+
39+
- uses: r-lib/actions/setup-r@v2
40+
with:
41+
r-version: ${{ matrix.config.r }}
42+
use-public-rspm: true
43+
44+
- uses: r-lib/actions/setup-pandoc@v2
45+
46+
- name: Query dependencies
47+
run: |
48+
install.packages('remotes')
49+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
50+
shell: Rscript {0}
51+
52+
- name: Cache R packages
53+
if: runner.os != 'Windows'
54+
uses: actions/cache@v1
55+
with:
56+
path: ${{ env.R_LIBS_USER }}
57+
key: ${{ runner.os }}-r-${{ matrix.config.r }}-3-${{ hashFiles('depends.Rds') }}
58+
restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-3-
59+
60+
- name: Install system dependencies
61+
if: runner.os == 'Linux'
62+
env:
63+
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
64+
run: |
65+
Rscript -e "remotes::install_github('r-hub/sysreqs')"
66+
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
67+
sudo -s eval "$sysreqs"
68+
- name: Install dependencies
69+
run: |
70+
remotes::install_deps(dependencies = TRUE)
71+
remotes::install_cran("rcmdcheck")
72+
shell: Rscript {0}
73+
74+
- name: Check
75+
run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
76+
shell: Rscript {0}
77+
78+
- name: Upload check results
79+
if: failure()
80+
uses: actions/upload-artifact@main
81+
with:
82+
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
83+
path: check

‎.github/workflows/pkgdown.yaml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
on:
2+
push:
3+
branches:
4+
- main
5+
- master
6+
- dev
7+
8+
name: pkgdown
9+
10+
jobs:
11+
pkgdown:
12+
runs-on: windows-latest
13+
env:
14+
CURL_SSL_BACKEND: "openssl"
15+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
16+
steps:
17+
- uses: actions/checkout@v2
18+
19+
- uses: r-lib/actions/setup-r@v2
20+
with:
21+
use-public-rspm: true
22+
23+
- uses: r-lib/actions/setup-pandoc@v2
24+
25+
- name: Query dependencies
26+
run: |
27+
install.packages('remotes')
28+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
29+
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
30+
shell: Rscript {0}
31+
32+
- name: Cache R packages
33+
uses: actions/cache@v2
34+
with:
35+
path: ${{ env.R_LIBS_USER }}
36+
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
37+
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
38+
39+
- name: Install dependencies
40+
run: |
41+
remotes::install_deps(dependencies = TRUE)
42+
install.packages("pkgdown", type = "binary")
43+
shell: Rscript {0}
44+
45+
- name: Install package
46+
run: R CMD INSTALL .
47+
shell: cmd
48+
49+
- name: Deploy package
50+
run: |
51+
git config --local user.email "[email protected]"
52+
git config --local user.name "GitHub Actions"
53+
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'

‎.github/workflows/pr-commands.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
on:
2+
issue_comment:
3+
types: [created]
4+
name: Commands
5+
jobs:
6+
document:
7+
if: startsWith(github.event.comment.body, '/document')
8+
name: document
9+
runs-on: macOS-latest
10+
env:
11+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: r-lib/actions/pr-fetch@master
15+
with:
16+
repo-token: ${{ secrets.GITHUB_TOKEN }}
17+
- uses: r-lib/actions/setup-r@master
18+
- name: Install dependencies
19+
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
20+
- name: Document
21+
run: Rscript -e 'roxygen2::roxygenise()'
22+
- name: commit
23+
run: |
24+
git add man/\* NAMESPACE
25+
git commit -m 'Document'
26+
- uses: r-lib/actions/pr-push@master
27+
with:
28+
repo-token: ${{ secrets.GITHUB_TOKEN }}
29+
style:
30+
if: startsWith(github.event.comment.body, '/style')
31+
name: style
32+
runs-on: macOS-latest
33+
env:
34+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
35+
steps:
36+
- uses: actions/checkout@v2
37+
- uses: r-lib/actions/pr-fetch@master
38+
with:
39+
repo-token: ${{ secrets.GITHUB_TOKEN }}
40+
- uses: r-lib/actions/setup-r@master
41+
- name: Install dependencies
42+
run: Rscript -e 'install.packages("styler")'
43+
- name: Style
44+
run: Rscript -e 'styler::style_pkg()'
45+
- name: commit
46+
run: |
47+
git add \*.R
48+
git commit -m 'Style'
49+
- uses: r-lib/actions/pr-push@master
50+
with:
51+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test-coverage.yaml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
- main
6+
pull_request:
7+
branches:
8+
- master
9+
- main
10+
11+
name: test-coverage
12+
13+
jobs:
14+
test-coverage:
15+
runs-on: windows-latest
16+
env:
17+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- uses: r-lib/actions/setup-r@v2
22+
23+
- uses: r-lib/actions/setup-pandoc@v2
24+
25+
- name: Query dependencies
26+
run: |
27+
install.packages('remotes')
28+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
29+
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
30+
shell: Rscript {0}
31+
32+
- name: Cache R packages
33+
uses: actions/cache@v1
34+
with:
35+
path: ${{ env.R_LIBS_USER }}
36+
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
37+
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
38+
39+
- name: Install dependencies
40+
run: |
41+
install.packages(c("remotes"))
42+
remotes::install_deps(dependencies = TRUE)
43+
remotes::install_cran("covr")
44+
shell: Rscript {0}
45+
46+
- name: Test coverage
47+
run: covr::codecov()
48+
shell: Rscript {0}

‎.travis.yml

-31
This file was deleted.

‎DESCRIPTION

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: kwb.en13508.2
22
Title: Read and Write CCTV Inspection Data According to Norm
33
EN13508-2
4-
Version: 0.2.0.9000
4+
Version: 0.3.0
55
Authors@R:
66
c(person(given = "Hauke",
77
family = "Sonnenberg",
@@ -15,12 +15,14 @@ Description: functions to read and write CCTV inspections
1515
License: MIT + file LICENSE
1616
URL: https://github.com/kwb-r/kwb.en13508.2
1717
BugReports: https://github.com/kwb-r/kwb.en13508.2/issues
18-
Imports:
19-
kwb.utils
18+
Imports:
19+
digest,
20+
kwb.utils (>= 0.15.0)
2021
Suggests:
21-
testthat,
22+
testthat (>= 3.0.0),
2223
ggplot2
2324
Remotes:
2425
github::kwb-r/kwb.utils
2526
Encoding: UTF-8
26-
RoxygenNote: 6.1.1
27+
RoxygenNote: 7.2.3
28+
Config/testthat/edition: 3

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2015-2019 Kompetenzzentrum Wasser Berlin gGmbH (KWB)
3+
Copyright (c) 2017-2023 Kompetenzzentrum Wasser Berlin gGmbH (KWB)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22

3-
Copyright (c) 2015-2019 Kompetenzzentrum Wasser Berlin gGmbH
3+
Copyright (c) 2017-2023 Kompetenzzentrum Wasser Berlin gGmbH
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎NAMESPACE

+21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
export(euCodedFileHeader)
44
export(getCodes)
5+
export(getLineDamageInfo)
56
export(mergeInspectionData)
67
export(numberOfInspections)
78
export(plotObservations)
@@ -10,3 +11,23 @@ export(readEuCodedFile)
1011
export(readEuCodedFiles)
1112
export(writeEuCodedFile)
1213
export(writeEuCodedFiles)
14+
importFrom(kwb.utils,allAreEqual)
15+
importFrom(kwb.utils,catAndRun)
16+
importFrom(kwb.utils,catIf)
17+
importFrom(kwb.utils,collapsed)
18+
importFrom(kwb.utils,hsSafeName)
19+
importFrom(kwb.utils,isTryError)
20+
importFrom(kwb.utils,makeUnique)
21+
importFrom(kwb.utils,moveToFront)
22+
importFrom(kwb.utils,orderBy)
23+
importFrom(kwb.utils,printIf)
24+
importFrom(kwb.utils,readLinesWithEncoding)
25+
importFrom(kwb.utils,removeColumns)
26+
importFrom(kwb.utils,removeExtension)
27+
importFrom(kwb.utils,safeRowBindAll)
28+
importFrom(kwb.utils,selectColumns)
29+
importFrom(kwb.utils,setColumns)
30+
importFrom(kwb.utils,stopFormatted)
31+
importFrom(kwb.utils,stringList)
32+
importFrom(kwb.utils,substSpecialChars)
33+
importFrom(utils,capture.output)

0 commit comments

Comments
 (0)