diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index cc33516..67ae6f2 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -4,7 +4,6 @@ on: push: branches: [main, master] pull_request: - branches: [main, master] release: types: [published] workflow_dispatch: @@ -30,8 +29,6 @@ jobs: - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - uses: r-lib/actions/setup-r-dependencies@v2 with: @@ -39,14 +36,12 @@ jobs: needs: website - name: Build site - run: | - Sys.setenv("_R_CHECK_CONNECTIONS_LEFT_OPEN_" = "false") - pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) + 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 + uses: JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f # v4.8.0 with: clean: false branch: gh-pages diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml index dc1ec2c..5e25457 100644 --- a/.github/workflows/rhub.yaml +++ b/.github/workflows/rhub.yaml @@ -1,4 +1,4 @@ -# R-hub's generic GitHub Actions workflow file. It's canonical location is at +# R-hub's generic GitHub Actions workflow file. Its canonical location is at # https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml # You can update this file to a newer version using the rhub2 package: # @@ -17,7 +17,7 @@ on: config: description: >- Comma-separated list of R-hub platforms to use. - Full list: https://r-hub.github.io/containers/ + Full list: summary(rhub::rhub_platforms()) type: string default: 'linux,windows,macos' name: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 38c0872..a304d25 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -4,7 +4,6 @@ on: push: branches: [main, master] pull_request: - branches: [main, master] name: test-coverage.yaml @@ -20,8 +19,6 @@ jobs: - uses: actions/checkout@v6 - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - uses: r-lib/actions/setup-r-dependencies@v2 with: @@ -35,14 +32,16 @@ jobs: clean = FALSE, install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package") ) + print(cov) covr::to_cobertura(cov) shell: Rscript {0} - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7 with: - fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }} - file: ./cobertura.xml - plugin: noop + # Fail if error if not on PR, or if on PR and token is given + fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }} + files: ./cobertura.xml + plugins: noop disable_search: true token: ${{ secrets.CODECOV_TOKEN }} @@ -55,7 +54,7 @@ jobs: - name: Upload test results if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: coverage-test-failures path: ${{ runner.temp }}/package diff --git a/DESCRIPTION b/DESCRIPTION index 2083efa..d03fbfb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: nflplotR Title: NFL Logo Plots in 'ggplot2' and 'gt' -Version: 1.7.0.9001 +Version: 1.7.1 Authors@R: person("Sebastian", "Carl", , "mrcaseb@gmail.com", role = c("aut", "cre")) Description: A set of functions to visualize National Football League @@ -14,7 +14,7 @@ Imports: cachem (>= 1.0.0), cli (>= 3.0.0), data.table (>= 1.14.0), - ggpath (>= 1.1.0), + ggpath (>= 1.1.2), ggplot2 (>= 4.0.0), grid, gt (>= 0.8.0), diff --git a/NEWS.md b/NEWS.md index 4ab5bb7..29600c7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,8 @@ -# nflplotR (development version) +# nflplotR 1.7.1 -* Updates for compatibility with S7 > 0.2.2 and ggpath > 1.1.1 (#98) +* Updates for compatibility with S7 > 0.2.2 and ggpath >= 1.1.2 (#98) + +Thank you to @t-kalinowski for their contributions towards this release. # nflplotR 1.7.0 diff --git a/R/utils.R b/R/utils.R index 7798bc0..61fa655 100644 --- a/R/utils.R +++ b/R/utils.R @@ -62,6 +62,8 @@ load_headshots <- function() { ] } +utils::globalVariables(c("gsis_id", "headshot"), "nflplotR") + na_headshot <- function() { "https://static.www.nfl.com/image/private/t_player_profile_landscape_2x/f_auto/league/rfuw3dh4aah4l4eeuubp.png" } diff --git a/cran-comments.md b/cran-comments.md index 055af33..305a942 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Submission -This is a minor release that updates some logos and colors after rebrandings +This is a minor release for compatibility with ggpath v1.1.2 ## R CMD check results