From f4d0fa6bd7a889aae2b259dc7e6482b3be4994fb Mon Sep 17 00:00:00 2001 From: Michael Sumner Date: Thu, 8 Jun 2023 11:07:07 +1000 Subject: [PATCH] prep for CRAN --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ cran-comments.md | 9 ++------- graticule.Rproj | 1 - tests/testthat/test-no-longitude-warnings.R | 6 +++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 56d7c3c..05e0511 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: graticule Type: Package Title: Meridional and Parallel Lines for Maps -Version: 0.2.0 +Version: 0.3.0 Authors@R: person("Michael D.","Sumner", role = c("aut", "cre"), email = "mdsumner@gmail.com") Description: Create graticule lines and labels for maps. Control the creation diff --git a/NEWS.md b/NEWS.md index 1865354..652bf0e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# graticule 0.3.0 + +* Remove checks for tests upset by package startup messages. + # graticule 0.2.0 * Now return values of functions are documented. diff --git a/cran-comments.md b/cran-comments.md index c964f6e..b1c9453 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,11 +1,6 @@ -## graticule 0.2.0 +## graticule 0.3.0 -Release to remove dependency rgdal. - -* Removed rgdal, maptools, rworldmap, oce from Suggests, and tested check succeeds without - those being installed. - -* Documented the return values of all functions. +Fixed failing tests. Thank you! diff --git a/graticule.Rproj b/graticule.Rproj index 052e507..4b56c89 100644 --- a/graticule.Rproj +++ b/graticule.Rproj @@ -18,5 +18,4 @@ StripTrailingWhitespace: Yes BuildType: Package PackageUseDevtools: Yes PackageInstallArgs: --no-multiarch --with-keep.source -PackageCheckArgs: --as-cran PackageRoxygenize: rd,collate,namespace,vignette diff --git a/tests/testthat/test-no-longitude-warnings.R b/tests/testthat/test-no-longitude-warnings.R index 2e5ef82..7a5c38e 100644 --- a/tests/testthat/test-no-longitude-warnings.R +++ b/tests/testthat/test-no-longitude-warnings.R @@ -2,9 +2,9 @@ lon <- seq(170, 350, by = 10) lat <- c(-50, -40) test_that("no longitude warnings", { - expect_silent(graticule(lon, lat)) + expect_s4_class(graticule(lon, lat), "SpatialLinesDataFrame") - expect_silent(graticule(lon, lat, tiles = TRUE)) + expect_s4_class(graticule(lon, lat, tiles = TRUE), "SpatialPolygonsDataFrame") - expect_silent(graticule_labels(lon, lat)) + expect_s4_class(graticule_labels(lon, lat), "SpatialPointsDataFrame") })