Skip to content

Commit

Permalink
Final CRAN submission updates. This is release version 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
torfason committed Sep 23, 2023
1 parent 9fda4fe commit 720a4c9
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 60 deletions.
1 change: 0 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@
^revdep$
^CRAN-SUBMISSION$
^scratch$
^build$
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.0
Date: 2022-05-23 16:55:46 UTC
SHA: da9815f8702ff76ece85c6c219ad58f4c37f5fe7
Version: 1.3.1
Date: 2023-09-23 14:39:13 UTC
SHA: 49f7485514987e1639dd5b59668c1e446d7dbaaf
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: import
Type: Package
Title: An Import Mechanism for R
Version: 1.3.0.9005
Version: 1.3.1
Authors@R:
c(person(given = "Stefan Milton",
family = "Bache",
Expand All @@ -27,5 +27,5 @@ Suggests:
testthat
Language: en-US
VignetteBuilder: knitr
RoxygenNote: 7.2.0
RoxygenNote: 7.2.3
Encoding: UTF-8
15 changes: 12 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Version 1.3.0.9xxx
Version 1.3.1
=============

* The `import` package will now by default use the full current set of library
Expand All @@ -12,11 +12,20 @@ Version 1.3.0.9xxx
it affects usage in situations where specificity about the library path is
important.

* Fixes a regression introduced in 1.3.0 that prevented importing multiple
scripts into the same environment in some situations.
* The two aforementioned changes had to be implemented jointly, because the bug
that is addressed by the second change was masking a bug that then needed to
be fixed by the second change. A detailed analysis of this can be found in
issue [#56](https://github.com/rticulate/import/issues/56) on GitHub.

* A regression introduced in 1.3.0, that prevented importing multiple
scripts into the same environment in some situations, has now been fixed.

* Errors that occur while importing modules are now handled more effectively.

* An issue with package documentation, correctly documenting `"_PACKAGE"` to
ensure a `-package` alias is added.



Version 1.3.0
=============
Expand Down
2 changes: 1 addition & 1 deletion R/import.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#' * [https://github.com/rticulate/import/issues](https://github.com/rticulate/import/issues)
#'
#' @md
NULL
"_PACKAGE"
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![CRAN
status](https://www.r-pkg.org/badges/version/import)](https://CRAN.R-project.org/package=import)
[![CRAN status
shields](https://img.shields.io/badge/Git-1.3.0.9004-success)](https://github.com/rticulate/import)
shields](https://img.shields.io/badge/Git-1.3.1-success)](https://github.com/rticulate/import)
[![R build
status](https://github.com/rticulate/import/workflows/R-CMD-check/badge.svg)](https://github.com/rticulate/import/actions)
<!-- badges: end -->
Expand Down Expand Up @@ -206,27 +206,27 @@ feature?), demand (how many people seem to need a new feature?), and
last, but not least, by whether a feature can be implemented without
breaking backwards compatibility.

- Created and authored by [@smbache](https://github.com/smbache)
- Currently maintained by [@torfason](https://github.com/torfason)
- Code contributions by [@awong234](https://github.com/awong234),
[@brshallo](https://github.com/brshallo),
[@flying-sheep](https://github.com/flying-sheep),
[@hutch3232](https://github.com/hutch3232),
[@J-Moravec](https://github.com/J-Moravec),
[@klmr](https://github.com/klmr),
[@mschilli87](https://github.com/mschilli87)
- Created and authored by [@smbache](https://github.com/smbache)
- Currently maintained by [@torfason](https://github.com/torfason)
- Code contributions by [@awong234](https://github.com/awong234),
[@brshallo](https://github.com/brshallo),
[@flying-sheep](https://github.com/flying-sheep),
[@hutch3232](https://github.com/hutch3232),
[@J-Moravec](https://github.com/J-Moravec),
[@klmr](https://github.com/klmr),
[@mschilli87](https://github.com/mschilli87)

*(Did we forget to add you? If so, please let us know!)*

# See also:

- Some of the use cases for `import` can now be handled directly in
base R using the new `exclude` and `include.only` arguments of
`library()` and `require()`
- For an interesting but slightly different idea of Python-like
modules for R, see the [modules](https://github.com/klmr/modules)
package by [@klmr](https://github.com/klmr).
- Another approach, focused on treating the use of functions with
naming conflicts as explicit errors is the
[conflicted](https://github.com/r-lib/conflicted) package by
[@hadley](https://github.com/hadley).
- Some of the use cases for `import` can now be handled directly in base
R using the new `exclude` and `include.only` arguments of `library()`
and `require()`
- For an interesting but slightly different idea of Python-like modules
for R, see the [modules](https://github.com/klmr/modules) package by
[@klmr](https://github.com/klmr).
- Another approach, focused on treating the use of functions with naming
conflicts as explicit errors is the
[conflicted](https://github.com/r-lib/conflicted) package by
[@hadley](https://github.com/hadley).
35 changes: 35 additions & 0 deletions build/build_and_release_process.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

## Build package, documentation, and readme (before commits)
{
devtools::document()
devtools::build_readme()
devtools::spell_check()
devtools::build()
devtools::test()
message("Pre-commit tasks completed")
}

## Build vignettes and site
{
devtools::build_vignettes()
devtools::build_manual()
devtools::build_site()
}

## Final checks (before release)
{
system("R CMD INSTALL --preclean --no-multiarch --with-keep.source .")
devtools::spell_check()
devtools::check()
devtools::release_checks()
devtools:::git_checks()
}


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

## Finally submit to cran (copy to terminal and run manually)
# devtools::release()
10 changes: 0 additions & 10 deletions build/pre_commit.R

This file was deleted.

43 changes: 24 additions & 19 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
## General

This is an update with the following features and fixes:
Version 1.3.1 is a bug fix release with the following fixes:

* import::from/into now support importing `.into` `symbol`s
* import::from/here/into can now support importing generics
* import::from/here/into now support importing hidden objects
* Fix where function `base::get` could be masked internally
* Several documentation improvements
* Use full set of library paths (`.libPaths()`)
* Update `loadNamespace()`/`getNamespaceExports()`
* Fix 1.3.0 regression preventing multiple imports
* Improved handling of errors in importing modules
* Add `-package` alias is to docs

More info in `NEWS.md`


## Test environments

* local Mac OS X (R 4.2.0)
* local Mac OS X (R 4.3.1)
* r-hub
* (Windows Server 2022, R-devel, 64 bit)
* (Ubuntu Linux 20.04.1 LTS, R-release, GCC)
Expand All @@ -24,24 +26,28 @@ This is an update with the following features and fixes:

There were no ERRORs or WARNINGs.

On r-hub.io Linux platforms and winbuilder, there were no NOTEs:
On winbuilder, there were no NOTEs:

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

On r-hub.io, Windows Server 2022, R-devel, 64 bit platform, there was one note relating to MiKTeX:
+---
❯ 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'
+---
❯ checking for detritus in the temp directory ... NOTE
Found the following files/directories:
'lastMiKTeXException'
+---

This note is not reproducible locally or on other platforms, and seems not to affect the output, because the check reports no errors related to the PDF version of the manual:
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 ... OK
#> * checking PDF version of manual ... [12s] OK


## Downstream dependencies - revdepcheck results
## revdepcheck results

We checked 11 reverse dependencies (10 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
We checked 12 reverse dependencies (11 from CRAN + 1 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 All @@ -55,4 +61,3 @@ The package's functionality may alter the search path, but this is intended and

will make an "imports" entry in the search path and place the imported there.


3 changes: 3 additions & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
NSE
https
img
io
1 change: 1 addition & 0 deletions man/import.Rd

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

2 changes: 1 addition & 1 deletion vignettes/import.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ output:
toc: true
vignette: >
%\VignetteIndexEntry{The import package}
\usepackage[utf8]{inputenc}
%\VignetteEngine{knitr::rmarkdown}
%\VignetteEncoding{UTF-8}
editor_options:
chunk_output_type: console
---
Expand Down

0 comments on commit 720a4c9

Please sign in to comment.