Skip to content

Commit

Permalink
Merge pull request #23 from rOpenGov/dev
Browse files Browse the repository at this point in the history
Version 1.1.0
  • Loading branch information
pitkant authored Dec 3, 2024
2 parents 9d3c9b5 + a3e4946 commit ae842c4
Show file tree
Hide file tree
Showing 29 changed files with 782 additions and 297 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/check-full.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# 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:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'

name: R-CMD-check (full)
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@v4

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

- uses: r-lib/actions/setup-r@v2
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@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
29 changes: 0 additions & 29 deletions .github/workflows/check-release.yaml

This file was deleted.

40 changes: 13 additions & 27 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
@@ -1,43 +1,29 @@
# 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:
workflow_dispatch:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check
name: R-CMD-check (standard)

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'}

runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2

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

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
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
- 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@v1
- uses: r-lib/actions/check-r-package@v2
50 changes: 0 additions & 50 deletions .github/workflows/render-readme.yaml

This file was deleted.

9 changes: 5 additions & 4 deletions .github/workflows/rogtemplate-gh-pages.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# 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
# Workflow triggering derived from: https://stevenmortimer.com/running-github-actions-sequentially/
on:
push:
branches: [main, master]
Expand All @@ -18,7 +19,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

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

Expand All @@ -33,7 +34,7 @@ jobs:
local::.
any::pkgdown
ropengov/rogtemplate
any::magick
any::rcmdcheck

- name: Build logo if not present and prepare template
run: |
Expand All @@ -52,6 +53,6 @@ jobs:

- name: Deploy package
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
17 changes: 9 additions & 8 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# 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]
pull_request:
branches: [main, master]
workflow_dispatch:

name: test-coverage

Expand All @@ -14,18 +13,20 @@ jobs:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r-dependencies@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: covr
extra-packages: any::covr
needs: coverage

- name: Test coverage
run: covr::codecov()
shell: Rscript {0}
run: covr::codecov(token = Sys.getenv("CODECOV_TOKEN"), quiet = FALSE)
shell: Rscript {0}
9 changes: 5 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: hetu
Type: Package
Title: Structural Handling of Finnish Personal Identity Codes
Version: 1.0.7
Date: 2022-05-20
Version: 1.1.0
Date: 2024-12-03
Authors@R:
c(
person(given = "Pyry",
Expand Down Expand Up @@ -43,15 +43,16 @@ Depends:
Imports:
lubridate,
checkmate,
parallel
parallel,
methods
Suggests:
Cairo,
knitr,
testthat,
rmarkdown,
covr,
dplyr
RoxygenNote: 7.2.0
RoxygenNote: 7.3.2
X-schema.org-isPartOf: http://ropengov.org/
X-schema.org-keywords: ropengov
Config/Needs/website:
Expand Down
9 changes: 9 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Generated by roxygen2: do not edit by hand

S3method("[",diagnostic)
S3method(plot,diagnostic)
S3method(print,summary.diagnostic)
S3method(summary,diagnostic)
export(bid_ctrl)
export(hetu)
export(hetu_age)
Expand All @@ -8,6 +12,7 @@ export(hetu_ctrl)
export(hetu_date)
export(hetu_diagnostic)
export(hetu_sex)
export(is.diagnostic)
export(pin_age)
export(pin_ctrl)
export(pin_date)
Expand All @@ -23,10 +28,14 @@ export(satu_ctrl)
importFrom(checkmate,assert_choice)
importFrom(checkmate,assert_date)
importFrom(checkmate,assert_double)
importFrom(graphics,par)
importFrom(graphics,text)
importFrom(lubridate,days)
importFrom(lubridate,interval)
importFrom(lubridate,period)
importFrom(lubridate,weeks)
importFrom(lubridate,years)
importFrom(lubridate,ymd)
importFrom(methods,hasArg)
importFrom(parallel,mclapply)
importFrom(utils,hasName)
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# *News*
==========

# hetu 1.0.7.9000 (2022-05-16)
# hetu 1.1.0 (2024-12-03)

* Add summary method and plot methods for data.frames produced by `hetu_diagnostic()`
* Add support for the new century markers that were added in a Finnish government decree 8.7.2022/690 that amended another government decree 25.2.2010/128 ("Government Decree on the Population Information System").

# hetu 1.0.7 (2022-05-16)

* subsetting-parameter (TRUE or FALSE) dropped from `hetu_diagnostic()` function as it was unnecessary syntactic sugar that was difficult to communicate to users. Similar functionalities can be easily achieved with standard subsetting functionalities found in base R and especially in tidyverse.
* `satu_ctrl_char()` parameter for printing whole SATU/FINUID-numbers is now called "print.full" instead of "complement".
Expand Down
Loading

0 comments on commit ae842c4

Please sign in to comment.