Skip to content

Commit

Permalink
Merge pull request #126 from metaodi/develop
Browse files Browse the repository at this point in the history
Release 2.0.2
  • Loading branch information
metaodi authored Nov 24, 2021
2 parents 2426c04 + ea4924e commit 7ca89db
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 14 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

## [2.0.1] - 2021-11-23
## [2.0.2] - 2021-11-24
### Changed
- Set `long_description` format to markdown

## [2.0.1] - 2021-11-24
### Added
- Add Makefile for all common tasks

Expand Down Expand Up @@ -295,7 +299,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- `Fixed` for any bug fixes.
- `Security` to invite users to upgrade in case of vulnerabilities.

[Unreleased]: https://github.com/metaodi/osmapi/compare/v2.0.1...HEAD
[Unreleased]: https://github.com/metaodi/osmapi/compare/v2.0.2...HEAD
[2.0.2]: https://github.com/metaodi/osmapi/compare/v2.0.1...v2.0.2
[2.0.1]: https://github.com/metaodi/osmapi/compare/v2.0.0...v2.0.1
[2.0.0]: https://github.com/metaodi/osmapi/compare/v1.3.0...v2.0.0
[1.3.0]: https://github.com/metaodi/osmapi/compare/v1.2.2...v1.3.0
Expand Down
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
osmapi.metaodi.ch
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The documentation is generated using `pdoc` and can be [viewed online](http://os

The build the documentation locally, you can use

pdoc -o . osmapi # create HTML files
make docs

This project uses GitHub Pages to publish its documentation.
To update the online documentation, you need to re-generate the documentation with the above command and update the `gh-pages` branch of this repository.
Expand Down Expand Up @@ -85,7 +85,7 @@ After that, it is recommended to install the `flake8` pre-commit-hook:

To run the tests use the following command:

pytest
make test

## Release

Expand Down
2 changes: 1 addition & 1 deletion osmapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '2.0.1'
__version__ = '2.0.2'

from .OsmApi import * # noqa
from .errors import * # noqa
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
install_requires=['requests'],
description='Python wrapper for the OSM API',
long_description=long_description,
long_description_content_type='text/markdown',
author='Etienne Chové',
author_email='[email protected]',
maintainer='Stefan Oderbolz',
Expand Down
18 changes: 9 additions & 9 deletions tests/changeset_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ def test_ChangesetUpdate(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osm version="0.6" generator="osmapi/2.0.1">\n'
b'<osm version="0.6" generator="osmapi/2.0.2">\n'
b' <changeset visible="true">\n'
b' <tag k="test" v="foobar"/>\n'
b' <tag k="created_by" v="osmapi/2.0.1"/>\n'
b' <tag k="created_by" v="osmapi/2.0.2"/>\n'
b' </changeset>\n'
b'</osm>\n'
)
Expand Down Expand Up @@ -125,7 +125,7 @@ def test_ChangesetUpdate_with_created_by(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osm version="0.6" generator="osmapi/2.0.1">\n'
b'<osm version="0.6" generator="osmapi/2.0.2">\n'
b' <changeset visible="true">\n'
b' <tag k="test" v="foobar"/>\n'
b' <tag k="created_by" v="MyTestOSMApp"/>\n'
Expand Down Expand Up @@ -163,10 +163,10 @@ def test_ChangesetCreate(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osm version="0.6" generator="osmapi/2.0.1">\n'
b'<osm version="0.6" generator="osmapi/2.0.2">\n'
b' <changeset visible="true">\n'
b' <tag k="foobar" v="A new test changeset"/>\n'
b' <tag k="created_by" v="osmapi/2.0.1"/>\n'
b' <tag k="created_by" v="osmapi/2.0.2"/>\n'
b' </changeset>\n'
b'</osm>\n'
)
Expand All @@ -190,7 +190,7 @@ def test_ChangesetCreate_with_created_by(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osm version="0.6" generator="osmapi/2.0.1">\n'
b'<osm version="0.6" generator="osmapi/2.0.2">\n'
b' <changeset visible="true">\n'
b' <tag k="foobar" v="A new test changeset"/>\n'
b' <tag k="created_by" v="CoolTestApp"/>\n'
Expand Down Expand Up @@ -280,7 +280,7 @@ def test_ChangesetUpload_create_node(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osmChange version="0.6" generator="osmapi/2.0.1">\n'
b'<osmChange version="0.6" generator="osmapi/2.0.2">\n'
b'<create>\n'
b' <node lat="47.123" lon="8.555" visible="true" '
b'changeset="4444">\n'
Expand Down Expand Up @@ -356,7 +356,7 @@ def test_ChangesetUpload_modify_way(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osmChange version="0.6" generator="osmapi/2.0.1">\n'
b'<osmChange version="0.6" generator="osmapi/2.0.2">\n'
b'<modify>\n'
b' <way id="4294967296" version="2" visible="true" '
b'changeset="4444">\n'
Expand Down Expand Up @@ -442,7 +442,7 @@ def test_ChangesetUpload_delete_relation(self):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
b'<osmChange version="0.6" generator="osmapi/2.0.1">\n'
b'<osmChange version="0.6" generator="osmapi/2.0.2">\n'
b'<delete>\n'
b' <relation id="676" version="2" visible="true" '
b'changeset="4444">\n'
Expand Down

0 comments on commit 7ca89db

Please sign in to comment.