Skip to content

Commit

Permalink
the usual after cran submission commits
Browse files Browse the repository at this point in the history
  • Loading branch information
dleutnant committed Mar 18, 2019
1 parent 824f896 commit 491ef5d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 22 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
^CRAN-RELEASE$
^.*\.Rproj$
^\.Rproj\.user$
^cran-comments\.md$
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# swmmr 0.9.0.9000

# swmmr 0.9.0

## Breaking changes
Expand Down
4 changes: 1 addition & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ ggplot() +
```

## Contributions
This Git repository uses the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model (the [`git flow`](https://github.com/petervanderdoes/gitflow-avh) extension is useful for this). The [`dev`](https://github.com/dleutnant/swmmr/tree/dev) branch contains the latest contributions and other code that will appear in the next release, and the [`master`](https://github.com/dleutnant/swmmr) branch contains the code of the latest release, which is exactly what is currently on [CRAN](https://cran.r-project.org/package=swmmr).

Contributing to this package is easy. Just send a [pull request](https://help.github.com/articles/using-pull-requests/). When you send your PR, make sure `dev` is the destination branch on the [swmmr repository](https://github.com/dleutnant/swmmr). Your PR should pass `R CMD check --as-cran`, which will also be checked by <a href="https://travis-ci.org/dleutnant/swmmr">Travis CI</a> when the PR is submitted.
With the release of `swmmr` 0.9.0, the latest contributions and other code that will appear in the next CRAN release is contained in the [`master`](https://github.com/dleutnant/swmmr) branch. Thus, contributing to this package is easy. Just send a simple [pull request](https://help.github.com/articles/using-pull-requests/). Your PR should pass `R CMD check --as-cran`, which will also be checked by <a href="https://travis-ci.org/dleutnant/swmmr">Travis CI</a> when the PR is submitted.

## Code of condcut
Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms.
Expand Down
25 changes: 6 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ inp_path <- system.file("extdata", "Example1.inp", package = "swmmr", mustWork =

# glance model structure, the result is a list of data.frames with SWMM sections
inp <- read_inp(x = inp_path)
#> Warning: Expected 6 pieces. Additional pieces discarded in 13 rows [1, 2,
#> 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13].
#> Warning: Expected 9 pieces. Additional pieces discarded in 13 rows [1, 2,
#> 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13].

# show swmm model summary
summary(inp)
Expand Down Expand Up @@ -255,21 +251,12 @@ ggplot() +

## Contributions

This Git repository uses the [Git
Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching
model (the [`git flow`](https://github.com/petervanderdoes/gitflow-avh)
extension is useful for this). The
[`dev`](https://github.com/dleutnant/swmmr/tree/dev) branch contains the
latest contributions and other code that will appear in the next
release, and the [`master`](https://github.com/dleutnant/swmmr) branch
contains the code of the latest release, which is exactly what is
currently on [CRAN](https://cran.r-project.org/package=swmmr).

Contributing to this package is easy. Just send a [pull
request](https://help.github.com/articles/using-pull-requests/). When
you send your PR, make sure `dev` is the destination branch on the
[swmmr repository](https://github.com/dleutnant/swmmr). Your PR should
pass `R CMD check --as-cran`, which will also be checked by
With the release of `swmmr` 0.9.0, the latest contributions and other
code that will appear in the next CRAN release is contained in the
[`master`](https://github.com/dleutnant/swmmr) branch. Thus,
contributing to this package is easy. Just send a simple [pull
request](https://help.github.com/articles/using-pull-requests/). Your PR
should pass `R CMD check --as-cran`, which will also be checked by
<a href="https://travis-ci.org/dleutnant/swmmr">Travis CI</a> when the
PR is submitted.

Expand Down

0 comments on commit 491ef5d

Please sign in to comment.