Skip to content

Commit 720a4c9

Browse files
committed
Final CRAN submission updates. This is release version 1.3.1
1 parent 9fda4fe commit 720a4c9

File tree

12 files changed

+102
-60
lines changed

12 files changed

+102
-60
lines changed

.Rbuildignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
^revdep$
1616
^CRAN-SUBMISSION$
1717
^scratch$
18-
^build$

CRAN-SUBMISSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Version: 1.3.0
2-
Date: 2022-05-23 16:55:46 UTC
3-
SHA: da9815f8702ff76ece85c6c219ad58f4c37f5fe7
1+
Version: 1.3.1
2+
Date: 2023-09-23 14:39:13 UTC
3+
SHA: 49f7485514987e1639dd5b59668c1e446d7dbaaf

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: import
22
Type: Package
33
Title: An Import Mechanism for R
4-
Version: 1.3.0.9005
4+
Version: 1.3.1
55
Authors@R:
66
c(person(given = "Stefan Milton",
77
family = "Bache",
@@ -27,5 +27,5 @@ Suggests:
2727
testthat
2828
Language: en-US
2929
VignetteBuilder: knitr
30-
RoxygenNote: 7.2.0
30+
RoxygenNote: 7.2.3
3131
Encoding: UTF-8

NEWS.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Version 1.3.0.9xxx
2+
Version 1.3.1
33
=============
44

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

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

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

25+
* An issue with package documentation, correctly documenting `"_PACKAGE"` to
26+
ensure a `-package` alias is added.
27+
28+
2029

2130
Version 1.3.0
2231
=============

R/import.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
#' * [https://github.com/rticulate/import/issues](https://github.com/rticulate/import/issues)
2525
#'
2626
#' @md
27-
NULL
27+
"_PACKAGE"

README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![CRAN
77
status](https://www.r-pkg.org/badges/version/import)](https://CRAN.R-project.org/package=import)
88
[![CRAN status
9-
shields](https://img.shields.io/badge/Git-1.3.0.9004-success)](https://github.com/rticulate/import)
9+
shields](https://img.shields.io/badge/Git-1.3.1-success)](https://github.com/rticulate/import)
1010
[![R build
1111
status](https://github.com/rticulate/import/workflows/R-CMD-check/badge.svg)](https://github.com/rticulate/import/actions)
1212
<!-- badges: end -->
@@ -206,27 +206,27 @@ feature?), demand (how many people seem to need a new feature?), and
206206
last, but not least, by whether a feature can be implemented without
207207
breaking backwards compatibility.
208208

209-
- Created and authored by [@smbache](https://github.com/smbache)
210-
- Currently maintained by [@torfason](https://github.com/torfason)
211-
- Code contributions by [@awong234](https://github.com/awong234),
212-
[@brshallo](https://github.com/brshallo),
213-
[@flying-sheep](https://github.com/flying-sheep),
214-
[@hutch3232](https://github.com/hutch3232),
215-
[@J-Moravec](https://github.com/J-Moravec),
216-
[@klmr](https://github.com/klmr),
217-
[@mschilli87](https://github.com/mschilli87)
209+
- Created and authored by [@smbache](https://github.com/smbache)
210+
- Currently maintained by [@torfason](https://github.com/torfason)
211+
- Code contributions by [@awong234](https://github.com/awong234),
212+
[@brshallo](https://github.com/brshallo),
213+
[@flying-sheep](https://github.com/flying-sheep),
214+
[@hutch3232](https://github.com/hutch3232),
215+
[@J-Moravec](https://github.com/J-Moravec),
216+
[@klmr](https://github.com/klmr),
217+
[@mschilli87](https://github.com/mschilli87)
218218

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

221221
# See also:
222222

223-
- Some of the use cases for `import` can now be handled directly in
224-
base R using the new `exclude` and `include.only` arguments of
225-
`library()` and `require()`
226-
- For an interesting but slightly different idea of Python-like
227-
modules for R, see the [modules](https://github.com/klmr/modules)
228-
package by [@klmr](https://github.com/klmr).
229-
- Another approach, focused on treating the use of functions with
230-
naming conflicts as explicit errors is the
231-
[conflicted](https://github.com/r-lib/conflicted) package by
232-
[@hadley](https://github.com/hadley).
223+
- Some of the use cases for `import` can now be handled directly in base
224+
R using the new `exclude` and `include.only` arguments of `library()`
225+
and `require()`
226+
- For an interesting but slightly different idea of Python-like modules
227+
for R, see the [modules](https://github.com/klmr/modules) package by
228+
[@klmr](https://github.com/klmr).
229+
- Another approach, focused on treating the use of functions with naming
230+
conflicts as explicit errors is the
231+
[conflicted](https://github.com/r-lib/conflicted) package by
232+
[@hadley](https://github.com/hadley).

build/build_and_release_process.R

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
## Build package, documentation, and readme (before commits)
3+
{
4+
devtools::document()
5+
devtools::build_readme()
6+
devtools::spell_check()
7+
devtools::build()
8+
devtools::test()
9+
message("Pre-commit tasks completed")
10+
}
11+
12+
## Build vignettes and site
13+
{
14+
devtools::build_vignettes()
15+
devtools::build_manual()
16+
devtools::build_site()
17+
}
18+
19+
## Final checks (before release)
20+
{
21+
system("R CMD INSTALL --preclean --no-multiarch --with-keep.source .")
22+
devtools::spell_check()
23+
devtools::check()
24+
devtools::release_checks()
25+
devtools:::git_checks()
26+
}
27+
28+
29+
## Remote/long-running checks (copy to terminal and run manually)
30+
# devtools::check_rhub()
31+
# devtools::check_win_devel()
32+
# revdepcheck::revdep_check(num_workers = 4)
33+
34+
## Finally submit to cran (copy to terminal and run manually)
35+
# devtools::release()

build/pre_commit.R

Lines changed: 0 additions & 10 deletions
This file was deleted.

cran-comments.md

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
## General
22

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

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

1113

1214
## Test environments
1315

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

2527
There were no ERRORs or WARNINGs.
2628

27-
On r-hub.io Linux platforms and winbuilder, there were no NOTEs:
29+
On winbuilder, there were no NOTEs:
30+
31+
On r-hub.io, some platforms raies one or the other of the following notes:
2832

29-
On r-hub.io, Windows Server 2022, R-devel, 64 bit platform, there was one note relating to MiKTeX:
33+
+---
34+
❯ checking for non-standard things in the check directory ... NOTE
35+
Found the following files/directories:
36+
''NULL''
3037

31-
+---
32-
| * checking for detritus in the temp directory ... NOTE
33-
| Found the following files/directories:
34-
| 'lastMiKTeXException'
35-
+---
38+
❯ checking for detritus in the temp directory ... NOTE
39+
Found the following files/directories:
40+
'lastMiKTeXException'
41+
+---
3642

37-
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:
43+
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:
3844

39-
#> * checking PDF version of manual ... OK
45+
#> * checking PDF version of manual ... [12s] OK
4046

4147

42-
## Downstream dependencies - revdepcheck results
48+
## revdepcheck results
4349

44-
We checked 11 reverse dependencies (10 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
50+
We checked 12 reverse dependencies (11 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
4551

4652
* We saw 0 new problems
4753
* We failed to check 0 packages
@@ -55,4 +61,3 @@ The package's functionality may alter the search path, but this is intended and
5561

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

58-

inst/WORDLIST

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
NSE
2+
https
3+
img
4+
io

0 commit comments

Comments
 (0)