Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
olivroy authored Feb 20, 2024
2 parents 4a85407 + ce6ed46 commit 1f34968
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 21 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: usethis
Title: Automate Package and Project Setup
Version: 2.2.2.9000
Version: 2.2.3.9000
Authors@R: c(
person("Hadley", "Wickham", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0003-4757-117X")),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

* `edit_rstudio_snippets()` now accepts yaml snippets (@olivroy, #1941)

# usethis 2.2.3

* Patch release with changes to `.Rd` files requested by CRAN.

# usethis 2.2.2

* Implicit usage of `numeric_version()` via comparison now always provides
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ create_package(path)
#> license
#> Encoding: UTF-8
#> Roxygen: list(markdown = TRUE)
#> RoxygenNote: 7.2.3
#> RoxygenNote: 7.3.1
#> ✔ Writing 'NAMESPACE'
#> ✔ Setting active project to '<no active project>'
# only needed since this session isn't interactive
Expand Down
21 changes: 3 additions & 18 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
This is a patch release in response to a 2023-06-28 email from Kurt Hornik about
inputs to numeric_version() and package_version().
This is a patch release in response to a 2024-01-22 email from Kurt Hornik about
check NOTEs related to Rd \usage sections. I have eliminated the NOTEs.

In this case, the problematic inputs came from implicit usage via `>` in some
tests and these have been changed to comparison to character or removed
entirely.

I did NOT rerun reverse dependency checks because usethis's last patch release
was less than 2 weeks ago, also in response to a request from Kurt Hornik about
numeric versions.
I did NOT rerun reverse dependency checks for this patch release.

## R CMD check results

0 errors | 0 warnings | 0 notes

## revdepcheck results

From the previous patch release on 2023-06-23:

We checked 181 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.

* We saw no new problems
* We failed to check 0 packages
2 changes: 1 addition & 1 deletion vignettes/articles/usethis-setup.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Substitute your preferred editor for emacs here. A popular choice is [nano](http

As stated above, usethis doesn't actually use the Git you install and has no absolute requirement that you use GitHub or use RStudio. But use of usethis is highly correlated with the desire to do all of these things, in a pleasant way.

If you plan to use GitHub, you need to make sure your local Git can pull from and push to GitHub.com. That is beyond the scope of this article, but see the [Connect to GitHub](https://happygitwithr.com/push-pull-github.html) section in Happy Git. You probably don't want to enter your username and password all the time, so either [cache credentials for HTTPS](https://happygitwithr.com/https-pat) or [set up SSH keys](https://happygitwithr.com/ssh-keys.html). If you are an SSH person, set the `usethis.protocol` option to "ssh" (as of v2.0.0, "https" is the usethis default).
If you plan to use GitHub, you need to make sure your local Git can pull from and push to GitHub.com. That is beyond the scope of this article, but see the [Connect to GitHub](https://happygitwithr.com/push-pull-github.html) section in Happy Git. You probably don't want to enter your username and password all the time, so either [cache credentials for HTTPS](https://happygitwithr.com/https-pat.html) or [set up SSH keys](https://happygitwithr.com/ssh-keys.html). If you are an SSH person, set the `usethis.protocol` option to "ssh" (as of v2.0.0, "https" is the usethis default).

If you want to use RStudio to work with Git (and therefore GitHub, see previous paragraph), you need to make sure RStudio can find your Git executable. This usually "just works". The [Connect RStudio to Git and GitHub](https://happygitwithr.com/rstudio-git-github.html) section of Happy Git helps you confirm that all is well. If all is not well, there are also [troubleshooting tips](https://happygitwithr.com/rstudio-see-git.html).

Expand Down

0 comments on commit 1f34968

Please sign in to comment.