Skip to content

Commit

Permalink
Upkeep 2023-11 (#1524)
Browse files Browse the repository at this point in the history
* Update snapshots
* Drop C++ specification
* Re-document
* Update logo + favicons
* Always use .R extension
* `usethis::use_mit_license()`
* Bump R requirement
* `usethis::use_tidy_github_actions()`
* More case issues
  • Loading branch information
hadley committed Nov 2, 2023
1 parent 07c0ebf commit a510ddd
Show file tree
Hide file tree
Showing 36 changed files with 26 additions and 22 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
shell: Rscript {0}

Expand Down
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ License: MIT + file LICENSE
URL: https://roxygen2.r-lib.org/, https://github.com/r-lib/roxygen2
BugReports: https://github.com/r-lib/roxygen2/issues
Depends:
R (>= 3.3)
R (>= 3.6)
Imports:
brew,
cli (>= 3.3.0),
Expand Down Expand Up @@ -51,5 +51,4 @@ Config/testthat/edition: 3
Encoding: UTF-8
Language: en-GB
Roxygen: list(markdown = TRUE, load = "installed")
RoxygenNote: 7.2.2.9000
SystemRequirements: C++11
RoxygenNote: 7.2.3.9000
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2020
YEAR: 2023
COPYRIGHT HOLDER: roxygen2 authors
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) 2020 roxygen2 authors
Copyright (c) 2023 roxygen2 authors

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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# roxygen2 <a href="https://roxygen2.r-lib.org"><img src="man/figures/logo.png" align="right" height="138" /></a>
# roxygen2 <a href="https://roxygen2.r-lib.org"><img src="man/figures/logo.png" align="right" height="138" alt="roxygen2 website" /></a>

<!-- badges: start -->
[![CRAN status](https://www.r-pkg.org/badges/version/roxygen2)](https://CRAN.R-project.org/package=roxygen2)
[![R-CMD-check](https://github.com/r-lib/roxygen2/workflows/R-CMD-check/badge.svg)](https://github.com/r-lib/roxygen2/actions)
[![R-CMD-check](https://github.com/r-lib/roxygen2/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-lib/roxygen2/actions/workflows/R-CMD-check.yaml)
[![Codecov test coverage](https://codecov.io/gh/r-lib/roxygen2/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/roxygen2?branch=main)
<!-- badges: end -->

Expand Down
Binary file modified man/figures/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions man/roxygen2-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified pkgdown/favicon/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/apple-touch-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/favicon.ico
Binary file not shown.
3 changes: 2 additions & 1 deletion tests/testthat/_snaps/markdown-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
Output
Message
Quitting from lines 1-1 ()
Quitting from lines 1-1
Condition
Warning:
[<text>:4] @description failed to evaluate inline markdown code
Expand Down
6 changes: 4 additions & 2 deletions tests/testthat/_snaps/rd-include-rmd.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
Code
. <- roc_proc_text(rd_roclet(), text)
Message
Quitting from lines 2-3 (<temp-path.Rmd>)
Quitting from lines 2-3 (<temp-path.Rmd>)
Quitting from lines 2-3 [unnamed-chunk-2] (<temp-path.Rmd>)
Quitting from lines 2-3 [unnamed-chunk-1] (<temp-path.Rmd>)
Condition
Warning:
[<text>:3] @includeRmd failed to evaluate '<temp-path.Rmd>'
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-collate.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test_that("Collate field unchanged when no @includes", {
local_package_copy(test_path('testCollateNoIncludes'))

update_collate(".")
expect_equal(desc::desc_get_field("Collate"), "b.r a.r")
expect_equal(desc::desc_get_field("Collate"), "b.R a.R")
})

test_that("DESCRIPTION file is re-written only if collate changes", {
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-package_files.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test_that("respects order in Collate (#790)", {
expect_equal(
package_files('testCollateParse'),
normalizePath(c("testCollateParse/R/b.r", "testCollateParse/R/c.r"))
normalizePath(c("testCollateParse/R/b.R", "testCollateParse/R/c.R"))
)
})

Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/testCollateNoIncludes/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Description:
Author: Geoff <geoff.lee99@gmail.com>
Maintainer: Geoff <geoff.lee99@gmail.com>
Version: 0.1
Collate: b.r a.r
Collate: b.R a.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Manually edited the Collate field in the DESCRIPTION file so this *should*
# run after b.r
# run after b.R

a <- 1
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/testthat/testCollateOverwrite/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Author: Hadley <h.wickham@gmail.com>
Maintainer: Hadley <h.wickham@gmail.com>
Version: 0.1
Collate:
'b.r'
'b.R'
2 changes: 2 additions & 0 deletions tests/testthat/testCollateOverwrite/R/a.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#' @include b.R
a <- 1
2 changes: 0 additions & 2 deletions tests/testthat/testCollateOverwrite/R/a.r

This file was deleted.

File renamed without changes.
4 changes: 2 additions & 2 deletions tests/testthat/testCollateParse/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Author: Brodie Gaslam <brodie.gaslam@yahoo.com>
Maintainer: Brodie Gaslam <brodie.gaslam@yahoo.com>
Version: 0.1
Collate:
'b.r'
'c.r'
'b.R'
'c.R'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a510ddd

Please sign in to comment.