Skip to content

Commit

Permalink
Merge pull request #87 from Chicago/dev
Browse files Browse the repository at this point in the history
Promoting stable version of 1.7.2 to master
  • Loading branch information
tomschenkjr committed Mar 8, 2016
2 parents 0a1d7fa + 2a286b3 commit 4d0d9b3
Show file tree
Hide file tree
Showing 8 changed files with 531 additions and 418 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ RSocrata.Rcheck
^\.travis\.yml$
appveyor.yml
CONTRIBUTING.md
NEWS.md
NEWS.md
^travis-tool\.sh$
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ When you want to make a change, either to fix a bug or introduce a new feature,
* Create a branch or fork of the project based off of the `dev` branch.
* Make commits of logical units
* Add unit tests for any new features
* Iterate either version or build number in the `DESCRIPTION` file:
* The version number follows the `x.y.z-build` format and increments based on [semantic versioning 2.0.0](http://semver.org/spec/v2.0.0.html). Please update versions corresponding to those guidelines.
* If your contribution takes several commits, please increment the build number (e.g., x.y.z-build) so there is a unique relationship of the version-build number to each commit.
* Run all tests in `tests/testthat/`
* Create a pull request with a robust description or [reference the issue number](https://github.com/Chicago/RSocrata/issues)
* Create a pull request with a robust description or [reference the issue number](https://github.com/Chicago/RSocrata/issues)
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Description: Provides easier interaction with
format and manages throttling by 'Socrata'.
Users can upload data to Socrata portals directly
from R.
Version: 1.7.0-14
Date: 2016-02-11
Version: 1.7.2-2
Date: 2016-02-25
Author: Hugh Devlin, Ph. D., Tom Schenk, Jr., and John Malc
Maintainer: "Tom Schenk Jr." <developers@cityofchicago.org>
Depends:
Expand All @@ -27,4 +27,4 @@ Suggests:
License: MIT + file LICENSE
URL: https://github.com/Chicago/RSocrata
BugReports: https://github.com/Chicago/RSocrata/issues
RoxygenNote: 5.0.1
RoxygenNote: 5.0.1
Loading

0 comments on commit 4d0d9b3

Please sign in to comment.