Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 1.3.2
Date: 2024-01-20 10:09:37 UTC
SHA: 14636772a57c66d67d6fcdbb97afc7ae447dec1f
Version: 1.3.3
Date: 2025-10-11 09:35:22 UTC
SHA: 590ece426ba9d308df85a6b1a9c0ed2145f251d7
8 changes: 6 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
Version 1.3.3
=============

* Add conflicting name in error message
* Update docs to point to rticulate.github.io/import
* When an attempted import causes a conflict, the name of the conflicting object
is now included in the error message.

* Documentation has been updated to point to
[https://rticulate.github.io/import/](https://rticulate.github.io/import/),
since the previous documentation web site is no longer accessible.



Expand Down
6 changes: 3 additions & 3 deletions R/from.R
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
#'
#' @seealso
#' Helpful links:
#' * [https://rticulate.github.io/import](https://rticulate.github.io/import)
#' * [https://github.com/rticulate/import](https://github.com/rticulate/import)
#' * [https://github.com/rticulate/import/issues](https://github.com/rticulate/import/issues)
#' * [https://rticulate.github.io/import/](https://rticulate.github.io/import/)
#' * [https://github.com/rticulate/import/](https://github.com/rticulate/import/)
#' * [https://github.com/rticulate/import/issues/](https://github.com/rticulate/import/issues/)
#'
#' @md
from <- function(.from, ..., .into = "imports",
Expand Down
6 changes: 3 additions & 3 deletions R/import.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#' [`here`].
#'
#' Helpful links:
#' * [https://rticulate.github.io/import](https://rticulate.github.io/import)
#' * [https://github.com/rticulate/import](https://github.com/rticulate/import)
#' * [https://github.com/rticulate/import/issues](https://github.com/rticulate/import/issues)
#' * [https://rticulate.github.io/import/](https://rticulate.github.io/import/)
#' * [https://github.com/rticulate/import/](https://github.com/rticulate/import/)
#' * [https://github.com/rticulate/import/issues/](https://github.com/rticulate/import/issues/)
#'
#' @md
"_PACKAGE"
4 changes: 3 additions & 1 deletion build/build_and_release_process.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@


## Remote/long-running checks (copy to terminal and run manually)
# devtools::check_rhub()
# #devtools::check_rhub()
# rhub::rhub_doctor()
# rhub::rhub_check()
# devtools::check_win_devel()
# revdepcheck::revdep_check(num_workers = 4)

Expand Down
26 changes: 4 additions & 22 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Version 1.3.3 is a bug fix release with the following fixes:

* Add conflicting name in error message
* Update docs to point to rticulate.github.io/import
* When imports conflict, include name of the conflicting object in error message
* Update docs to point to rticulate.github.io/import (old doc domain is defunct)

More info in `NEWS.md`

Expand All @@ -18,30 +18,12 @@ More info in `NEWS.md`

## R CMD check results

There were no ERRORs or WARNINGs.

On winbuilder, there were no NOTEs:

On r-hub.io, some platforms raise one or the other of the following notes:

+---
❯ checking for non-standard things in the check directory ... NOTE
Found the following files/directories:
''NULL''

❯ checking for detritus in the temp directory ... NOTE
Found the following files/directories:
'lastMiKTeXException'
+---

These notes are not reproducible locally or on all platforms, and seem not to affect the output. The check reports no errors related to the PDF version of the manual:

#> * checking PDF version of manual ... [12s] OK
There were no ERRORs, WARNINGs, or NOTEs.


## revdepcheck results

We checked 13 reverse dependencies (12 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
We checked 12 reverse dependencies (10 from CRAN + 2 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.

* We saw 0 new problems
* We failed to check 0 packages
Expand Down
6 changes: 3 additions & 3 deletions man/import.Rd

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

6 changes: 3 additions & 3 deletions man/importfunctions.Rd

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