Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve continuous integration + tweak to improve R CMD CHECK log #775

Merged
merged 38 commits into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
598a038
initial testing
olivroy Sep 14, 2023
01c7c4a
test pkgdown config
olivroy Sep 14, 2023
9796ee8
test
olivroy Sep 14, 2023
268f606
Pkgdown tests (#1)
olivroy Sep 14, 2023
e465d6f
Revert " Pkgdown tests (#1)" (#2)
olivroy Sep 14, 2023
9a5ba87
Merge pull request #3 from olivroy/pkgdown
olivroy Sep 14, 2023
a9d9982
further tests
olivroy Sep 14, 2023
311c48d
Add required package to R CMD Check see https://github.com/r-lib/acti…
olivroy Sep 14, 2023
aac8747
Add config/needs/coverage.
olivroy Sep 14, 2023
5df6369
Cmd check fix (#5)
olivroy Sep 14, 2023
129544b
Merged origin/master into wf
olivroy Sep 14, 2023
ae0ef89
Fix `is` mistake
olivroy Sep 14, 2023
23002f2
Long lines in examples.
olivroy Sep 14, 2023
e362b24
Try adding lwgeom package (was in .travis.yml), may help failing tests
olivroy Sep 14, 2023
93c484b
Declare dependency on unreleased cols4all per gh/r-tmap/tmap/issue/772.
olivroy Sep 14, 2023
4cba006
Use devtools
olivroy Sep 14, 2023
9f0e06e
Remove tic.R
olivroy Sep 14, 2023
b05dd6c
[testing] reduce number of R CMD CHECK
olivroy Sep 14, 2023
93d2d94
[testing] Add try before failing tests to convert to warnings + add t…
olivroy Sep 14, 2023
f367432
[testing] Add placeholders for these functions as they will fail if s…
olivroy Sep 14, 2023
220a507
[testing] Convert uninformative errors to warnings to help investigat…
olivroy Sep 14, 2023
63cb7f0
[testing] Add global variables to silence R CMD CHECK notes
olivroy Sep 14, 2023
c5afc2c
[testing] Reduce the list to investigate necessary cases
olivroy Sep 14, 2023
727bc66
Add Condition to help capture the R CMD CHECK error.
olivroy Sep 14, 2023
7ca17f7
Actually pass arguments to tm_scalebar and document it better.
olivroy Sep 14, 2023
b468e40
[argument deprecation] Make messages more uniform.
olivroy Sep 14, 2023
3635112
Add graphics:: prefix R CMD CHECK Note
olivroy Sep 14, 2023
79deee1
[testing] Notes on some failures I encountered.
olivroy Sep 14, 2023
9f89b5a
Add note
olivroy Sep 15, 2023
b37e383
Remove mentions to my branch.
olivroy Sep 15, 2023
851d0a0
Add alternative install methods to readme
olivroy Sep 15, 2023
9bac63d
Address comments
olivroy Sep 15, 2023
d29660a
Remove explicit system requirements as they are from other packages
olivroy Sep 15, 2023
56df57b
copy news from CRAN
olivroy Sep 15, 2023
c423868
rename to md
olivroy Sep 15, 2023
34b378a
use devtools style for news
olivroy Sep 15, 2023
5be6f02
fix in news after replace all
olivroy Sep 15, 2023
31323c3
clarify comment on global variables
olivroy Sep 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ local
LICENSE
README
.Rprofile
.travis.yml
appveyor.yml
tic.R
build/
gdal-2.1.0
gdal-2.1.0.tar.gz
ubuntu_16_installation.sh
Expand Down
Binary file removed ._.Rhistory
Binary file not shown.
47 changes: 47 additions & 0 deletions .github/workflows/R-CMD-check.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:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check

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

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3

- 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
68 changes: 31 additions & 37 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -1,54 +1,48 @@
# 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: master
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: macOS-latest
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

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

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Cache R packages
uses: actions/cache@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Brew
run: |
brew install pkg-config
brew install udunits
brew install gdal
brew install sqlite3
brew install v8
extra-packages: any::pkgdown, local::.
needs: website

- name: Install dependencies
run: |
install.packages("remotes")
remotes::install_dev("tmaptools")
remotes::install_deps(dependencies = TRUE)
remotes::install_dev("pkgdown")
- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Install package
run: R CMD INSTALL .

- name: Deploy package
run: pkgdown::deploy_to_branch(new_process = FALSE)
shell: Rscript {0}
- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
50 changes: 50 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +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, master]
pull_request:
branches: [main, master]

name: test-coverage

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

steps:
- uses: actions/checkout@v3

- 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
needs: coverage

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

- 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@v3
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

7 changes: 5 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Imports:
stars (>= 0.4-2),
units (>= 0.6-1),
grid,
cols4all,
cols4all (>= 0.6-1),
classInt (>= 0.4-3),
htmltools,
htmlwidgets,
Expand Down Expand Up @@ -59,7 +59,10 @@ Suggests:
covr,
av,
gifski
URL: https://github.com/r-tmap/tmap
URL: https://github.com/r-tmap/tmap, https://r-tmap.github.io/tmap/
Remotes: r-tmap/tmaptools, mtennekes/cols4all
BugReports: https://github.com/r-tmap/tmap/issues
VignetteBuilder: knitr
RoxygenNote: 7.2.3
Config/Needs/check: Nowosad/spDataLarge, lwgeom
Config/Needs/coverage: Nowosad/spDataLarge, lwgeom
5 changes: 5 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,15 @@ export(tm_fill)
export(tm_format)
export(tm_graticules)
export(tm_grid)
export(tm_iso)
export(tm_layout)
export(tm_legend)
export(tm_legend_combine)
export(tm_legend_hide)
export(tm_lines)
export(tm_logo)
export(tm_markers)
export(tm_minimap)
export(tm_mouse_coordinates)
export(tm_mv)
export(tm_mv_dim)
Expand Down Expand Up @@ -156,6 +160,7 @@ export(tm_scalebar)
export(tm_sf)
export(tm_shape)
export(tm_shape_vars)
export(tm_squares)
export(tm_style)
export(tm_symbols)
export(tm_text)
Expand Down
Loading
Loading