Skip to content

Commit 29de014

Browse files
committed
Prepare for 0.1.2 release
1 parent 1c49815 commit 29de014

52 files changed

Lines changed: 181 additions & 165 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
revdep/** linguist-vendored

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: usmapdata
22
Title: Mapping Data for 'usmap' Package
3-
Version: 0.1.1.9999
3+
Version: 0.1.2
44
Description: Provides a container for data used by the 'usmap' package.
55
The data used by 'usmap' has been extracted into this package so that the
66
file size of the 'usmap' package can be reduced greatly. The data in this

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# usmapdata 0.1.1.9999
1+
# usmapdata 0.1.2
22

33
* Add `fips_data` function to load raw FIPS data from included csv files.
44
* `fips_data()`, `fips_data("state")`, or `fips_data("states")` load state FIPS codes

revdep/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
|field |value |
44
|:--------|:------------------------------------------|
55
|version |R version 4.3.0 (2023-04-21) |
6-
|os |macOS 14.0 |
6+
|os |macOS 14.1.2 |
77
|system |aarch64, darwin20 |
88
|ui |RStudio |
99
|language |(EN) |
1010
|collate |en_US.UTF-8 |
1111
|ctype |en_US.UTF-8 |
1212
|tz |America/New_York |
13-
|date |2023-10-20 |
13+
|date |2023-12-10 |
1414
|rstudio |2023.06.0+421 Mountain Hydrangea (desktop) |
1515
|pandoc |NA |
1616

1717
# Dependencies
1818

1919
|package |old |new |Δ |
2020
|:---------|:-----|:----------|:--|
21-
|usmapdata |0.1.0 |0.1.0.9999 |* |
21+
|usmapdata |0.1.1 |0.1.1.9999 |* |
2222

2323
# Revdeps
2424

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
package,old,new,delta
2-
usmapdata,0.1.0,0.1.0.9999,*
2+
usmapdata,0.1.1,0.1.1.9999,*
Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmapdata/new
2-
usmapdata (0.1.0.9999)
2+
usmapdata (0.1.1.9999)
33

44
Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmap
55
askpass (1.2.0)
66
base64enc (0.1-3)
7-
brio (1.1.3)
8-
bslib (0.5.1)
7+
brio (1.1.4)
8+
bslib (0.6.1)
99
cachem (1.0.8)
1010
callr (3.7.3)
1111
class (7.3-22)
1212
classInt (0.4-10)
1313
cli (3.6.1)
1414
colorspace (2.1-0)
15-
covr (3.6.3)
15+
covr (3.6.4)
1616
crayon (1.5.2)
17-
curl (5.1.0)
17+
curl (5.2.0)
1818
DBI (1.1.3)
19-
desc (1.4.2)
19+
desc (1.4.3)
2020
diffobj (0.3.5)
2121
digest (0.6.33)
22-
e1071 (1.7-13)
22+
e1071 (1.7-14)
2323
ellipsis (0.3.2)
24-
evaluate (0.22)
25-
fansi (1.0.5)
24+
evaluate (0.23)
25+
fansi (1.0.6)
2626
farver (2.1.1)
2727
fastmap (1.1.1)
2828
fontawesome (0.5.2)
@@ -32,33 +32,32 @@ ggrepel (0.9.4)
3232
glue (1.6.2)
3333
gtable (0.3.4)
3434
highr (0.10)
35-
htmltools (0.5.6.1)
35+
htmltools (0.5.7)
3636
httr (1.4.7)
3737
isoband (0.2.7)
3838
jquerylib (0.1.4)
39-
jsonlite (1.8.7)
39+
jsonlite (1.8.8)
4040
KernSmooth (2.23-22)
41-
knitr (1.44)
41+
knitr (1.45)
4242
labeling (0.4.3)
43-
lattice (0.21-9)
43+
lattice (0.22-5)
4444
lazyeval (0.2.2)
45-
lifecycle (1.0.3)
45+
lifecycle (1.0.4)
4646
magrittr (2.0.3)
4747
MASS (7.3-60)
48-
Matrix (1.6-1.1)
48+
Matrix (1.6-4)
4949
memoise (2.0.1)
5050
mgcv (1.9-0)
5151
mime (0.12)
5252
munsell (0.5.0)
53-
nlme (3.1-163)
53+
nlme (3.1-164)
5454
openssl (2.1.1)
5555
pillar (1.9.0)
56-
pkgbuild (1.4.2)
56+
pkgbuild (1.4.3)
5757
pkgconfig (2.0.3)
5858
pkgload (1.3.3)
5959
praise (1.0.0)
60-
prettyunits (1.2.0)
61-
processx (3.8.2)
60+
processx (3.8.3)
6261
proto (1.0.0)
6362
proxy (0.4-27)
6463
ps (1.7.5)
@@ -68,26 +67,26 @@ RColorBrewer (1.1-3)
6867
Rcpp (1.0.11)
6968
rematch2 (2.1.2)
7069
rex (1.2.1)
71-
rlang (1.1.1)
70+
rlang (1.1.2)
7271
rmarkdown (2.25)
73-
rprojroot (2.0.3)
74-
s2 (1.1.4)
75-
sass (0.4.7)
76-
scales (1.2.1)
72+
rprojroot (2.0.4)
73+
s2 (1.1.5)
74+
sass (0.4.8)
75+
scales (1.3.0)
7776
sf (1.0-14)
78-
sp (2.1-1)
79-
stringi (1.7.12)
80-
stringr (1.5.0)
77+
sp (2.1-2)
78+
stringi (1.8.2)
79+
stringr (1.5.1)
8180
sys (3.4.2)
82-
testthat (3.2.0)
81+
testthat (3.2.1)
8382
tibble (3.2.1)
84-
tinytex (0.48)
85-
units (0.8-4)
86-
utf8 (1.2.3)
87-
vctrs (0.6.4)
83+
tinytex (0.49)
84+
units (0.8-5)
85+
utf8 (1.2.4)
86+
vctrs (0.6.5)
8887
viridisLite (0.4.2)
89-
waldo (0.5.1)
90-
withr (2.5.1)
91-
wk (0.8.0)
92-
xfun (0.40)
88+
waldo (0.5.2)
89+
withr (2.5.2)
90+
wk (0.9.1)
91+
xfun (0.41)
9392
yaml (2.3.7)

revdep/checks.noindex/usmap/new/usmap.Rcheck/00check.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* R was compiled by
55
Apple clang version 14.0.0 (clang-1400.0.29.202)
66
GNU Fortran (GCC) 12.2.0
7-
* running under: macOS 14.0
7+
* running under: macOS 14.1.2
88
* using session charset: UTF-8
99
* using options ‘--no-manual --no-build-vignettes’
1010
* checking for file ‘usmap/DESCRIPTION’ ... OK
11-
* this is package ‘usmap’ version ‘0.6.2
11+
* this is package ‘usmap’ version ‘0.6.3
1212
* package encoding: UTF-8
1313
* checking package namespace information ... OK
1414
* checking package dependencies ... OK

revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat.Rout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ package 'testthat' was built under R version 4.3.1
2727
>
2828
> proc.time()
2929
user system elapsed
30-
2.457 0.118 2.573
30+
2.024 0.104 2.148

revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat/test-plot.R

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,78 +60,78 @@ test_that("correct data is used", {
6060

6161
test_that("layer parameters are correct", {
6262
expect_is(p$layers[[1]], "ggproto")
63-
expect_equal(deparse(p$layers[[1]]$mapping$x), "~x")
64-
expect_equal(deparse(p$layers[[1]]$mapping$y), "~y")
65-
expect_equal(deparse(p$layers[[1]]$mapping$group), "~group")
63+
expect_equal(deparse(p$layers[[1]]$mapping$x), "~.data$x")
64+
expect_equal(deparse(p$layers[[1]]$mapping$y), "~.data$y")
65+
expect_equal(deparse(p$layers[[1]]$mapping$group), "~.data$group")
6666
expect_equal(as.character(p$layers[[1]]$aes_params$colour), "black")
6767
expect_equal(as.character(p$layers[[1]]$aes_params$fill), "red")
6868
expect_equal(p$layers[[1]]$aes_params$linewidth, 0.4)
6969

7070
expect_is(q$layers[[1]], "ggproto")
71-
expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data[[\"x\"]]")
72-
expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data[[\"y\"]]")
73-
expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data[[\"group\"]]")
71+
expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data$x")
72+
expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data$y")
73+
expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data$group")
7474
expect_equal(deparse(q$layers[[1]]$mapping$fill), "~.data[[\"pop_2015\"]]")
7575
expect_equal(as.character(q$layers[[1]]$aes_params$colour), "blue")
7676
expect_equal(q$layers[[1]]$aes_params$linewidth, 0.4)
7777

7878
expect_is(r$layers[[1]], "ggproto")
79-
expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data[[\"x\"]]")
80-
expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data[[\"y\"]]")
81-
expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data[[\"group\"]]")
79+
expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data$x")
80+
expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data$y")
81+
expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data$group")
8282
expect_equal(deparse(r$layers[[1]]$mapping$fill), "~.data[[\"values\"]]")
8383
expect_equal(as.character(r$layers[[1]]$aes_params$colour), "black")
8484
expect_equal(r$layers[[1]]$aes_params$linewidth, 0.8)
8585

8686
expect_is(s$layers[[1]], "ggproto")
87-
expect_equal(deparse(s$layers[[1]]$mapping$x), "~x")
88-
expect_equal(deparse(s$layers[[1]]$mapping$y), "~y")
89-
expect_equal(deparse(s$layers[[1]]$mapping$group), "~group")
87+
expect_equal(deparse(s$layers[[1]]$mapping$x), "~.data$x")
88+
expect_equal(deparse(s$layers[[1]]$mapping$y), "~.data$y")
89+
expect_equal(deparse(s$layers[[1]]$mapping$group), "~.data$group")
9090
expect_equal(as.character(s$layers[[1]]$aes_params$fill), "white")
9191
expect_equal(as.character(s$layers[[1]]$aes_params$colour), "black")
9292
expect_equal(s$layers[[1]]$aes_params$linewidth, 0.4)
9393
expect_is(s$layers[[2]], "ggproto")
94-
expect_equal(deparse(s$layers[[2]]$mapping$x), "~x")
95-
expect_equal(deparse(s$layers[[2]]$mapping$y), "~y")
96-
expect_equal(deparse(s$layers[[2]]$mapping$label), "~abbr")
94+
expect_equal(deparse(s$layers[[2]]$mapping$x), "~.data$x")
95+
expect_equal(deparse(s$layers[[2]]$mapping$y), "~.data$y")
96+
expect_equal(deparse(s$layers[[2]]$mapping$label), "~.data$abbr")
9797
expect_equal(as.character(s$layers[[2]]$aes_params$colour), "blue")
9898

9999
expect_is(t$layers[[1]], "ggproto")
100-
expect_equal(deparse(t$layers[[1]]$mapping$x), "~x")
101-
expect_equal(deparse(t$layers[[1]]$mapping$y), "~y")
102-
expect_equal(deparse(t$layers[[1]]$mapping$group), "~group")
100+
expect_equal(deparse(t$layers[[1]]$mapping$x), "~.data$x")
101+
expect_equal(deparse(t$layers[[1]]$mapping$y), "~.data$y")
102+
expect_equal(deparse(t$layers[[1]]$mapping$group), "~.data$group")
103103
expect_equal(as.character(t$layers[[1]]$aes_params$fill), "yellow")
104104
expect_equal(as.character(t$layers[[1]]$aes_params$colour), "black")
105105
expect_equal(t$layers[[1]]$aes_params$linewidth, 0.6)
106106
expect_is(t$layers[[2]], "ggproto")
107-
expect_equal(deparse(t$layers[[2]]$mapping$x), "~x")
108-
expect_equal(deparse(t$layers[[2]]$mapping$y), "~y")
107+
expect_equal(deparse(t$layers[[2]]$mapping$x), "~.data$x")
108+
expect_equal(deparse(t$layers[[2]]$mapping$y), "~.data$y")
109109
expect_equal(deparse(t$layers[[2]]$mapping$label),
110-
"~sub(\" County\", \"\", county)")
110+
"~sub(\" County\", \"\", .data$county)")
111111

112112
expect_is(u$layers[[1]], "ggproto")
113-
expect_equal(deparse(u$layers[[1]]$mapping$x), "~x")
114-
expect_equal(deparse(u$layers[[1]]$mapping$y), "~y")
115-
expect_equal(deparse(u$layers[[1]]$mapping$group), "~group")
113+
expect_equal(deparse(u$layers[[1]]$mapping$x), "~.data$x")
114+
expect_equal(deparse(u$layers[[1]]$mapping$y), "~.data$y")
115+
expect_equal(deparse(u$layers[[1]]$mapping$group), "~.data$group")
116116
expect_equal(as.character(u$layers[[1]]$aes_params$fill), "white")
117117
expect_equal(as.character(u$layers[[1]]$aes_params$colour), "black")
118118
expect_equal(u$layers[[1]]$aes_params$linewidth, 0.4)
119119
expect_is(u$layers[[2]], "ggproto")
120-
expect_equal(deparse(u$layers[[2]]$mapping$x), "~x")
121-
expect_equal(deparse(u$layers[[2]]$mapping$y), "~y")
122-
expect_equal(deparse(u$layers[[2]]$mapping$label), "~abbr")
120+
expect_equal(deparse(u$layers[[2]]$mapping$x), "~.data$x")
121+
expect_equal(deparse(u$layers[[2]]$mapping$y), "~.data$y")
122+
expect_equal(deparse(u$layers[[2]]$mapping$label), "~.data$abbr")
123123

124124
expect_is(v$layers[[1]], "ggproto")
125-
expect_equal(deparse(v$layers[[1]]$mapping$x), "~x")
126-
expect_equal(deparse(v$layers[[1]]$mapping$y), "~y")
127-
expect_equal(deparse(v$layers[[1]]$mapping$group), "~group")
125+
expect_equal(deparse(v$layers[[1]]$mapping$x), "~.data$x")
126+
expect_equal(deparse(v$layers[[1]]$mapping$y), "~.data$y")
127+
expect_equal(deparse(v$layers[[1]]$mapping$group), "~.data$group")
128128
expect_equal(as.character(v$layers[[1]]$aes_params$fill), "white")
129129
expect_equal(as.character(v$layers[[1]]$aes_params$colour), "black")
130130
expect_equal(v$layers[[1]]$aes_params$linewidth, 0.4)
131131
expect_is(v$layers[[2]], "ggproto")
132-
expect_equal(deparse(v$layers[[2]]$mapping$x), "~x")
133-
expect_equal(deparse(v$layers[[2]]$mapping$y), "~y")
134-
expect_equal(deparse(v$layers[[2]]$mapping$label), "~abbr")
132+
expect_equal(deparse(v$layers[[2]]$mapping$x), "~.data$x")
133+
expect_equal(deparse(v$layers[[2]]$mapping$y), "~.data$y")
134+
expect_equal(deparse(v$layers[[2]]$mapping$label), "~.data$abbr")
135135
})
136136

137137
test_that("warning occurs for unnecessary fill argument", {

revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.Rout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ detaching ‘package:ggplot2’
471471

472472
> options(digits = 7L)
473473
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
474-
Time elapsed: 2.867 0.117 2.998 0 0
474+
Time elapsed: 2.292 0.102 2.406 0 0
475475
> grDevices::dev.off()
476476
null device
477477
1

0 commit comments

Comments
 (0)