Skip to content

Commit

Permalink
Merge pull request #46 from metaodi/develop
Browse files Browse the repository at this point in the history
Release 0.6.0
  • Loading branch information
metaodi committed May 26, 2015
2 parents 75ed753 + d846f03 commit 3887ec2
Show file tree
Hide file tree
Showing 14 changed files with 429 additions and 46 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ python:
- '2.7'
- '3.2'
- '3.3'
- '3.4'

before_install:
- sudo apt-get update -qq
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ This project follows [Semantic Versioning](http://semver.org/).

## [Unreleased][unreleased]

## 0.6.0 - 2015-05-26
### Added
- SSL support for the API calls (thanks [Austin Hartzheim](http://austinhartzheim.me/)!)
- Run tests on Python 3.4 as well
- A bunch of new *Error classes (see below)
- Dependency to 'Pygments' to enable syntax highlighting for [online documentation](http://osmapi.divshot.io)
- [Contributing guidelines](https://github.com/metaodi/osmapi/blob/master/CONTRIBUTING.md)

### Changed
- Changed generic `Exception` with more specific ones, so a client can catch those and react accordingly (no BC-break!)

## 0.5.0 - 2015-01-03
### Changed
- BC-break: all dates are now parsed as datetime objects
Expand Down
55 changes: 55 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Contributing

If you want to participate in this project, please follow this guidline.

Fork and clone this repository:

```bash
git clone [email protected]:your-username/osmapi.git
```

Install the dependencies using `pip`:

```bash
pip install -r requirements.txt
pip install -r test-requirements.txt
```

Make sure the tests pass:

```bash
nosetests --verbose
```

You can even run the tests on different versions of Python with `tox`:

```bash
tox
```

To ensure a good quality of the code use `flake8` to check the code style:

```bash
flake8 --install-hook
```

## Create a pull request

1. Choose the `develop` branch as a target for new/changed functionality, `master` should only be targeted for urgent bugfixes.
2. While it's not strictly required, it's highly recommended to create a new branch on your fork for each pull request.
3. Push to your fork and [submit a pull request][pr].
4. Check if the [build ran successfully][ci] and try to improve your code if not.

At this point you're waiting for my review.
I might suggest some changes or improvements or alternatives.

Some things that will increase the chance that your pull request is accepted:

* Write tests.
* Follow the Python style guide ([PEP-8][pep8]).
* Write a [good commit message][commit].

[pr]: https://github.com/metaodi/osmapi/compare/
[ci]: https://travis-ci.org/metaodi/osmapi
[pep8]: https://www.python.org/dev/peps/pep-0008/
[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
Loading

0 comments on commit 3887ec2

Please sign in to comment.