Skip to content

Commit f9bacdc

Browse files
Merge pull request #110 from ThinkR-open/cran_0_4_1
chore: bump version 0.4.1
2 parents a4a3b8e + 720b094 commit f9bacdc

9 files changed

+35
-121
lines changed

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: attachment
22
Title: Deal with Dependencies
3-
Version: 0.4.0.9001
3+
Version: 0.4.1
44
Authors@R: c(
55
person("Sébastien", "Rochette", , "[email protected]", role = c("cre", "aut"),
66
comment = c(ORCID = "0000-0002-1565-9313")),
@@ -32,6 +32,7 @@ Config/testthat/edition: 3
3232
Encoding: UTF-8
3333
Roxygen: list(markdown = TRUE)
3434
RoxygenNote: 7.3.0
35+
Language: en-US
3536
Depends:
3637
R (>= 3.4)
3738
Imports:
@@ -52,4 +53,3 @@ Suggests:
5253
renv (>= 0.8.4),
5354
rstudioapi,
5455
testthat (>= 3.0.0)
55-
Language: en-US

NEWS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# attachment 0.4.0.9001
1+
# attachment 0.4.1
22

33
## Bug fixes
44

R/att_from_rmds.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ att_from_rmd <- function(path, temp_dir = tempdir(), warn = -1,
8282
#' @inheritParams att_from_rmd
8383
#'
8484
#' @return Character vector of packages called with library or require.
85-
#' {knitr} and {rmarkdown} are added by default to allow building the vignettes
85+
#' \emph{knitr} and \emph{rmarkdown} are added by default to allow building the vignettes
8686
#' if the directory contains "vignettes" in the path
8787
#'
8888
#' @examples

R/create_renv.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ extra_dev_pkg <- c(
66
"pkgdown"
77
)
88

9-
#' Create reproducible environments for your R projects with {renv}
9+
#' Create reproducible environments for your R projects with \emph{renv}
1010
#'
1111
#' @description
1212
#' `r lifecycle::badge("experimental")`
1313
#'
1414
#' Tool to create and maintain renv.lock files.
1515
#' The idea is to have 2 distinct files, one for development and the other for deployment.
16-
#' Indeed, although packages like {attachment} or {pkgload} must be installed to develop,
16+
#' Indeed, although packages like \emph{attachment} or \emph{pkgload} must be installed to develop,
1717
#' they are not necessary in your project, package or Shiny application.
1818
#'
1919
#'

dev/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
21
*.html
32
*.R
3+
dev_history_PREPARE_FOR_CRAN.md

dev/dev_history.R

+23-109
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ attachment::dependencies_file_text(field = c("Depends", "Imports", "Suggests"))
102102
usethis::use_vignette("fill-pkg-description")
103103

104104
# Checks
105+
# remotes::install_github("r-lib/devtools")
105106
devtools::build_vignettes()
106107
devtools::check()
107108

@@ -129,119 +130,32 @@ tools:::.check_packages_used_in_tests(dir = ".", testdir = "tests/testthat")
129130

130131
# Checks for CRAN release ----
131132

132-
## Prepare for CRAN ----
133+
## Copy the latest version of PREPARE_FOR_CRAN ----
133134

134-
# Check package coverage
135-
covr::package_coverage()
136-
covr::report()
135+
url <- "https://raw.githubusercontent.com/ThinkR-open/prepare-for-cran/master/README.md"
136+
destination <- "dev/dev_history_PREPARE_FOR_CRAN.md"
137+
download.file(url, destfile = destination, mode = "wb")
137138

138-
# _Check in interactive test-inflate for templates and Addins
139-
pkgload::load_all()
140-
devtools::test()
141-
testthat::test_dir("tests/testthat/")
142-
143-
# Test no output generated in the user files
144-
# Run examples in interactive mode too
145-
devtools::run_examples()
146-
147-
# Check package as CRAN
148-
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"))
149-
# devtools::check(args = c("--no-manual", "--as-cran"))
150-
151-
# Check content
152-
# install.packages('checkhelper', repos = 'https://thinkr-open.r-universe.dev')
153-
tags <-
154-
checkhelper::find_missing_tags() # Toutes les fonctions doivent avoir soit `@noRd` soit un `@export`, (alias pour att_to_description ok)
155-
tags
156-
157-
# _Check that you let the house clean after the check, examples and tests
158-
all_files <- checkhelper::check_clean_userspace() # ok si ce qui reste c'est dans tmpdir()
159-
all_files
160-
161-
162-
# Check spelling
163-
# usethis::use_spell_check()
164-
spelling::spell_check_package() # juste regarder s'il y a des typos
165-
166-
# Check URL are correct - No redirection
167-
# install.packages('urlchecker', repos = 'https://r-lib.r-universe.dev')
168-
urlchecker::url_check()
169-
urlchecker::url_update() # corrige les redirections
170-
171-
172-
# Check as cran:
173-
# probleme rencontre: cf https://github.com/ThinkR-open/checkhelper/issues/79
174-
withr::with_options(list(repos = c(CRAN = "https://cran.rstudio.com")),
175-
{callr::default_repos()
176-
checkhelper::check_as_cran() })
177-
checkhelper::check_as_cran()
178-
179-
180-
181-
182-
# check on other distributions
183-
# _rhub
184-
# devtools::check_rhub()
185-
buildpath <- devtools::build()
186-
rhub::platforms()
187-
rhub::check_on_windows(check_args = "--force-multiarch",
188-
show_status = FALSE,
189-
path = buildpath)
190-
rhub::check_on_solaris(show_status = FALSE, path = buildpath)
191-
rhub::check(platform = "debian-clang-devel",
192-
show_status = FALSE,
193-
path = buildpath)
194-
rhub::check(platform = "debian-gcc-devel",
195-
show_status = FALSE,
196-
path = buildpath)
197-
rhub::check(platform = "fedora-clang-devel",
198-
show_status = FALSE,
199-
path = buildpath)
200-
rhub::check(platform = "macos-highsierra-release-cran",
201-
show_status = FALSE,
202-
path = buildpath)
203-
rhub::check_for_cran(show_status = FALSE, path = buildpath)
204-
# _win devel
205-
devtools::check_win_devel()
206-
devtools::check_win_release()
207-
# remotes::install_github("r-lib/devtools")
208-
devtools::check_mac_release() # Need to follow the URL proposed to see the results
209-
210-
211-
# Check reverse dependencies
212-
# https://github.com/r-lib/revdepcheck
213-
# remotes::install_github("r-lib/revdepcheck")
214-
install.packages('revdepcheck', repos = 'https://r-lib.r-universe.dev')
215-
usethis::use_git_ignore("revdep/")
216-
usethis::use_build_ignore("revdep/")
217-
218-
devtools::revdep()
219-
library(revdepcheck)
220-
# In another session
221-
id <- rstudioapi::terminalExecute("Rscript -e 'revdepcheck::revdep_check(num_workers = 4)'")
222-
rstudioapi::terminalKill(id)
223-
# See outputs
224-
revdep_details(revdep = "pkg")
225-
revdep_summary() # table of results by package
226-
revdep_report() # in revdep/
227-
# Clean up when on CRAN
228-
revdep_reset()
229-
230-
# Si cela ne fonctionne pas : recuperer les GitHub des packages dependant de attachment (fusen et golem), installer attachment en local et check()
231-
232-
# Update NEWS
233-
# Bump version manually and add list of changes
234-
235-
# Upgrade version number
236-
usethis::use_version(which = c("patch", "minor", "major", "dev")[2])
237-
238-
# Add comments for CRAN
239-
# Need to .gitignore this file
139+
line <- grep(pattern = "# Prepare for CRAN ----", readLines(destination))
140+
rstudioapi::navigateToFile(destination, line = line)
141+
142+
### Run the automated tests
143+
144+
## {attachment} specificity : ----
145+
146+
### An alias for `att_to_description` -> ok
147+
148+
### If `Check reverse dependencies` doesn't work`with `revdep_check()`:
149+
### retrieve the GitHub files of the {attachment}-dependent packages (checkhelper, fusen and golem),
150+
### install attachment locally and check().
151+
152+
## BEFORE RELEASE: ----
153+
154+
### Add comments for CRAN
155+
### Need to .gitignore this file
240156
usethis::use_cran_comments(open = rlang::is_interactive())
241-
# Why we have `\dontrun{}`
157+
### Why we have `\dontrun{}`
242158

243159
usethis::use_git_ignore("cran-comments.md")
244160
usethis::use_git_ignore("CRAN-SUBMISSION")
245161

246-
# Verify you're ready for release, and release
247-
devtools::release()

man/att_from_rmds.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/attachment-package.Rd

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/create_renv_for_dev.Rd

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)