Skip to content

Commit

Permalink
Merge branch 'main' into cancor
Browse files Browse the repository at this point in the history
  • Loading branch information
corybrunson committed May 14, 2021
2 parents a62a258 + e4f5776 commit 97ef37d
Show file tree
Hide file tree
Showing 256 changed files with 7,965 additions and 1,247 deletions.
6 changes: 5 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@

# R project defaults
# R project files
^.*\.Rproj$
^\.Rproj\.user$
LICENSE
CONTRIBUTING.md
CODE_OF_CONDUCT.md

# files and directories in package structure
README.Rmd
Expand All @@ -19,3 +22,4 @@ README.Rmd

# custom files and directories
^sandbox$
^ignore$
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
.Rhistory
.RData

ignore

inst/doc

ignore
11 changes: 11 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, we pledge to respect all people who contribute through opening issues (including questions, bugs, and feature requests), updating documentation, submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience or fluency, contribution history, social status, age, gender identity or expression, sexual orientation, visible or invisible disability, personal appearance, body size, ethnic or racial identity or perception, and cultural or religious background or identity.

Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory or derisive comments, personal attacks, trolling, public or private harassment or insults, or other unprofessional conduct.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues, and other contributions inconsistent with this Code of Conduct. Project maintainers who do not follow this Code of Conduct may be removed from the project team. Instances of behavior inconsistent with this Code of Conduct may be reported by opening an issue or contacting one or more of the project maintainers.

This Code of Conduct is adapted (with changes) from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at https://www.contributor-covenant.org/version/1/0/0/code-of-conduct.html
40 changes: 40 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Contributing to **ordr** development

The goal of this guide is to help contributors to **ordr** plan their contributions and navigate the process. The sections below cover different types of contributions, usually with increasing degrees of proposed change.

Note that **ordr** is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By contributing, you agree to its terms.

This guide was copied from [that of **ggalluvial**](https://github.com/corybrunson/ggalluvial/blob/main/CONTRIBUTING.md), which was loosely adapted from the contributing guides [for **ggplot2**](https://github.com/tidyverse/ggplot2/blob/main/CONTRIBUTING.md) and [from ropensci](https://github.com/ropensci/dotgithubfiles/blob/main/dotgithub/CONTRIBUTING.md).
If you have questions about or suggestions for this guide, please feel free to contact a package maintainer.

## Editor

**Small edits to comments, documentation, and other non-code files** may be made using [the GitHub file editor](https://help.github.com/en/github/managing-files-in-a-repository/editing-files-in-your-repository). To edit **roxygen2** documentation, make changes to a source file `R/<topic>.r`, on a line that begins with `#'`, rather than to a documentation file `man/<topic>.Rd`.

For more guidance on **roxygen2** documentation, see [this chapter](http://r-pkgs.had.co.nz/man.html) in the online book _R packages_.

## Issues

**Questions, possible bugs, feature requests, other open-ended issues** may be raised as [issues on GitHub](https://help.github.com/en/github/managing-your-work-on-github/creating-an-issue). In most cases, the issue should consist of two sections: a description of the issue, and a reproducible example of it. A reproducible example should attach packages, include data, and execute code:

1. Attach all relevant packages at the top of the example.
2. Use as small a data set as you can conveniently get that illustrates the issue. Once you have such a data set, the best way to include it in the example is to re-create it using `data.frame()` or some other constructor function. Another way is as follows:

1. Execute `dput(data)` in R, where `data` is the data set.
2. Copy the output.
3. Paste into the example after the package attachments.

3. Use as few lines or steps of code as feasible to illustrate the issue. Add comments at key steps.

For more guidance on reproducible examples, see [this vignette](https://reprex.tidyverse.org/articles/reprex-dos-and-donts.html) for the **reprex** package.

## Pull requests

**Bug fixes, feature upgrades, and other substantive, self-contained changes** may be contributed via [pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests). Unless previously discussed with a maintainer, please follow these steps:

1. Fork the home repository (`corybrunson/ordr`).
2. Create a new (local) branch on which to make changes. If appropriate, update the documentation on this branch and run functionality checks (e.g. using the **devtools** package).
3. Push this branch to the fork and open a pull request to the home repository.
4. With the maintainer(s), discuss and (if necessary) update the pull request until it is accepted or decided against. _In the latter case, a clear and consistent reason should be provided by the maintainer(s)._

For more guidance on the pull request process, see [the contributing guidelines for **ggplot2**](https://github.com/tidyverse/ggplot2/blob/main/CONTRIBUTING.md).
21 changes: 15 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Authors@R: c(
person("Jason Cory", "Brunson", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0003-3126-9494")),
person("Emily", "Paul", email = "[email protected]",
role = "ctb")
role = "ctb")
)
Description: A unified framework for ordination objects and biplot methods using
tidy principles.
Expand All @@ -28,7 +28,9 @@ Imports:
ca,
MASS,
logisticPCA,
vegan
vegan,
ade4,
nipals
License: GPL-3
Encoding: UTF-8
LazyData: true
Expand All @@ -44,15 +46,14 @@ Suggests:
rmarkdown
RoxygenNote: 7.1.1
Roxygen: list(markdown = TRUE)
Collate:
Collate:
'aaa-.r'
'biplot-geoms.r'
'biplot-gg.r'
'biplot-key.r'
'biplot-stats.r'
'data.r'
'dplyr-verbs.r'
'format.r'
'utils.r'
'ord-accessors.r'
'ord-augmentation.r'
Expand All @@ -62,17 +63,19 @@ Collate:
'fun-lra.r'
'fun-wrap.r'
'geom-isolines.r'
'geom-axis-labels.r'
'geom-axis-text.r'
'geom-axis-ticks.r'
'geom-axis.r'
'geom-intervals.r'
'geom-origin.r'
'geom-path.r'
'geom-point.r'
'geom-polygon.r'
'geom-text-radiate.r'
'geom-text.r'
'geom-unit-circle.r'
'geom-vector.r'
'methods-ade4.r'
'methods-ca.r'
'methods-cmds.r'
'methods-eigen.r'
Expand All @@ -81,17 +84,23 @@ Collate:
'methods-lm.r'
'methods-lpca.r'
'methods-lra.r'
'methods-nipals.r'
'methods-prcomp.r'
'methods-princomp.r'
'methods-svd.r'
'ord-annotation.r'
'ord-format.r'
'ord-plot.r'
'ord-supplementation.r'
'ord-tidiers.r'
'ordinate.r'
'ordr.r'
'plot.r'
'stat-center.r'
'stat-chull.r'
'stat-cone.r'
'stat-ellipse.r'
'stat-matrix.r'
'stat-scale.r'
'stat-spantree.r'
'themes.r'
VignetteBuilder: knitr
Loading

0 comments on commit 97ef37d

Please sign in to comment.