Skip to content

Commit

Permalink
Merge branch 'main' into typo
Browse files Browse the repository at this point in the history
  • Loading branch information
rich-iannone authored Sep 11, 2024
2 parents 9bb0865 + a48b998 commit 216f978
Show file tree
Hide file tree
Showing 226 changed files with 5,994 additions and 2,887 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
^README\.md$
^index\.md$
^LICENSE\.md$
^CITATION\.cff$
vignettes
man/figures/
^tests/manual_tests$
Expand Down Expand Up @@ -48,3 +49,4 @@ tests/testthat/test-utils_profiling.R
tests/testthat/test-write_testthat_file.R
tests/testthat/test-yaml.R
tests/testthat/test-yaml_exec.R
^.lintr$
48 changes: 25 additions & 23 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# 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
#
# NOTE: This workflow is overkill for most R packages and
# check-standard.yaml is likely a better choice.
# usethis::use_github_action("check-standard") will install it.
on:
push:
branches:
- main
branches: [main, master]
pull_request:
branches:
- main
branches: [main, master]

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

permissions: read-all

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

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

strategy:
Expand All @@ -21,27 +27,22 @@ jobs:
- {os: macos-latest, r: 'release'}

- {os: windows-latest, r: 'release'}
# # use 4.2 to check with rtools42's older compiler
- {os: windows-latest, r: '4.2'}
# # use 4.1 to check with rtools40's older compiler
- {os: windows-latest, r: '4.1'}
# # Use 3.6 to trigger usage of RTools35
- {os: windows-latest, r: '3.6'}

- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
- {os: ubuntu-latest, r: 'oldrel-2'}
- {os: ubuntu-latest, r: 'oldrel-3'}
- {os: ubuntu-latest, r: 'oldrel-4'}
# use 4.0 or 4.1 to check with rtools40's older compiler
- {os: windows-latest, r: 'oldrel-4'}

- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
- {os: ubuntu-latest, r: 'oldrel-2'}
- {os: ubuntu-latest, r: 'oldrel-3'}
- {os: ubuntu-latest, r: 'oldrel-4'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
GITHUB_PAT: ${{ secrets.GHA_PAT }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

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

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

Expand All @@ -58,4 +59,5 @@ jobs:

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
56 changes: 17 additions & 39 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,56 +1,34 @@
on: [push, pull_request]
# 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]

name: lint
name: lint.yaml

permissions: read-all

jobs:
lint:
runs-on: ubuntu-latest

env:
GITHUB_PAT: ${{ secrets.GHA_PAT }}

GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Install package
run: R CMD INSTALL .

- name: Install dependencies
run: |
install.packages(c("remotes"))
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("lintr")
shell: Rscript {0}
extra-packages: any::lintr, local::.
needs: lint

- name: Lint
run: |
out <-
lintr::lint_package(
linters = lintr::linters_with_defaults(
object_usage_linter = NULL,
trailing_whitespace_linter = NULL,
cyclocomp_linter = NULL,
indentation_linter = NULL
),
exclusions = c(
list.files("tests", recursive = TRUE, full.names = TRUE),
list.files("man", recursive = TRUE, full.names = TRUE),
list.files("vignettes", recursive = TRUE, full.names = TRUE),
list.files("data-raw", recursive = TRUE, full.names = TRUE),
list.files("inst", recursive = TRUE, full.names = TRUE)
)
)
print(out)
if (length(out)) stop("lints found")
run: lintr::lint_package()
shell: Rscript {0}
env:
LINTR_ERROR_ON_LINT: true
47 changes: 30 additions & 17 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,50 @@
# 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
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown
name: pkgdown.yaml

permissions: read-all

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GHA_PAT }}

GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

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

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Install package
run: R CMD INSTALL .

- name: Build and deploy pkgdown site
run: |
git config --local user.email "actions@github.com"
git config --local user.name "GitHub Actions"
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/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
folder: docs
48 changes: 39 additions & 9 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,61 @@
# 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
branches: [main, master]
pull_request:
branches:
- main
branches: [main, master]

name: test-coverage
name: test-coverage.yaml

permissions: read-all

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

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

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

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

- name: Test coverage
run: covr::codecov(quiet = FALSE)
run: |
cov <- covr::package_coverage(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
covr::to_cobertura(cov)
shell: Rscript {0}

- uses: codecov/codecov-action@v4
with:
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
file: ./cobertura.xml
plugin: noop
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
14 changes: 14 additions & 0 deletions .lintr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
linters: linters_with_defaults(
object_usage_linter = NULL,
trailing_whitespace_linter = NULL,
# cyclocomp_linter is no longer a default linter in lintr 3.2.0
cyclocomp_linter = NULL,
indentation_linter = NULL
)
exclusions: list(
"tests",
"man",
"vignettes",
"data-raw",
"inst"
)
8 changes: 6 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ message: 'If you wish to cite the "pointblank" package use:'
type: software
license: MIT
title: 'pointblank: Data Validation and Organization of Metadata for Local and Remote Tables'
version: 0.9.0
version: 0.12.1
abstract: Validate data in data frames, 'tibble' objects, 'Spark'
'DataFrames', and database tables. Validation pipelines can be made using
easily-readable, consecutive validation steps. Upon execution of the
Expand All @@ -21,7 +21,11 @@ authors:
given-names: Mauricio
email: mavargas11@uc.cl
orcid: https://orcid.org/0000-0003-1017-7574
repository: https://CRAN.R-project.org/package=pointblank
- family-names: Choe
given-names: June
email: jchoe001@gmail.com
orcid: https://orcid.org/0000-0002-0701-921X
repository: https://doi.org/10.32614/CRAN.package.pointblank
repository-code: https://github.com/rstudio/pointblank
url: https://rstudio.github.io/pointblank/
contact:
Expand Down
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Type: Package
Package: pointblank
Version: 0.11.4.9000
Version: 0.12.1.9000
Title: Data Validation and Organization of Metadata for Local and Remote Tables
Description: Validate data in data frames, 'tibble' objects, 'Spark'
'DataFrames', and database tables. Validation pipelines can be made using
Expand All @@ -14,15 +14,17 @@ Authors@R: c(
person("Richard", "Iannone", , "rich@posit.co", c("aut", "cre"),
comment = c(ORCID = "0000-0003-3925-190X")),
person("Mauricio", "Vargas", , "mavargas11@uc.cl", c("aut"),
comment = c(ORCID = "0000-0003-1017-7574"))
comment = c(ORCID = "0000-0003-1017-7574")),
person("June", "Choe", , "jchoe001@gmail.com", c("aut"),
comment = c(ORCID = "0000-0002-0701-921X"))
)
License: MIT + file LICENSE
URL: https://rstudio.github.io/pointblank/, https://github.com/rstudio/pointblank
BugReports: https://github.com/rstudio/pointblank/issues
Encoding: UTF-8
LazyData: true
ByteCompile: true
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Depends:
R (>= 3.5.0)
Imports:
Expand All @@ -49,8 +51,6 @@ Imports:
Suggests:
arrow,
bigrquery,
covr,
crayon,
data.table,
duckdb,
ggforce,
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2017-2023
COPYRIGHT HOLDER: pointblank authors
YEAR: 2017-2024
COPYRIGHT HOLDER: Posit Software, PBC
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2017-2023 pointblank authors
Copyright (c) 2017-2024 Posit Software, PBC

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

0 comments on commit 216f978

Please sign in to comment.