Merge branch 'master' into stat_cross

.Rbuildignore

@@ -31,3 +31,7 @@ ggduo_paper.txt
 ^scripts/
 ^revdep$
 ^\.github/
+^_pkgdown\.yml$
+^docs$
+^pkgdown$
+^\.github$

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/R-CMD-check.yaml

@@ -0,0 +1,98 @@
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macOS-latest,   r: 'devel', force_suggests: "0"}
+          - {os: windows-latest, r: 'devel'}
+          - {os: macOS-latest,   r: 'release'}
+          - {os: windows-latest, r: 'release'}
+          - {os: ubuntu-16.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
+          - {os: macOS-latest,   r: 'oldrel'}
+          - {os: windows-latest, r: 'oldrel'}
+          - {os: ubuntu-16.04,   r: 'oldrel',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
+
+    env:
+      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
+      RSPM: ${{ matrix.config.rspm }}
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      _R_CHECK_FORCE_SUGGESTS_: ${{ matrix.config.force_suggests }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-r@master
+        with:
+          r-version: ${{ matrix.config.r }}
+
+      - uses: r-lib/actions/setup-pandoc@master
+
+      - name: Query dependencies
+        run: |
+          install.packages('remotes')
+          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
+          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
+        shell: Rscript {0}
+
+      - name: Cache R packages
+        if: runner.os != 'Windows'
+        uses: actions/cache@v1
+        with:
+          path: ${{ env.R_LIBS_USER }}
+          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+
+      - name: Install system dependencies
+        if: runner.os == 'Linux'
+        env:
+          RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
+        run: |
+          Rscript -e "remotes::install_github('r-hub/sysreqs')"
+          sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
+          sudo -s eval "$sysreqs"
+
+      - name: Install dependencies
+        run: |
+          remotes::install_deps(dependencies = TRUE)
+          remotes::install_cran("rcmdcheck")
+        shell: Rscript {0}
+
+      - name: Session info
+        run: |
+          options(width = 100)
+          pkgs <- installed.packages()[, "Package"]
+          sessioninfo::session_info(pkgs, include_base = TRUE)
+        shell: Rscript {0}
+
+      - name: Check
+        env:
+          _R_CHECK_CRAN_INCOMING_: false
+        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
+        shell: Rscript {0}
+
+      - name: Show testthat output
+        if: always()
+        run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Upload check results
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: ${{ runner.os }}-r${{ matrix.config.r }}-results
+          path: check

.github/workflows/pkgdown.yaml

@@ -0,0 +1,48 @@
+on:
+  push:
+    branches:
+      - master
+      - pkgdown
+
+
+name: pkgdown
+
+jobs:
+  pkgdown:
+    runs-on: macOS-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-r@master
+
+      - uses: r-lib/actions/setup-pandoc@master
+
+      - name: Query dependencies
+        run: |
+          install.packages('remotes')
+          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
+          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
+        shell: Rscript {0}
+
+      - name: Cache R packages
+        uses: actions/cache@v1
+        with:
+          path: ${{ env.R_LIBS_USER }}
+          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+
+      - name: Install dependencies
+        run: |
+          install.packages("remotes")
+          remotes::install_deps(dependencies = TRUE)
+          remotes::install_dev("pkgdown")
+        shell: Rscript {0}
+
+      - name: Install package
+        run: R CMD INSTALL .
+
+      - name: Deploy package
+        run: pkgdown::deploy_to_branch(new_process = FALSE)
+        shell: Rscript {0}

.gitignore

@@ -18,3 +18,5 @@ vignettes/rd_files/
 _gh-pages
 ggduo_paper.txt
 .httr-oauth
+docs
+inst/doc

.travis.yml

@@ -21,15 +21,15 @@ jobs:
       r_binary_packages:
         # install locally to avoid rev dep
         - covr # code coverage check
-      r_github_packages:
-        - schloerke/travisDrat
-        - rstudio/crosstalk
+      # r_github_packages:
+      #   - schloerke/travisDrat
+      #   - rstudio/crosstalk
       script:
         - Rscript -e 'remotes::install_local()'
         - Rscript -e 'covr::codecov()'
-        - CAN_PRINT=TRUE Rscript -e "packagedocs::deploy_travis(valid_branches = 'dev', push_branch = 'gh-pages-dev')"
-        - CAN_PRINT=TRUE Rscript -e "packagedocs::deploy_travis(valid_branches = 'master')"
-        - Rscript -e "travisDrat::deploy_drat(valid_branches = 'master', drat_repo = 'schloerke/drat')"
+        # - CAN_PRINT=TRUE Rscript -e "packagedocs::deploy_travis(valid_branches = 'dev', push_branch = 'gh-pages-dev')"
+        # - CAN_PRINT=TRUE Rscript -e "packagedocs::deploy_travis(valid_branches = 'master')"
+        # - Rscript -e "travisDrat::deploy_drat(valid_branches = 'master', drat_repo = 'schloerke/drat')"
 
 notifications:
   email:

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: GGally
-Version: 1.5.0
+Version: 1.5.0.9000
 License: GPL (>= 2.0)
 Title: Extension to 'ggplot2'
 Type: Package
@@ -8,7 +8,7 @@ LazyData: true
 URL: https://ggobi.github.io/ggally, https://github.com/ggobi/ggally
 BugReports: https://github.com/ggobi/ggally/issues
 Authors@R: c(
-    person("Barret", "Schloerke", role = c("aut", "cre"), email = "schloerke@gmail.com", comment = "author for ggpairs, ggduo, ggnostic, ggts, ggfacet, and ggally_*.  Contributor for all functions."),
+    person("Barret", "Schloerke", role = c("aut", "cre"), email = "schloerke@gmail.com", comment = "author for ggpairs, ggduo, ggnostic, ggts, ggfacet, and ggally_*"),
     person("Jason", "Crowley", role = "aut", email = "crowley.jason.s@gmail.com", comment = "ggparcoord"),
     person("Di", "Cook", role = c("aut", "ths"), email = "dicook@monash.edu", comment = "ggscatmat, gglyph"),
     person("Heike", "Hofmann", role = "ths", email = "hofmann@iastate.edu"),
@@ -28,7 +28,7 @@ Description:
     plot networks.
 Depends:
     R (>= 3.1),
-    ggplot2 (> 2.2.0)
+    ggplot2 (>= 3.3.0)
 Imports:
     grDevices,
     grid,
@@ -43,6 +43,7 @@ Suggests:
     broom (>= 0.4.0),
     chemometrics,
     geosphere (>= 1.5-1),
+    ggforce,
     igraph (>= 1.0.1),
     intergraph (>= 2.0-2),
     maps (>= 3.1.0),
@@ -56,9 +57,10 @@ Suggests:
     rmarkdown,
     roxygen2,
     testthat,
-    crosstalk
+    crosstalk,
+    knitr
 Roxygen: list(markdown = FALSE)
 RoxygenNote: 7.1.0
-VignetteBuilder: packagedocs
+VignetteBuilder: knitr
 SystemRequirements: openssl
 Encoding: UTF-8

NAMESPACE

@@ -10,6 +10,7 @@ S3method(print,glyphplot)
 S3method(print,legend_guide_box)
 S3method(str,ggmatrix)
 export(StatCross)
+export(StatGGallyCount)
 export(add_ggproto_to_ggmatrix)
 export(add_ref_boxes)
 export(add_ref_lines)
@@ -18,13 +19,18 @@ export(broomify)
 export(eval_data_col)
 export(fn_switch)
 export(getPlot)
+export(ggally_autopoint)
+export(ggally_autopointDiag)
 export(ggally_barDiag)
 export(ggally_blank)
 export(ggally_blankDiag)
 export(ggally_box)
 export(ggally_box_no_facet)
 export(ggally_cor)
 export(ggally_cross)
+export(ggally_cor_v1_5)
+export(ggally_count)
+export(ggally_countDiag)
 export(ggally_density)
 export(ggally_densityDiag)
 export(ggally_denstrip)
@@ -51,6 +57,7 @@ export(ggally_smooth_lm)
 export(ggally_smooth_loess)
 export(ggally_table)
 export(ggally_tableDiag)
+export(ggally_statistic)
 export(ggally_text)
 export(ggcoef)
 export(ggcorr)
@@ -93,6 +100,8 @@ export(rescale01)
 export(rescale11)
 export(scatmat)
 export(stat_cross)
+export(signif_stars)
+export(stat_ggally_count)
 export(uppertriangle)
 export(v1_ggmatrix_theme)
 export(wrap)

NEWS.md

@@ -1,3 +1,38 @@
+GGally (development version)
+---------------------
+
+
+`ggally_cor` (#327)
+* New implementation using `ggally_statistic()`
+* Will now hide the grid by default and add a border (`displayGrid = FALSE`)
+* Added the ability to display significance stars (`stars = TRUE`)
+* Alignment has been fixed so both short and long names should be displayed within view. `alignPercent` now corresponds to the center of the text.
+* Added the ability to separate the arguments sent to the title and the groups (`title_args` and `group_args`)
+* Digits now represents the total number of digits after the decimal place.
+* To use the old version, change your `ggally_cor` function calls to `ggally_cor_v1_5`.
+* Previously deprecated parameters have been removed
+
+`ggpairs` (#331)
+* new `proportion` argument to control relative size of sub-plots
+* option `proportion = "auto"` for automatic guess based on the number of levels for discrete variables
+
+`ggduo` (#331)
+* new `xProportion` and `yProportion` arguments to control relative size of sub-plots
+* option `xproportion = "auto"` and `yproportion = "auto"` for automatic guess based on the number of levels for discrete variables
+
+### New functions:
+
+`ggally_autopoint`, `ggally_autopointDiag` (#325)
+* Make scatterplots compatible with both continuous and catgeorical variables using `ggforce::geom_autopoint()`.
+
+`ggally_statistic` (#327)
+* New function which is a generialized version of `ggally_cor()`
+* Use this method to create functions similar to `ggally_cor()` that return any text value given and `x` and `y` vector of data
+
+`signif_stars()` (#327)
+* Return the appropriate number of significance stars as a character vector for the provided numeric input values.
+
+
 GGally 1.5.0
 ---------------------