Skip to content

Commit

Permalink
Fix no_reference_row option in ggcoeff_compare() (#431)
Browse files Browse the repository at this point in the history
  • Loading branch information
larmarange committed Jan 14, 2022
1 parent 8072493 commit 53c1f65
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 220 deletions.
98 changes: 18 additions & 80 deletions .github/workflows/R-CMD-check.yaml
@@ -1,11 +1,10 @@
# 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:
- master
branches: [main, master]
pull_request:
branches:
- master
- rc-*
branches: [main, master]

name: R-CMD-check

Expand All @@ -19,90 +18,29 @@ jobs:
fail-fast: false
matrix:
config:
# - { os: macOS-latest, r: 'devel', force_suggests: "0" }
# - { os: window-latest, r: 'devel', force_suggests: "1" }

- { os: macOS-latest, r: 'release', force_suggests: "1" }
- { os: windows-latest, r: 'release', force_suggests: "1" }
- { os: ubuntu-16.04, r: 'release', force_suggests: "1", rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest" }
- { os: ubuntu-20.04, r: 'release', force_suggests: "1", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }

- { os: macOS-latest, r: 'oldrel', force_suggests: "1" }
- { os: windows-latest, r: 'oldrel', force_suggests: "1" }
- { os: ubuntu-16.04, r: 'oldrel', force_suggests: "1" , rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest" }
- { os: ubuntu-20.04, r: 'oldrel', force_suggests: "1" , rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
- {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:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
_R_CHECK_FORCE_SUGGESTS_: ${{ matrix.config.force_suggests }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
id: install-r
- 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-pandoc@master

- name: Install pak and query dependencies
shell: Rscript {0}
run: |
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
saveRDS(pak::pkg_deps_tree("local::.", dependencies = TRUE), ".github/r-depends.rds")
- name: Cache R packages
uses: actions/cache@v2
- uses: r-lib/actions/setup-r-dependencies@v1
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
shell: Rscript {0}
run: |
pak::local_system_requirements(execute = TRUE)
pak::pkg_system_requirements("rcmdcheck", execute = TRUE)
pak::pkg_system_requirements("sessioninfo", execute = TRUE)
extra-packages: rcmdcheck

- name: Install dependencies
shell: Rscript {0}
run: |
pak::local_install_dev_deps(upgrade = TRUE)
pak::pkg_install(c("rcmdcheck", "sessioninfo"))
- name: Session info
shell: Rscript {0}
run: |
options(width = 100)
pkgs <- installed.packages()[, "Package"]
sessioninfo::session_info(pkgs, include_base = TRUE)
- name: Check with printing
env:
_R_CHECK_CRAN_INCOMING_: false
CAN_PRINT: "TRUE"
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Check as CRAN
env:
_R_CHECK_CRAN_INCOMING_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload check results
if: failure()
uses: actions/upload-artifact@master
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
- uses: r-lib/actions/check-r-package@v1
88 changes: 18 additions & 70 deletions .github/workflows/pkgdown.yaml
@@ -1,87 +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:
- master
- "**pkgdown**"
pull_request:
branches:
- master
- rc-**

branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ${{ matrix.config.os }}

strategy:
fail-fast: false
matrix:
config:
- { os: ubuntu-16.04, r: 'release', force_suggests: "1", rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest" }

runs-on: ubuntu-latest
env:
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
id: install-r
with:
r-version: ${{ matrix.config.r }}

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

- name: Install pak and query dependencies
shell: Rscript {0}
run: |
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
saveRDS(pak::pkg_deps_tree("local::.", dependencies = TRUE), ".github/r-depends.rds")
- uses: r-lib/actions/setup-pandoc@v1

- name: Cache R packages
uses: actions/cache@v2
- uses: r-lib/actions/setup-r@v1
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-pkgdown-${{ hashFiles('.github/r-depends.rds') }}
restore-keys: |
${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-pkgdown-
${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
use-public-rspm: true

- name: Install system dependencies
if: runner.os == 'Linux'
shell: Rscript {0}
run: |
pak::local_system_requirements(execute = TRUE)
pak::pkg_system_requirements("pkgdown", execute = TRUE)
- name: Install dependencies
shell: Rscript {0}
run: |
pak::local_install_dev_deps(upgrade = TRUE)
pak::pkg_install("pkgdown")
- name: Install package
run: R CMD INSTALL .

- name: Build Site (PR)
if: github.event_name != 'push'
env:
CAN_PRINT: "TRUE"
run: |
pkgdown::build_site()
stopifnot(length(warnings()) == 0)
shell: Rscript {0}
- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: pkgdown
needs: website

- name: Git Config
- name: Deploy package
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
- name: Build and Deploy Site
if: github.event_name == 'push'
env:
CAN_PRINT: "TRUE"
run: pkgdown::deploy_to_branch(new_process = FALSE)
shell: Rscript {0}
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
56 changes: 10 additions & 46 deletions .github/workflows/test-coverage.yaml
@@ -1,66 +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:
- master
branches: [main, master]
pull_request:
branches:
- master
- rc-*
branches: [main, master]

name: test-coverage

jobs:
test-coverage:
runs-on: ${{ matrix.config.os }}

strategy:
fail-fast: false
matrix:
config:
- { os: ubuntu-16.04, r: 'release', force_suggests: "1", rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest" }
runs-on: ubuntu-latest
env:
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master
id: install-r
- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

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

- name: Install pak and query dependencies
shell: Rscript {0}
run: |
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
saveRDS(pak::pkg_deps_tree("local::.", dependencies = TRUE), ".github/r-depends.rds")
use-public-rspm: true

- name: Cache R packages
uses: actions/cache@v2
- uses: r-lib/actions/setup-r-dependencies@v1
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-testing-${{ hashFiles('.github/r-depends.rds') }}
restore-keys: |
${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-testing-
${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
- name: Install system dependencies
if: runner.os == 'Linux'
shell: Rscript {0}
run: |
pak::local_system_requirements(execute = TRUE)
pak::pkg_system_requirements("covr", execute = TRUE)
- name: Install dependencies
shell: Rscript {0}
run: |
pak::local_install_dev_deps(upgrade = TRUE)
pak::pkg_install("covr")
extra-packages: covr

- name: Test coverage
env:
CAN_PRINT: "TRUE"
run: covr::codecov()
shell: Rscript {0}
4 changes: 2 additions & 2 deletions DESCRIPTION
Expand Up @@ -47,7 +47,7 @@ Imports:
utils
Suggests:
broom (>= 0.7.0),
broom.helpers (>= 1.1.0),
broom.helpers (>= 1.3.0),
chemometrics,
geosphere (>= 1.5-1),
ggforce,
Expand All @@ -70,7 +70,7 @@ Suggests:
spelling,
emmeans
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.1
RoxygenNote: 7.1.2
SystemRequirements: openssl
Encoding: UTF-8
Language: en-US
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Expand Up @@ -4,7 +4,11 @@

* Reverse ordering of y-axis in `ggally_count()` (#420)
* Facets ordering in `ggcoef_compare()` (#426)

* Bug fix for `ggcoef_compare()` when using tidy selectors for
`no_reference_row` (#430)
* Fix in `ggcoef_compare()` regarding `no_reference_row` option (#430)
* New default tidier for `ggcoef_model()`, now using
`broom.helpers::tidy_with_broom_or_parameters()` (#432)

# GGally 2.1.2

Expand Down

0 comments on commit 53c1f65

Please sign in to comment.