Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release version 0.1.2 #4

Merged
merged 3 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@
^codecov\.yml$
^LICENSE\.md$
^\.lintr$
^CRAN-SUBMISSION$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
revdep/** linguist-vendored
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: usmapdata
Title: Mapping Data for 'usmap' Package
Version: 0.1.1.9999
Version: 0.1.2.9999
Description: Provides a container for data used by the 'usmap' package.
The data used by 'usmap' has been extracted into this package so that the
file size of the 'usmap' package can be reduced greatly. The data in this
Expand Down
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# usmapdata 0.1.1.9999
# usmapdata 0.1.2.9999



# usmapdata 0.1.2
Released Monday, December 11, 2023.

* Add `fips_data` function to load raw FIPS data from included csv files.
* `fips_data()`, `fips_data("state")`, or `fips_data("states")` load state FIPS codes
Expand Down
6 changes: 3 additions & 3 deletions revdep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
|field |value |
|:--------|:------------------------------------------|
|version |R version 4.3.0 (2023-04-21) |
|os |macOS 14.0 |
|os |macOS 14.1.2 |
|system |aarch64, darwin20 |
|ui |RStudio |
|language |(EN) |
|collate |en_US.UTF-8 |
|ctype |en_US.UTF-8 |
|tz |America/New_York |
|date |2023-10-20 |
|date |2023-12-10 |
|rstudio |2023.06.0+421 Mountain Hydrangea (desktop) |
|pandoc |NA |

# Dependencies

|package |old |new |Δ |
|:---------|:-----|:----------|:--|
|usmapdata |0.1.0 |0.1.0.9999 |* |
|usmapdata |0.1.1 |0.1.1.9999 |* |

# Revdeps

2 changes: 1 addition & 1 deletion revdep/checks.noindex/libraries.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
package,old,new,delta
usmapdata,0.1.0,0.1.0.9999,*
usmapdata,0.1.1,0.1.1.9999,*
71 changes: 35 additions & 36 deletions revdep/checks.noindex/usmap/new/libraries.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmapdata/new
usmapdata (0.1.0.9999)
usmapdata (0.1.1.9999)

Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmap
askpass (1.2.0)
base64enc (0.1-3)
brio (1.1.3)
bslib (0.5.1)
brio (1.1.4)
bslib (0.6.1)
cachem (1.0.8)
callr (3.7.3)
class (7.3-22)
classInt (0.4-10)
cli (3.6.1)
colorspace (2.1-0)
covr (3.6.3)
covr (3.6.4)
crayon (1.5.2)
curl (5.1.0)
curl (5.2.0)
DBI (1.1.3)
desc (1.4.2)
desc (1.4.3)
diffobj (0.3.5)
digest (0.6.33)
e1071 (1.7-13)
e1071 (1.7-14)
ellipsis (0.3.2)
evaluate (0.22)
fansi (1.0.5)
evaluate (0.23)
fansi (1.0.6)
farver (2.1.1)
fastmap (1.1.1)
fontawesome (0.5.2)
Expand All @@ -32,33 +32,32 @@ ggrepel (0.9.4)
glue (1.6.2)
gtable (0.3.4)
highr (0.10)
htmltools (0.5.6.1)
htmltools (0.5.7)
httr (1.4.7)
isoband (0.2.7)
jquerylib (0.1.4)
jsonlite (1.8.7)
jsonlite (1.8.8)
KernSmooth (2.23-22)
knitr (1.44)
knitr (1.45)
labeling (0.4.3)
lattice (0.21-9)
lattice (0.22-5)
lazyeval (0.2.2)
lifecycle (1.0.3)
lifecycle (1.0.4)
magrittr (2.0.3)
MASS (7.3-60)
Matrix (1.6-1.1)
Matrix (1.6-4)
memoise (2.0.1)
mgcv (1.9-0)
mime (0.12)
munsell (0.5.0)
nlme (3.1-163)
nlme (3.1-164)
openssl (2.1.1)
pillar (1.9.0)
pkgbuild (1.4.2)
pkgbuild (1.4.3)
pkgconfig (2.0.3)
pkgload (1.3.3)
praise (1.0.0)
prettyunits (1.2.0)
processx (3.8.2)
processx (3.8.3)
proto (1.0.0)
proxy (0.4-27)
ps (1.7.5)
Expand All @@ -68,26 +67,26 @@ RColorBrewer (1.1-3)
Rcpp (1.0.11)
rematch2 (2.1.2)
rex (1.2.1)
rlang (1.1.1)
rlang (1.1.2)
rmarkdown (2.25)
rprojroot (2.0.3)
s2 (1.1.4)
sass (0.4.7)
scales (1.2.1)
rprojroot (2.0.4)
s2 (1.1.5)
sass (0.4.8)
scales (1.3.0)
sf (1.0-14)
sp (2.1-1)
stringi (1.7.12)
stringr (1.5.0)
sp (2.1-2)
stringi (1.8.2)
stringr (1.5.1)
sys (3.4.2)
testthat (3.2.0)
testthat (3.2.1)
tibble (3.2.1)
tinytex (0.48)
units (0.8-4)
utf8 (1.2.3)
vctrs (0.6.4)
tinytex (0.49)
units (0.8-5)
utf8 (1.2.4)
vctrs (0.6.5)
viridisLite (0.4.2)
waldo (0.5.1)
withr (2.5.1)
wk (0.8.0)
xfun (0.40)
waldo (0.5.2)
withr (2.5.2)
wk (0.9.1)
xfun (0.41)
yaml (2.3.7)
4 changes: 2 additions & 2 deletions revdep/checks.noindex/usmap/new/usmap.Rcheck/00check.log
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* R was compiled by
Apple clang version 14.0.0 (clang-1400.0.29.202)
GNU Fortran (GCC) 12.2.0
* running under: macOS 14.0
* running under: macOS 14.1.2
* using session charset: UTF-8
* using options ‘--no-manual --no-build-vignettes’
* checking for file ‘usmap/DESCRIPTION’ ... OK
* this is package ‘usmap’ version ‘0.6.2
* this is package ‘usmap’ version ‘0.6.3
* package encoding: UTF-8
* checking package namespace information ... OK
* checking package dependencies ... OK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ package 'testthat' was built under R version 4.3.1
>
> proc.time()
user system elapsed
2.457 0.118 2.573
2.024 0.104 2.148
Original file line number Diff line number Diff line change
Expand Up @@ -60,78 +60,78 @@ test_that("correct data is used", {

test_that("layer parameters are correct", {
expect_is(p$layers[[1]], "ggproto")
expect_equal(deparse(p$layers[[1]]$mapping$x), "~x")
expect_equal(deparse(p$layers[[1]]$mapping$y), "~y")
expect_equal(deparse(p$layers[[1]]$mapping$group), "~group")
expect_equal(deparse(p$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(p$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(p$layers[[1]]$mapping$group), "~.data$group")
expect_equal(as.character(p$layers[[1]]$aes_params$colour), "black")
expect_equal(as.character(p$layers[[1]]$aes_params$fill), "red")
expect_equal(p$layers[[1]]$aes_params$linewidth, 0.4)

expect_is(q$layers[[1]], "ggproto")
expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data[[\"x\"]]")
expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data[[\"y\"]]")
expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data[[\"group\"]]")
expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data$group")
expect_equal(deparse(q$layers[[1]]$mapping$fill), "~.data[[\"pop_2015\"]]")
expect_equal(as.character(q$layers[[1]]$aes_params$colour), "blue")
expect_equal(q$layers[[1]]$aes_params$linewidth, 0.4)

expect_is(r$layers[[1]], "ggproto")
expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data[[\"x\"]]")
expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data[[\"y\"]]")
expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data[[\"group\"]]")
expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data$group")
expect_equal(deparse(r$layers[[1]]$mapping$fill), "~.data[[\"values\"]]")
expect_equal(as.character(r$layers[[1]]$aes_params$colour), "black")
expect_equal(r$layers[[1]]$aes_params$linewidth, 0.8)

expect_is(s$layers[[1]], "ggproto")
expect_equal(deparse(s$layers[[1]]$mapping$x), "~x")
expect_equal(deparse(s$layers[[1]]$mapping$y), "~y")
expect_equal(deparse(s$layers[[1]]$mapping$group), "~group")
expect_equal(deparse(s$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(s$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(s$layers[[1]]$mapping$group), "~.data$group")
expect_equal(as.character(s$layers[[1]]$aes_params$fill), "white")
expect_equal(as.character(s$layers[[1]]$aes_params$colour), "black")
expect_equal(s$layers[[1]]$aes_params$linewidth, 0.4)
expect_is(s$layers[[2]], "ggproto")
expect_equal(deparse(s$layers[[2]]$mapping$x), "~x")
expect_equal(deparse(s$layers[[2]]$mapping$y), "~y")
expect_equal(deparse(s$layers[[2]]$mapping$label), "~abbr")
expect_equal(deparse(s$layers[[2]]$mapping$x), "~.data$x")
expect_equal(deparse(s$layers[[2]]$mapping$y), "~.data$y")
expect_equal(deparse(s$layers[[2]]$mapping$label), "~.data$abbr")
expect_equal(as.character(s$layers[[2]]$aes_params$colour), "blue")

expect_is(t$layers[[1]], "ggproto")
expect_equal(deparse(t$layers[[1]]$mapping$x), "~x")
expect_equal(deparse(t$layers[[1]]$mapping$y), "~y")
expect_equal(deparse(t$layers[[1]]$mapping$group), "~group")
expect_equal(deparse(t$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(t$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(t$layers[[1]]$mapping$group), "~.data$group")
expect_equal(as.character(t$layers[[1]]$aes_params$fill), "yellow")
expect_equal(as.character(t$layers[[1]]$aes_params$colour), "black")
expect_equal(t$layers[[1]]$aes_params$linewidth, 0.6)
expect_is(t$layers[[2]], "ggproto")
expect_equal(deparse(t$layers[[2]]$mapping$x), "~x")
expect_equal(deparse(t$layers[[2]]$mapping$y), "~y")
expect_equal(deparse(t$layers[[2]]$mapping$x), "~.data$x")
expect_equal(deparse(t$layers[[2]]$mapping$y), "~.data$y")
expect_equal(deparse(t$layers[[2]]$mapping$label),
"~sub(\" County\", \"\", county)")
"~sub(\" County\", \"\", .data$county)")

expect_is(u$layers[[1]], "ggproto")
expect_equal(deparse(u$layers[[1]]$mapping$x), "~x")
expect_equal(deparse(u$layers[[1]]$mapping$y), "~y")
expect_equal(deparse(u$layers[[1]]$mapping$group), "~group")
expect_equal(deparse(u$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(u$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(u$layers[[1]]$mapping$group), "~.data$group")
expect_equal(as.character(u$layers[[1]]$aes_params$fill), "white")
expect_equal(as.character(u$layers[[1]]$aes_params$colour), "black")
expect_equal(u$layers[[1]]$aes_params$linewidth, 0.4)
expect_is(u$layers[[2]], "ggproto")
expect_equal(deparse(u$layers[[2]]$mapping$x), "~x")
expect_equal(deparse(u$layers[[2]]$mapping$y), "~y")
expect_equal(deparse(u$layers[[2]]$mapping$label), "~abbr")
expect_equal(deparse(u$layers[[2]]$mapping$x), "~.data$x")
expect_equal(deparse(u$layers[[2]]$mapping$y), "~.data$y")
expect_equal(deparse(u$layers[[2]]$mapping$label), "~.data$abbr")

expect_is(v$layers[[1]], "ggproto")
expect_equal(deparse(v$layers[[1]]$mapping$x), "~x")
expect_equal(deparse(v$layers[[1]]$mapping$y), "~y")
expect_equal(deparse(v$layers[[1]]$mapping$group), "~group")
expect_equal(deparse(v$layers[[1]]$mapping$x), "~.data$x")
expect_equal(deparse(v$layers[[1]]$mapping$y), "~.data$y")
expect_equal(deparse(v$layers[[1]]$mapping$group), "~.data$group")
expect_equal(as.character(v$layers[[1]]$aes_params$fill), "white")
expect_equal(as.character(v$layers[[1]]$aes_params$colour), "black")
expect_equal(v$layers[[1]]$aes_params$linewidth, 0.4)
expect_is(v$layers[[2]], "ggproto")
expect_equal(deparse(v$layers[[2]]$mapping$x), "~x")
expect_equal(deparse(v$layers[[2]]$mapping$y), "~y")
expect_equal(deparse(v$layers[[2]]$mapping$label), "~abbr")
expect_equal(deparse(v$layers[[2]]$mapping$x), "~.data$x")
expect_equal(deparse(v$layers[[2]]$mapping$y), "~.data$y")
expect_equal(deparse(v$layers[[2]]$mapping$label), "~.data$abbr")
})

test_that("warning occurs for unnecessary fill argument", {
Expand Down
2 changes: 1 addition & 1 deletion revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.Rout
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ detaching ‘package:ggplot2’

> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 2.867 0.117 2.998 0 0
Time elapsed: 2.292 0.102 2.406 0 0
> grDevices::dev.off()
null device
1
Expand Down
Binary file modified revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.pdf
Binary file not shown.
Loading