This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-osmapi.
commit e9416a1f7ff84664eae5534d20d5daccad88c354 Author: Bas Couwenberg <[email protected]> Date: Wed Jan 6 07:22:26 2016 +0100 Imported Upstream version 0.6.1 --- .travis.yml | 9 --------- CHANGELOG.md | 4 ++++ README.md | 2 +- divshot.json | 7 ------- osmapi/__init__.py | 2 +- test-requirements.txt | 1 + tests/changeset_tests.py | 18 +++++++++--------- 7 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 568e8d6..03cc72c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,12 +32,3 @@ deploy: branch: master python: 2.7 repo: metaodi/osmapi - - provider: divshot - skip_cleanup: true - environment: - develop: development - master: production - on: - python: 2.7 - api_key: - secure: WTpFZfmA9QOPGLp9c+yljSVLk8GijvlMT4FxPX1BlI0cdU0VHHBkKfRk+UW3n8vHBAcaH+1SlbPc+9BWw9oHirtJ5Wc57SNfWS1NHKVB/rUxVCn+GYM6RBN9wJ26St0KNG81VtvajkA41ZP5jkpWVFtbylbctcTmVNagJke7cUE= diff --git a/CHANGELOG.md b/CHANGELOG.md index b07258f..0b8df08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ This project follows [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] +## 0.6.1 - 2016-01-04 +### Changed +- The documentation is now available at a new domain: http://osmapi.metaodi.ch, the previous provider does no longer provide this service + ## 0.6.0 - 2015-05-26 ### Added - SSL support for the API calls (thanks [Austin Hartzheim](http://austinhartzheim.me/)!) diff --git a/README.md b/README.md index ff6aa6a..3208b63 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ See the [Import/Guidelines](http://wiki.openstreetmap.org/wiki/Import/Guidelines ## Documentation -The documentation is generated using `pdoc` and can be [viewed online](http://osmapi.divshot.io/). +The documentation is generated using `pdoc` and can be [viewed online](http://osmapi.metaodi.ch). The build the documentation locally, you can use diff --git a/divshot.json b/divshot.json deleted file mode 100644 index 06e7861..0000000 --- a/divshot.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "osmapi", - "root": ".", - "routes": { - "**": "OsmApi.m.html" - } -} diff --git a/osmapi/__init__.py b/osmapi/__init__.py index ff2f8cf..437078d 100644 --- a/osmapi/__init__.py +++ b/osmapi/__init__.py @@ -1,5 +1,5 @@ from __future__ import (absolute_import, print_function, unicode_literals) -__version__ = '0.6.0' +__version__ = '0.6.1' from .OsmApi import * # noqa diff --git a/test-requirements.txt b/test-requirements.txt index 48ee360..6cebe16 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,7 @@ flake8==2.1.0 nose==1.3.0 tox==1.7.1 +coverage==3.7.1 coveralls==0.4.1 mock==1.0.1 xmltodict==0.9.0 diff --git a/tests/changeset_tests.py b/tests/changeset_tests.py index f191e68..2d56957 100644 --- a/tests/changeset_tests.py +++ b/tests/changeset_tests.py @@ -100,10 +100,10 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osm version="0.6" generator="osmapi/0.6.0">\n' + b'<osm version="0.6" generator="osmapi/0.6.1">\n' b' <changeset visible="true">\n' b' <tag k="test" v="foobar"/>\n' - b' <tag k="created_by" v="osmapi/0.6.0"/>\n' + b' <tag k="created_by" v="osmapi/0.6.1"/>\n' b' </changeset>\n' b'</osm>\n' ) @@ -134,7 +134,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osm version="0.6" generator="osmapi/0.6.0">\n' + b'<osm version="0.6" generator="osmapi/0.6.1">\n' b' <changeset visible="true">\n' b' <tag k="test" v="foobar"/>\n' b' <tag k="created_by" v="MyTestOSMApp"/>\n' @@ -173,10 +173,10 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osm version="0.6" generator="osmapi/0.6.0">\n' + b'<osm version="0.6" generator="osmapi/0.6.1">\n' b' <changeset visible="true">\n' b' <tag k="foobar" v="A new test changeset"/>\n' - b' <tag k="created_by" v="osmapi/0.6.0"/>\n' + b' <tag k="created_by" v="osmapi/0.6.1"/>\n' b' </changeset>\n' b'</osm>\n' ) @@ -201,7 +201,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osm version="0.6" generator="osmapi/0.6.0">\n' + b'<osm version="0.6" generator="osmapi/0.6.1">\n' b' <changeset visible="true">\n' b' <tag k="foobar" v="A new test changeset"/>\n' b' <tag k="created_by" v="CoolTestApp"/>\n' @@ -286,7 +286,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osmChange version="0.6" generator="osmapi/0.6.0">\n' + b'<osmChange version="0.6" generator="osmapi/0.6.1">\n' b'<create>\n' b' <node lat="47.123" lon="8.555" visible="true" ' b'changeset="4444">\n' @@ -360,7 +360,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osmChange version="0.6" generator="osmapi/0.6.0">\n' + b'<osmChange version="0.6" generator="osmapi/0.6.1">\n' b'<modify>\n' b' <way id="4294967296" version="2" visible="true" ' b'changeset="4444">\n' @@ -444,7 +444,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi): xmltosorteddict(sendargs[0]), xmltosorteddict( b'<?xml version="1.0" encoding="UTF-8"?>\n' - b'<osmChange version="0.6" generator="osmapi/0.6.0">\n' + b'<osmChange version="0.6" generator="osmapi/0.6.1">\n' b'<delete>\n' b' <relation id="676" version="2" visible="true" ' b'changeset="4444">\n' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-osmapi.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
