From 0b16dea0f6ba6e0da06dedfa3a28da91d791f232 Mon Sep 17 00:00:00 2001 From: Duncan Murdoch Date: Fri, 1 Mar 2024 11:15:17 -0500 Subject: [PATCH 1/4] Update version to prepare for release --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index cdce3eda8..fceec0601 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: rgl -Version: 1.2.16 +Version: 1.3.0 Title: 3D Visualization Using OpenGL Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"), email = "murdoch.duncan@gmail.com"), diff --git a/NEWS.md b/NEWS.md index de9eb3ca8..39aba8382 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# rgl 1.2.16 +# rgl 1.3.0 ## Major changes From 4616945cdb2d7f332b19c899b4a9561a6985499a Mon Sep 17 00:00:00 2001 From: Duncan Murdoch Date: Fri, 1 Mar 2024 12:01:30 -0500 Subject: [PATCH 2/4] Update full check --- .github/workflows/R-CMD-fullcheck.yaml | 22 ++++++++++++++-------- DESCRIPTION | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/R-CMD-fullcheck.yaml b/.github/workflows/R-CMD-fullcheck.yaml index bd298e891..ba971dca0 100644 --- a/.github/workflows/R-CMD-fullcheck.yaml +++ b/.github/workflows/R-CMD-fullcheck.yaml @@ -24,14 +24,18 @@ jobs: config: - {os: macos-latest, r: 'release'} - - {os: windows-latest, r: 'release', rtools-version: '42'} + - {os: windows-latest, r: 'release'} + # Use 3.6 to trigger usage of RTools35 + - {os: windows-latest, r: '3.6'} + # use 4.1 to check with rtools40's older compiler + - {os: windows-latest, r: '4.1'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - - {os: windows-latest, r: '4.1', rtools-version: '40'} - - {os: ubuntu-latest, r: '4.0'} - - {os: macos-latest, r: '3.6'} - - {os: ubuntu-latest, r: '3.5'} + - {os: ubuntu-latest, r: 'oldrel-1'} + - {os: ubuntu-latest, r: 'oldrel-2'} + - {os: ubuntu-latest, r: 'oldrel-3'} + - {os: ubuntu-latest, r: 'oldrel-4'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true @@ -41,20 +45,22 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + + - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - rtools-version: ${{ matrix.config.rtools-version }} - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: any::rcmdcheck, interp=?ignore-before-r=3.6.0 + extra-packages: any::rcmdcheck needs: check - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/DESCRIPTION b/DESCRIPTION index fceec0601..062420f8e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,7 @@ Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"), person("Ivan", "Krylov", role = "ctb"), person("Michael", "Sumner", role = "ctb"), person("Mike", "Stein", role = "ctb")) -Depends: R (>= 3.3.0) +Depends: R (>= 3.6.0) Suggests: MASS, markdown (>= 1.12), rmarkdown (>= 2.16), deldir (>= 1.0-4), orientlib, lattice, misc3d, magick, plotrix (>= 3.7-3), tripack, interp, alphashape3d, tcltk, From 14c87be68678690db8525d9d19ac8f4d57a08220 Mon Sep 17 00:00:00 2001 From: Duncan Murdoch Date: Fri, 1 Mar 2024 13:50:41 -0500 Subject: [PATCH 3/4] palette.colors is not available in R 3.6, and we try to support that. --- man/clipMesh3d.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/clipMesh3d.Rd b/man/clipMesh3d.Rd index e0c56cde6..b629e5cbc 100644 --- a/man/clipMesh3d.Rd +++ b/man/clipMesh3d.Rd @@ -206,7 +206,7 @@ values without clipping. # Show the problem that minVertices solves: -cube <- cube3d(col = palette.colors(6, "Accent"), meshColor = "faces") +cube <- cube3d(col = rainbow(6), meshColor = "faces") # This function only has one argument, so it will # be passed x, y and z in columns of a matrix From d287e97335563dcacdb0a40fb88a356d2070040a Mon Sep 17 00:00:00 2001 From: Duncan Murdoch Date: Sun, 3 Mar 2024 15:40:59 -0500 Subject: [PATCH 4/4] Final changes --- cran-comments.md | 28 ++++++---------------------- vignettes/rgl.Rmd | 1 - 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 9e4973b66..dec05c592 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,23 +1,7 @@ -# 1.2.8 - -This small release is at the request of CRAN to address issues -shown in the CRAN checks. - -- A call to Rf_warning() passed a variable; it now has a -separate constant format string. - -- Some old documentation of arguments that were not present -has been removed. - -These warnings/notes have not been addressed: - -- The installed package size has not been improved. - -- Some deprecated function warnings on MacOS are still -present, as those functions are still needed. I hope that -the major changes I am in the process of making will allow -me to address these finally, but those changes are months -away from being done. - -In addition to those changes, there are some minor improvements and bug fixes mentioned in the NEWS file. +# 1.3.0 +This small release is at the request of Tomas to adapt to +upcoming changes in Rtools on Windows. It also contains +a number of other changes (mostly bug fixes and minor +improvements, described in the NEWS.md file). I ran revdep +checks and didn't see any problems. diff --git a/vignettes/rgl.Rmd b/vignettes/rgl.Rmd index 60cb909fd..b1e0cfac6 100644 --- a/vignettes/rgl.Rmd +++ b/vignettes/rgl.Rmd @@ -75,7 +75,6 @@ with(iris, plot3d(Sepal.Length, Sepal.Width, Petal.Length, type="s", col=as.numeric(Species))) ``` -\noindent can be used to plot three columns of the `iris` data. Allowed plot types include `"p", "l", "h", "s"`, meaning points, lines, segments from z=0, and spheres. There's