Skip to content

Commit

Permalink
update Github docs
Browse files Browse the repository at this point in the history
  • Loading branch information
ha0ye committed Feb 21, 2019
1 parent 6107744 commit 6f8707f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 10 deletions.
21 changes: 17 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

Thanks for checking out our project! If you haven't already, please check out the [readme](README.md) for general info about this project.

* [Contributor Code of Conduct](CONTRIBUTING.md#contributor-code-of-conduct)
* [For the General Public](CONTRIBUTING.md#for-the-general-public)
* [Weecologists](CONTRIBUTING.md#weecologists)
* [Documentation](CONTRIBUTING.md#documentation)
* [Testing](CONTRIBUTING.md#testing)
* [Building](CONTRIBUTING.md#building)
* [Contributing Data](CONTRIBUTING.md#contributing-data)


## Contributor Code of Conduct
All contributors will be expected to follow our [code of conduct](CODE_OF_CONDUCT.md).

Expand All @@ -12,13 +21,13 @@ If you're not a member of the Weecology lab, we ask that you use one of the foll

2. Fork and create a pull request -- if you have suggested bugfixes or changes. For more info, please check out this Github [guide](https://help.github.com/articles/about-pull-requests/). We ask that you follow our guidelines below on documentation and testing.

### Weecologists
## Weecologists

If you're actively working on this repo, then you should have write access. For anything beyond a minor change to documentation or coding files, please create a branch for any new features or bugfixes and create a pull request when you'd like your work to be merged in.

If you don't have write access and you would like to, please contact @gmyenni for access.

### Documentation
## Documentation

If you are contributing code to this project, you generally don't need any additional packages, since the documentation will be written as comments in the R scripts. If you are also building the package, see the [section below](#building) for more details.

Expand All @@ -39,7 +48,7 @@ newfunc <- function() ...

Note that you can also include links to other functions, math formatting, and more. For more details, see the [chapter on documentation ](http://r-pkgs.had.co.nz/man.html) in Hadley Wickham's book for R packages.

### Testing
## Testing

If you are adding new functionality, please include automated tests to verify that some of the basic functionality is correct.

Expand All @@ -51,7 +60,7 @@ As a general rule, you don't need to test all possible inputs and outputs for a

You can see the existing tests as examples of how to organize your tests, but note that there are several different kinds of `expect_` functions that test for different things. For more details, see the [chapter on testing ](http://r-pkgs.had.co.nz/tests.html) in Hadley Wickham's book for R packages.

### Building
## Building

To fully build the package, including documentation, running-tests, you will need the `roxygen2`, `testthat`, `devtools`, `pkgdown`, and `usethis` R packages.

Expand All @@ -68,3 +77,7 @@ The suggested workflow is:
If you are also prepping the package as a whole, then you will also want to run `devtools::check()` and/or `devtools::check_cran()` to make sure that the package is complete.

For more info, see the [GitHub repo](https://github.com/hadley/devtools) for the `devtools` package.

## Contributing Data

We use a specific data structure that handles community data and optional covariates. For more information, please see the related [vignette](https://weecology.github.io/MATSS-pipeline/articles/data-formats.html).
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ The *MATSS* package is intended to support Macroecological Analysis of Time Seri
* build an analytical pipeline to conduct macroecological analyses on those datasets
* generate reports that collate results and summarize outputs

For more information about the datasets or analyses, please check out the vignettes.
For more information about contributing code, please check out the [Contributing Guide](CONTRIBUTING.md).
## Contributing

For more information about contributing code, datasets, or analyses, please check out the [Contributing Guide](CONTRIBUTING.md).

## Installation

You can install `MATSS` from github with:
You can install the `MATSS` package from github with:

``` r
# install.packages("devtools")
Expand All @@ -26,8 +27,11 @@ devtools::install_github("weecology/MATSS")

{add examples of using the `MATSS` package to get data and/or use the analysis methods}

## Using the pipeline
## Running the Analyses

(to be removed at a later point)
To run the analysis component of this project, you will want to clone or copy the repository, *in addition* to installing the package. (*note that you can also install the package locally from the files*)

Having installed the package, clone or copy the repository and open `analysis/pipeline.R` in an instance of R to ammend or execute the pipeline code.
The file `analysis/pipeline.R` has a full script that generates the Drake plan for the analyses and then runs it. When the code is run, these steps occur in sequence:
(1) R creates a list of objects that need to be created and their dependencies (whether certain outputs depend on other outputs)
(2) R checks the list of objects and code against its database of objects (usually stored in the `.drake` hidden folder). If any objects are out of date (because they are missing or the code / dependencies have changed), then they are queued up to be re-created.
(3) R makes any objects that it needs to, including final reports, such as [LDA report](lda_report.md).

0 comments on commit 6f8707f

Please sign in to comment.