diff --git a/.Rbuildignore b/.Rbuildignore index fde0412..fac7452 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -19,3 +19,5 @@ ^logs$ ^articles$ ^LICENSE$ +^doc$ +^Meta$ diff --git a/.gitignore b/.gitignore index 053288d..4cac8c1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ revdep spark-warehouse logs CRAN-RELEASE +doc +Meta diff --git a/DESCRIPTION b/DESCRIPTION index 0316b0f..c5f7518 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: replyr Type: Package Title: Patches to Use 'dplyr' on Remote Data Sources -Version: 1.0.4 -Date: 2019-07-24 +Version: 1.0.5 +Date: 2019-11-01 Authors@R: c( person("John", "Mount", email = "jmount@win-vector.com", role = c("aut", "cre")), person("Nina", "Zumel", email = "nzumel@win-vector.com", role = c("aut")), @@ -15,14 +15,14 @@ Description: Patches to use 'dplyr' on remote data sources ('SQL' databases, 'Spark' 2.0.0 and above) in a reliable "generic" fashion (generic meaning user code works similarly on all such sources, without needing per-source adaption). Due to the fluctuating nature of 'dplyr'/'dbplyr'/'rlang' 'APIs' this package - is going into maintenance mode. Most of the 'replyr' functions are already + is going into maintenance mode. Most of the 'replyr' functions are now done better by one of the non-monolithic replacement packages: 'wrapr', 'seplyr', 'rquery', or 'cdata'. License: GPL-2 | GPL-3 LazyData: TRUE Depends: R (>= 3.4.0), - wrapr (>= 1.8.8) + wrapr (>= 1.9.2) Imports: dplyr (>= 0.7.0), rlang (>= 0.2.0), @@ -35,8 +35,6 @@ Suggests: testthat, sparklyr, igraph, DiagrammeR, - htmlwidgets, - webshot, RSQLite VignetteBuilder: knitr ByteCompile: true diff --git a/NEWS.md b/NEWS.md index 6ece76a..cb2251c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,8 @@ +# replyr 1.0.5 2019-11-01 + + * Work on vignette render size. + # replyr 1.0.4 2019-07-24 * Adjust license. diff --git a/README.md b/README.md index e6aed90..f4464f8 100644 --- a/README.md +++ b/README.md @@ -298,7 +298,7 @@ summary(dRemote) glimpse(dRemote) # Observations: ?? # Variables: 3 - # Database: sqlite 3.22.0 [:memory:] + # Database: sqlite 3.29.0 [:memory:] # $ x 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, 2 # $ y 3, 5, NA, 3, 5, NA, 3, 5, NA, 3, 5, NA, 3, 5, NA # $ z NA, "a", "b", NA, "a", "b", NA, "a", "b", NA, "a", "b", NA, "a", "b" @@ -355,8 +355,8 @@ library('dplyr') ``` r values <- c(2) dRemote %>% replyr::replyr_filter('x', values) - # # Source: table [?? x 3] - # # Database: sqlite 3.22.0 [:memory:] + # # Source: table [?? x 3] + # # Database: sqlite 3.29.0 [:memory:] # x y z # # 1 2 5 a @@ -447,8 +447,8 @@ and semantic variations between versions of data sources. rm(list=ls()) gc() # used (Mb) gc trigger (Mb) limit (Mb) max used (Mb) - # Ncells 951822 50.9 1922980 102.7 NA 1430461 76.4 - # Vcells 1764369 13.5 8388608 64.0 16384 2515972 19.2 + # Ncells 917633 49.1 1873358 100.1 NA 1175762 62.8 + # Vcells 1711206 13.1 8388608 64.0 16384 2295143 17.6 ``` ## Note diff --git a/cran-comments.md b/cran-comments.md index f28f9c1..c2f88e4 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,54 +1,39 @@ -Sub-directory doc size is to support diagrams rendered in vignettes. +Fix doc size. ## Test environments - rhub::check_for_cran() - - 1030#> * using R Under development (unstable) (2019-07-04 r76780) - 1031#> * using platform: x86_64-w64-mingw32 (64-bit) - 1032#> * using session charset: ISO8859-1 - 1033#> * using option '--as-cran' - 1034#> * checking for file 'replyr/DESCRIPTION' ... OK - 1035#> * checking extension type ... Package - 1036#> * this is package 'replyr' version '1.0.4' - 1037#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers - 1038#> Maintainer: 'John Mount ' - 1048#> * checking installed package size ... NOTE - 1049#> installed size is 5.4Mb - 1050#> sub-directories of 1Mb or more: - 1051#> doc 5.1Mb - 1076#> * checking Rd line widths ... OK - 1077#> * checking Rd cross-references ... NOTE - 1078#> Package unavailable to check Rd xrefs: 'rquery' - 1097#> Status: 2 NOTEs - rquery is an alternative, not a dependency or suggestion. - - ### OSX build/check - R CMD check --as-cran replyr_1.0.4.tar.gz + R CMD check --as-cran replyr_1.0.5.tar.gz * using R version 3.6.0 (2019-04-26) * using platform: x86_64-apple-darwin15.6.0 (64-bit) * using session charset: UTF-8 * using option ‘--as-cran’ * checking for file ‘replyr/DESCRIPTION’ ... OK * checking extension type ... Package - * this is package ‘replyr’ version ‘1.0.4’ + * this is package ‘replyr’ version ‘1.0.5’ * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers Maintainer: ‘John Mount ’ - * checking installed package size ... NOTE - installed size is 5.4Mb - sub-directories of 1Mb or more: - doc 5.1Mb - Status: 1 NOTE - -### Windows + Status: OK - devtools::check_win_devel() +### Windows + rhub::check_for_cran() + 867#> * using R Under development (unstable) (2019-10-19 r77318) + 868#> * using platform: x86_64-w64-mingw32 (64-bit) + 869#> * using session charset: ISO8859-1 + 870#> * using option '--as-cran' + 871#> * checking for file 'replyr/DESCRIPTION' ... OK + 872#> * checking extension type ... Package + 873#> * this is package 'replyr' version '1.0.5' + 874#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers + 875#> Maintainer: 'John Mount ' + 911#> * checking Rd cross-references ... NOTE + 912#> Package unavailable to check Rd xrefs: 'rquery' + 932#> Status: 1 NOTE rquery is a documented alternative to replyr, but not a dependency. ## Downstream dependencies @@ -56,5 +41,5 @@ Sub-directory doc size is to support diagrams rendered in vignettes. No declared dependencies. devtools::revdep() - + character(0) diff --git a/docs/404.html b/docs/404.html new file mode 100644 index 0000000..5ef6e42 --- /dev/null +++ b/docs/404.html @@ -0,0 +1,165 @@ + + + + + + + + +Page not found (404) • replyr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ +
+
+ + +Content not found. Please use links in the navbar. + +
+ +
+ + + +
+ + +
+

Site built with pkgdown 1.4.1.

+
+ +
+
+ + + + + + + + diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 2eb2f39..c0c2250 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -8,21 +8,25 @@ License • replyr + + - + + - - + + + @@ -30,10 +34,12 @@ + + @@ -44,6 +50,7 @@ + @@ -60,7 +67,7 @@ replyr - 1.0.4 + 1.0.5 @@ -68,7 +75,7 @@ - - - + @@ -435,12 +433,14 @@

Developers

-

Site built with pkgdown 1.3.0.

+

Site built with pkgdown 1.4.1.

+ + diff --git a/docs/pkgdown.css b/docs/pkgdown.css index c03fb08..9145958 100644 --- a/docs/pkgdown.css +++ b/docs/pkgdown.css @@ -21,8 +21,6 @@ body > .container { display: flex; height: 100%; flex-direction: column; - - padding-top: 60px; } body > .container .row { @@ -102,21 +100,13 @@ a.anchor { margin-top: -40px; } -/* Static header placement on mobile devices */ -@media (max-width: 767px) { - .navbar-fixed-top { - position: absolute; - } - .navbar { - padding: 0; - } -} - - /* Sidebar --------------------------*/ #sidebar { margin-top: 30px; + position: -webkit-sticky; + position: sticky; + top: 70px; } #sidebar h2 { font-size: 1.5em; @@ -133,6 +123,9 @@ a.anchor { .orcid { height: 16px; + /* margins are required by official ORCID trademark and display guidelines */ + margin-left:4px; + margin-right:4px; vertical-align: middle; } @@ -222,6 +215,19 @@ a.sourceLine:hover { visibility: visible; } +/* headroom.js ------------------------ */ + +.headroom { + will-change: transform; + transition: transform 200ms linear; +} +.headroom--pinned { + transform: translateY(0%); +} +.headroom--unpinned { + transform: translateY(-100%); +} + /* mark.js ----------------------------*/ mark { @@ -234,3 +240,17 @@ mark { .html-widget { margin-bottom: 10px; } + +/* fontawesome ------------------------ */ + +.fab { + font-family: "Font Awesome 5 Brands" !important; +} + +/* don't display links in code chunks when printing */ +/* source: https://stackoverflow.com/a/10781533 */ +@media print { + code a:link:after, code a:visited:after { + content: ""; + } +} diff --git a/docs/pkgdown.js b/docs/pkgdown.js index eb7e83d..087a762 100644 --- a/docs/pkgdown.js +++ b/docs/pkgdown.js @@ -2,14 +2,12 @@ (function($) { $(function() { - $("#sidebar") - .stick_in_parent({offset_top: 40}) - .on('sticky_kit:bottom', function(e) { - $(this).parent().css('position', 'static'); - }) - .on('sticky_kit:unbottom', function(e) { - $(this).parent().css('position', 'relative'); - }); + $('.navbar-fixed-top').headroom(); + + $('body').css('padding-top', $('.navbar').height() + 10); + $(window).resize(function(){ + $('body').css('padding-top', $('.navbar').height() + 10); + }); $('body').scrollspy({ target: '#sidebar', diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 3d49330..0874a10 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -1,5 +1,5 @@ pandoc: 2.3.1 -pkgdown: 1.3.0 +pkgdown: 1.4.1 pkgdown_sha: ~ articles: DependencySorting: DependencySorting.html diff --git a/docs/reference/addConstantColumn.html b/docs/reference/addConstantColumn.html index 1110dd9..875226d 100644 --- a/docs/reference/addConstantColumn.html +++ b/docs/reference/addConstantColumn.html @@ -8,21 +8,25 @@ Add constant to a table. — addConstantColumn • replyr + + - + + - - + + + @@ -30,8 +34,8 @@ - + @@ -50,6 +55,7 @@ + @@ -66,7 +72,7 @@ replyr - 1.0.4 + 1.0.5 @@ -74,7 +80,7 @@ -