Skip to content

Commit

Permalink
Merge pull request #9 from slu-openGIS/cran-release2
Browse files Browse the repository at this point in the history
Cran release2
  • Loading branch information
Christopher Prener authored Jun 22, 2019
2 parents a4ddde9 + 769e640 commit d369140
Show file tree
Hide file tree
Showing 24 changed files with 60 additions and 59 deletions.
2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This package was submitted to CRAN on 2019-06-21.
Once it is accepted, delete this file and tag the release (commit f8d5faa706).
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: biscale
Type: Package
Title: Tools and Palettes for Bivariate Thematic Mapping
Version: 0.1.2.9000
Version: 0.1.2
Authors@R: c(
person("Christopher", "Prener", , "[email protected]", c("aut", "cre"),
comment = c(ORCID = "0000-0002-4310-9888")),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# biscale 0.1.2.9000
# biscale 0.1.2

* Add non-standard evaluation to `bi_legend()`
* Fix typos in `README.Rmd`, `index.Rmd`, and in `bi_class.R`
Expand Down
9 changes: 6 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ knitr::opts_chunk$set(

In addition to support for both two-by-two and three-by-three maps, the package also supports four methods for calculating breaks for bivariate maps.

## What's New
`biscale` v0.1.2.9000 is underway! This will be a maintence release that includes typo corrections. It does add the ability to pass objects to `bi_legend()`'s x and y axis label arguments, which may be useful to some users. The `biscale` workflow has also been tested with the new [release candidate for `cowplot`](https://github.com/wilkelab/cowplot) as well as the amazing `ggplot2` update and works as expected.
## What's New?
`biscale` v0.1.2 is out! This is a maintence release that includes typo corrections. It does add the ability to pass objects to `bi_legend()`'s x and y axis label arguments, which may be useful to some users. The `biscale` workflow has also been tested with the new [release candidate for `cowplot`](https://github.com/wilkelab/cowplot) as well as the amazing `ggplot2` update and works as expected.

## What's on the Roadmap?
A companion to `bi_scale_fill()`, `bi_scale_color()`, is planned to accommodate bivariate mapping with point data.

## Installation
Since the package does not directly use functions from `sf`, it is a suggested dependency rather than a required one. However, the most direct approach to using `biscale` is with `sf` objects, and we therefore recommend users install `sf` before proceeding with using `biscale`. Windows users should be able to install `sf` without significant issues, but macOS and Linux users will need to install several open source spatial libraries to get `sf` itself up and running. The easiest approach for macOS users is to install the GDAL 2.0 Complete framework from [Kyng Chaos](https://www.kyngchaos.com/software/frameworks/).
Expand Down Expand Up @@ -125,4 +128,4 @@ These same options exist for three-by-three mapping as well:
All color palettes, including `"Brown"`, can be previewed by using the `bi_pal()` function or by checking out that function's documentation on the [package website](https://slu-opengis.github.io/biscale/reference/bi_pal.html).

## Contributor Code of Conduct
Please note that this project is released with a [Contributor Code of Conduct](.github/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
Please note that this project is released with a [Contributor Code of Conduct](https://slu-opengis.github.io/biscale/CODE_OF_CONDUCT.html). By participating in this project you agree to abide by its terms.
23 changes: 14 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,19 @@ In addition to support for both two-by-two and three-by-three maps, the
package also supports four methods for calculating breaks for bivariate
maps.

## What’s New
## What’s New?

`biscale` v0.1.2.9000 is underway\! This will be a maintence release
that includes typo corrections. It does add the ability to pass objects
to `bi_legend()`’s x and y axis label arguments, which may be useful to
some users. The `biscale` workflow has also been tested with the new
[release candidate for `cowplot`](https://github.com/wilkelab/cowplot)
as well as the amazing `ggplot2` update and works as expected.
`biscale` v0.1.2 is out\! This is a maintence release that includes typo
corrections. It does add the ability to pass objects to `bi_legend()`’s
x and y axis label arguments, which may be useful to some users. The
`biscale` workflow has also been tested with the new [release candidate
for `cowplot`](https://github.com/wilkelab/cowplot) as well as the
amazing `ggplot2` update and works as expected.

## What’s on the Roadmap?

A companion to `bi_scale_fill()`, `bi_scale_color()`, is planned to
accommodate bivariate mapping with point data.

## Installation

Expand Down Expand Up @@ -188,5 +193,5 @@ website](https://slu-opengis.github.io/biscale/reference/bi_pal.html).
## Contributor Code of Conduct

Please note that this project is released with a [Contributor Code of
Conduct](.github/CODE_OF_CONDUCT.md). By participating in this project
you agree to abide by its terms.
Conduct](https://slu-opengis.github.io/biscale/CODE_OF_CONDUCT.html). By
participating in this project you agree to abide by its terms.
23 changes: 3 additions & 20 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
## Release summary
This is the second re-submission of our initial CRAN submission based on feedback from Matthias Sterrer. In the second re-submission, we've made the following changes:

1. Removed the duplicate word 'for' from the description as requested.

The first re-submission made the following changes:

1. Changed the first word of the description to "Provides..." as suggested.
2. Edited the 3rd sentance for clarity as suggested.
3. Added quotes around package names as requested.
This is a minor update to the package that (1) adds some new functionaliy to the `bi_legend()` function, (2) fixes various typos in the documentation, and (3) reduces the number of examples in `bi_pal()` in an effort to shrink the installed size of the package (which is generating 1 NOTE on CRAN's Solaris check of the current release).

## Test environments
* local OS X install, R 3.5.2
* local OS X install, R 3.6.0
* ubuntu 14.04 (on Travis CI), R-release, R-oldrel, R-devel
* macOS (on Travis CI), R-release, R-oldrel
* windows i386 (on Appveyor), R-release, R-oldrel, R-devel
Expand All @@ -20,16 +12,7 @@ The first re-submission made the following changes:
* r-hub not used because it lacks dependencies needed to build `sf` on Debian

## R CMD check results
There were no ERRORs, WARNINGs, or NOTEs with local checks or on Appveyor.

On TRAVIS, we are currently failing on R-oldrel macOS due to a switch in the TeX set-up. This does not appear to having anything to do with our package specifically.

On winbuilder checks, we get one NOTE:

* checking CRAN incoming feasibility ... NOTE
Maintainer: 'Christopher Prener <[email protected]>'

New submission
There were no ERRORs, WARNINGs, or NOTEs with local or CI checks.

## Reverse dependencies
Not applicable.
2 changes: 1 addition & 1 deletion docs/CODE_OF_CONDUCT.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/PULL_REQUEST_TEMPLATE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/articles/biscale.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/bi_class.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/bi_legend.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/bi_pal.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/bi_scale_fill.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/bi_theme.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/stl_race_income.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions index.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ knitr::include_graphics("man/figures/biscale.001.png")

In addition to support for both two-by-two and three-by-three maps, the package also supports four methods for calculating breaks for bivariate maps.

## What's New
`biscale` v0.1.2.9000 is underway! This will be a maintence release that includes typo corrections. It does add the ability to pass objects to `bi_legend()`'s x and y axis label arguments, which may be useful to some users. The `biscale` workflow has also been tested with the new [release candidate for `cowplot`](https://github.com/wilkelab/cowplot) as well as the amazing `ggplot2` update and works as expected.
## What's New?
`biscale` v0.1.2 is out! This is a maintence release that includes typo corrections. It does add the ability to pass objects to `bi_legend()`'s x and y axis label arguments, which may be useful to some users. The `biscale` workflow has also been tested with the new [release candidate for `cowplot`](https://github.com/wilkelab/cowplot) as well as the amazing `ggplot2` update and works as expected.

## What's on the Roadmap?
A companion to `bi_scale_fill()`, `bi_scale_color()`, is planned to accommodate bivariate mapping with point data.

## Quick Start
If the `sf` package is already installed, the development version of `biscale` can be accessed from GitHub with `remotes`:
Expand Down
2 changes: 1 addition & 1 deletion vignettes/biscale.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ This approach allows us to customize legend's placement and size to suit differe
* If you think you've found a bug, please create a [`reprex`](http://reprex.tidyverse.org/) and then open an issue on [GitHub](https://github.com/slu-openGIS/biscale/issues/new/choose).

## Suggesting Features or Changes
If you have features or suggestions you want to see implemented, please open an issue on [GitHub](https://github.com/slu-openGIS/biscale/issues/new/choose) (and ideally created a [`reprex`](http://reprex.tidyverse.org/) to go with it!). Please note that this project is released with a [Contributor Code of Conduct](.github/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
If you have features or suggestions you want to see implemented, please open an issue on [GitHub](https://github.com/slu-openGIS/biscale/issues/new/choose) (and ideally created a [`reprex`](http://reprex.tidyverse.org/) to go with it!). Please note that this project is released with a [Contributor Code of Conduct](https://slu-opengis.github.io/biscale/CODE_OF_CONDUCT.html). By participating in this project you agree to abide by its terms.

0 comments on commit d369140

Please sign in to comment.