chore: #84 merge in devel

Merge remote-tracking branch 'origin/devel' into 84_xportr_deep_dive_vignette

# Conflicts:
#	docs/404.html
#	docs/LICENSE-text.html
#	docs/LICENSE.html
#	docs/authors.html
#	docs/index.html
#	docs/pkgdown.yml

.Rprofile

@@ -1,5 +1,3 @@
-if (Sys.getenv("GITHUB_ACTIONS") == "") {
- source("renv/activate.R")
-} else {
+if (Sys.getenv("GITHUB_ACTIONS") != "") {
  options(repos = c(CRAN = "https://cran.rstudio.com"))
 }

.github/workflows/check-links.yml

@@ -0,0 +1,36 @@
+name: Check URLs 🔗
+
+on:
+ push:
+ branches: [main]
+ pull_request:
+ branches: [main, devel]
+
+jobs:
+ links:
+ name: Validate Links 🕸️
+ runs-on: ubuntu-latest
+ if: >
+ !contains(github.event.commits[0].message, '[skip links]')
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Check URLs in docs 📑
+ uses: lycheeverse/lychee-action@v1.5.1
+ with:
+ fail: true
+ jobSummary: true
+ format: markdown
+ output: links-results.md
+ args: >-
+ --exclude-private
+ --exclude "https://github.com.*.git|lycheeverse.*"
+ --verbose
+ --no-progress
+ **/*.md
+ **/*.html
+ **/*.Rmd
+ **/*.yaml
+ **/*.yml
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-standard.yaml

@@ -29,7 +29,7 @@ jobs:
  R_KEEP_PKG_SOURCE: yes
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/pkgdown.yaml

@@ -12,7 +12,7 @@ jobs:
  env:
  GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - uses: r-lib/actions/setup-r@v1
 

.github/workflows/spellcheck.yml

@@ -26,7 +26,7 @@ jobs:
  && github.event.pull_request.draft == false
  steps:
  - name: Checkout repo 🛎
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  persist-credentials: false
  fetch-depth: 0

.github/workflows/test-coverage.yaml

@@ -16,7 +16,7 @@ jobs:
  env:
  GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - uses: r-lib/actions/setup-r@v1
 

.gitignore

@@ -2,20 +2,16 @@
 .Rhistory
 .RData
 .Ruserdata
-xportr.Rproj
 .gitattributes
-xptr.Rproj
 /archive
 /.idea
 scratch_check.R
 inst/doc
 adsl.xpt
 demo.R
-/doc/
 /Meta/
 docs
 xportr.Rcheck/
 xportr*.tar.gz
 xportr*.tgz
-docs/*
 local

R/utils-xportr.R

@@ -201,7 +201,7 @@ xpt_validate <- function(data) {
  }
 
  # 2.2 Check Non-ASCII and special characters
- chk_spl_chr <- labels[stringr::str_detect(labels, "[<>]|[^[:ascii:]]")]
+ chk_spl_chr <- labels[stringr::str_detect(labels, "[^[:ascii:]]")]
 
  if (length(chk_spl_chr) > 0) {
  err_cnd <- c(

R/write.R

@@ -41,7 +41,7 @@ xportr_write <- function(.df, path, label = NULL, strict_checks = FALSE) {
  abort("`label` must be 40 characters or less.")
  }
 
- if (stringr::str_detect(label, "[<>]|[^[:ascii:]]")) {
+ if (stringr::str_detect(label, "[^[:ascii:]]")) {
  abort("`label` cannot contain any non-ASCII, symbol or special characters.")
  }
 

R/xportr-package.R

@@ -7,7 +7,7 @@
 #' @import rlang haven
 #' @importFrom dplyr left_join bind_cols filter select rename rename_with n
 #' everything arrange group_by summarize mutate ungroup case_when distinct
-#' tribble
+#' tribble if_else
 #' @importFrom glue glue glue_collapse
 #' @importFrom cli cli_alert_info cli_h2 cli_alert_success cli_div cli_text
 #' cli_alert_danger

_pkgdown.yml

@@ -6,12 +6,6 @@ template:
  bootswatch: sandstone
 search:
  exclude: ['news/index.html']
-repo:
- url:
- home: https://github.com/atorus-research/xportr
- source: https://github.com/atorus-research/xportr/blob/main
- issue: https://github.com/atorus-research/xportr/issues
- user: https://github.com/
 news:
  cran_dates: true