Skip to content

Commit

Permalink
Merge pull request #413 from dmurdoch/release1.3
Browse files Browse the repository at this point in the history
Prepare for release
  • Loading branch information
dmurdoch committed Mar 3, 2024
2 parents 1746852 + d287e97 commit 630f621
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 35 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/R-CMD-fullcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")'
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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"),
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rgl 1.2.16
# rgl 1.3.0

## Major changes

Expand Down
28 changes: 6 additions & 22 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion man/clipMesh3d.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion vignettes/rgl.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 630f621

Please sign in to comment.