Skip to content

Commit c40abc0

Browse files
committed
Merge branch 'master' into issue-2540-part-II
2 parents 6133424 + 115c396 commit c40abc0

File tree

617 files changed

+48815
-66752
lines changed

Some content is hidden

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

617 files changed

+48815
-66752
lines changed

.Rbuildignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
^pkgdown$
12
^CRAN-RELEASE$
23
visual_test
34
^.*\.Rproj$
@@ -9,7 +10,9 @@ visual_test
910
^cran-comments.md$
1011
^data-raw$
1112
^CONTRIBUTING\.md$
13+
^GOVERNANCE\.md$
1214
^ISSUE_TEMPLATE\.md$
15+
^CODE_OF_CONDUCT\.md$
1316
^NEWS$
1417
^revdep$
1518
^\.httr-oauth$
@@ -21,3 +24,5 @@ visual_test
2124
^logo\.png$
2225
^appveyor\.yml$
2326
^\.github$
27+
^vignettes/profilings
28+
^cran-comments\.md$

.github/move.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Configuration for move-issues bot - https://github.com/dessant/move-issues
2+
3+
# Delete the command comment when it contains no other content
4+
deleteCommand: true
5+
6+
# Close the source issue after moving
7+
closeSourceIssue: true
8+
9+
# Lock the source issue after moving
10+
lockSourceIssue: false
11+
12+
# Mention issue and comment authors
13+
mentionAuthors: true
14+
15+
# Preserve mentions in the issue content
16+
keepContentMentions: true
17+
18+
# Set custom aliases for targets
19+
# aliases:
20+
# r: repo
21+
# or: owner/repo

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
docs
12
.Rproj.user
23
.Rhistory
34
.RData

.travis.yml

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,45 @@
11
language: R
22
cache: packages
3-
sudo: true
4-
dist: trusty
53

6-
addons:
7-
apt:
8-
packages:
9-
- libfreetype6
10-
11-
r:
12-
- 3.1
13-
- 3.2
14-
- oldrel
15-
- release
16-
- devel
17-
18-
# work around temporary travis + R 3.5 bug
19-
r_packages: devtools
20-
21-
# Install manually because dev vdiffr is not compatible with Appveyor yet
22-
r_github_packages: lionel-/vdiffr
4+
# build matrix; turn on vdiffr only on r release
5+
matrix:
6+
include:
7+
- r: devel
8+
# avoind errors due to world clock API (hopefully can be removed in future)
9+
env: _R_CHECK_SYSTEM_CLOCK_=false
10+
- r: release
11+
env: VDIFFR_RUN_TESTS=true
12+
before_cache:
13+
- Rscript -e 'remotes::install_cran("pkgdown")'
14+
- Rscript -e 'remotes::install_github("tidyverse/tidytemplate")'
15+
deploy:
16+
provider: script
17+
script: Rscript -e 'pkgdown::deploy_site_github(verbose = TRUE)'
18+
skip_cleanup: true
19+
- r: 3.5
20+
- r: 3.4
21+
- r: 3.3
22+
- r: 3.2
23+
env: R_REMOTES_NO_ERRORS_FROM_WARNINGS=true
2324

25+
# environment variables set for all builds
2426
env:
2527
global:
28+
# don't treat missing suggested packages as error
2629
- _R_CHECK_FORCE_SUGGESTS_=false
30+
# switch off vdiffr by default
31+
- VDIFFR_RUN_TESTS=false
2732

2833
after_success:
2934
- Rscript -e 'covr::codecov()'
3035

31-
before_install:
32-
- sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
33-
- sudo apt-get --yes --force-yes update -qq
34-
- sudo apt-get install --yes libudunits2-dev libproj-dev libgeos-dev libgdal-dev
35-
- Rscript -e 'update.packages(ask = FALSE)'
36+
addons:
37+
apt:
38+
sources:
39+
- sourceline: 'ppa:ubuntugis/ppa'
40+
packages:
41+
- libudunits2-dev
42+
- libproj-dev
43+
- libgeos-dev
44+
- libgdal-dev
45+

CODE_OF_CONDUCT.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributor Code of Conduct
2+
3+
As contributors and maintainers of this project, we pledge to respect all people who
4+
contribute through reporting issues, posting feature requests, updating documentation,
5+
submitting pull requests or patches, and other activities.
6+
7+
We are committed to making participation in this project a harassment-free experience for
8+
everyone, regardless of level of experience, gender, gender identity and expression,
9+
sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
10+
11+
Examples of unacceptable behavior by participants include the use of sexual language or
12+
imagery, derogatory comments or personal attacks, trolling, public or private harassment,
13+
insults, or other unprofessional conduct.
14+
15+
Project maintainers have the right and responsibility to remove, edit, or reject comments,
16+
commits, code, wiki edits, issues, and other contributions that are not aligned to this
17+
Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed
18+
from the project team.
19+
20+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
21+
opening an issue, emailing the project lead (<[email protected]>), or one of the core developers.
22+
23+
This Code of Conduct is adapted from the Contributor Covenant
24+
(http://contributor-covenant.org), version 1.0.0, available at
25+
http://contributor-covenant.org/version/1/0/0/

CONTRIBUTING.md

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
# Contributing to ggplot2 development
22

3-
The goal of this guide is to help you get up and contributing to ggplot2 as quickly as possible. The guide is divided into two main pieces:
3+
The goal of this guide is to help you get up and contributing to ggplot2 as
4+
quickly as possible. The guide is divided into two main pieces:
45

56
1. Filing a bug report or feature request in an issue.
67
1. Suggesting a change via a pull request.
78

9+
Please note that ggplot2 is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By contributing to this project,
10+
you agree to abide by its terms.
11+
812
## Issues
913

10-
When filing an issue, the most important thing is to include a minimal reproducible example so that we can quickly verify the problem, and then figure out how to fix it. There are three things you need to include to make your example reproducible: required packages, data, code.
14+
When filing an issue, the most important thing is to include a minimal
15+
reproducible example so that we can quickly verify the problem, and then figure
16+
out how to fix it. There are three things you need to include to make your
17+
example reproducible: required packages, data, code.
1118

1219
1. **Packages** should be loaded at the top of the script, so it's easy to
1320
see which ones the example needs.
@@ -34,9 +41,11 @@ When filing an issue, the most important thing is to include a minimal reproduci
3441
* do your best to remove everything that is not related to the problem.
3542
The shorter your code is, the easier it is to understand.
3643

37-
You can check you have actually made a reproducible example by starting up a fresh R session and pasting your script in.
44+
You can check you have actually made a reproducible example by starting up a
45+
fresh R session and pasting your script in.
3846

39-
(Unless you've been specifically asked for it, please don't include the output of `sessionInfo()`.)
47+
(Unless you've been specifically asked for it, please don't include the output
48+
of `sessionInfo()`.)
4049

4150
## Pull requests
4251

@@ -48,7 +57,9 @@ To contribute a change to ggplot2, you follow these steps:
4857
1. Iterate until either we accept the PR or decide that it's not
4958
a good fit for ggplot2.
5059

51-
Each of these steps are described in more detail below. This might feel overwhelming the first time you get set up, but it gets easier with practice. If you get stuck at any point, please reach out for help on the [ggplot2-dev](https://groups.google.com/forum/#!forum/ggplot2-dev) mailing list.
60+
Each of these steps are described in more detail below. This might feel
61+
overwhelming the first time you get set up, but it gets easier with practice.
62+
If you get stuck at any point, please reach out for help on the [ggplot2-dev](https://groups.google.com/forum/#!forum/ggplot2-dev) mailing list.
5263

5364
If you're not familiar with git or github, please start by reading <http://r-pkgs.had.co.nz/git.html>
5465

@@ -68,15 +79,15 @@ See http://docs.ggplot2.org/dev/vignettes/development.html for more details.
6879

6980
Pull requests will be evaluated against a seven point checklist:
7081

71-
1. __Motivation__. Your pull request should clearly and concisely motivates the
72-
need for change. Unfortunately neither Winston nor I have much time to
73-
work on ggplot2 these days, so you need to describe the problem and show
74-
how your pull request solves it as concisely as possible.
82+
1. __Motivation__. Your pull request should clearly and concisely motivate the
83+
need for change. Unfortunately neither Winston nor I have much time to
84+
work on ggplot2 these days, so you need to describe the problem and show
85+
how your pull request solves it as concisely as possible.
7586

76-
Also include this motivation in `NEWS` so that when a new release of
77-
ggplot2 comes out it's easy for users to see what's changed. Add your
78-
item at the top of the file and use markdown for formatting. The
79-
news item should end with `(@yourGithubUsername, #the_issue_number)`.
87+
Also include this motivation in `NEWS` so that when a new release of
88+
ggplot2 comes out it's easy for users to see what's changed. Add your
89+
item at the top of the file and use markdown for formatting. The
90+
news item should end with `(@yourGithubUsername, #the_issue_number)`.
8091

8192
1. __Only related changes__. Before you submit your pull request, please
8293
check to make sure that you haven't accidentally included any unrelated
@@ -89,7 +100,7 @@ Pull requests will be evaluated against a seven point checklist:
89100
and don't submit any others until the first one has been processed.
90101

91102
1. __Use ggplot2 coding style__. Please follow the
92-
[official ggplot2 style](http://adv-r.had.co.nz/Style.html). Maintaining
103+
[official tidyverse style](http://style.tidyverse.org). Maintaining
93104
a consistent style across the whole code base makes it much easier to
94105
jump into the code. If you're modifying existing ggplot2 code that
95106
doesn't follow the style guide, a separate pull request to fix the
@@ -103,17 +114,24 @@ Pull requests will be evaluated against a seven point checklist:
103114
can get with `install_github("klutometis/roxygen")`. This will be
104115
available on CRAN in the near future.
105116

106-
<!--
107117
1. If fixing a bug or adding a new feature to a non-graphical function,
108-
please add a [testthat](https://github.com/hadley/testthat) unit test.
118+
please add a [testthat](https://github.com/r-lib/testthat) unit test.
109119

110120
1. If fixing a bug in the visual output, please add a visual test.
111121
(Instructions to follow soon)
112-
-->
113122

114123
1. If you're adding a new graphical feature, please add a short example
115124
to the appropriate function.
116125

117-
This seems like a lot of work but don't worry if your pull request isn't perfect. It's a learning process and Winston and I will be on hand to help you out. A pull request is a process, and unless you've submitted a few in the past it's unlikely that your pull request will be accepted as is.
118-
119-
Finally, remember that ggplot2 is a mature package used by thousands of people. This means that it's extremely difficult (i.e. impossible) to change any existing functionality without breaking someone's code (or another package on CRAN). Please don't submit pull requests that change existing behaviour. Instead, think about how you can add a new feature in a minimally invasive way.
126+
This seems like a lot of work but don't worry if your pull request isn't perfect.
127+
It's a learning process and members of the ggplot2 team will be on hand to help you
128+
out. A pull request ("PR") is a process, and unless you've submitted a few in the
129+
past it's unlikely that your pull request will be accepted as is. All PRs require
130+
review and approval from at least one member of the ggplot2 development team
131+
before merge.
132+
133+
Finally, remember that ggplot2 is a mature package used by thousands of people.
134+
This means that it's extremely difficult (i.e. impossible) to change any existing
135+
functionality without breaking someone's code (or another package on CRAN).
136+
Please don't submit pull requests that change existing behaviour. Instead,
137+
think about how you can add a new feature in a minimally invasive way.

0 commit comments

Comments
 (0)