This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-osmapi.
commit 31448f70db3fbab248e8a377885c792375b00db7
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Jan 6 07:22:35 2016 +0100
Imported Upstream version 0.6.2
---
.travis.yml | 3 ++-
CHANGELOG.md | 5 ++++
README.md | 67 +++++++++++++++++++++++++-----------------------
osmapi/__init__.py | 2 +-
tests/changeset_tests.py | 18 ++++++-------
5 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 03cc72c..c421c7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ deploy:
password:
secure:
MU3ZQ4rcpsXo0xIYSWXBfaKTAPn1IrL7AEcH231sseFV1RVmdC96Sfmtc2llvD9Eoc0KJpdW0Vy50azNqAMJwXCt/q3gagfao1PTnAEbklU+g1s2PTqW401E95Qm6w192WzWk/q0dy3SJwxEQt023QR78K+nEcYaCdLWDHjR2hY=
on:
- branch: master
+ tags: true
+ all_branches: true
python: 2.7
repo: metaodi/osmapi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b8df08..aabbeb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ This project follows [Semantic Versioning](http://semver.org/).
## [Unreleased][unreleased]
+## 0.6.2 - 2016-01-04
+### Changed
+- Re-arranged README
+- Make sure PyPI releases are only created when a release has been tagged on
GitHub
+
## 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
diff --git a/README.md b/README.md
index 3208b63..8ae6152 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
osmapi
======
-[](https://travis-ci.org/metaodi/osmapi)
-[](https://coveralls.io/r/metaodi/osmapi?branch=develop)
-[](http://badge.fury.io/py/osmapi)
-[](https://pypi.python.org/pypi/osmapi/)
-[](https://pypi.python.org/pypi/osmapi/)
+[](https://travis-ci.org/metaodi/osmapi)
+[](https://coveralls.io/r/metaodi/osmapi?branch=develop)
+[](https://pypi.python.org/pypi/osmapi/)
+[](https://pypi.python.org/pypi/osmapi/)
+[](https://github.com/metaodi/osmapi/blob/master/LICENSE.txt)
Python wrapper for the OSM API
@@ -15,33 +15,6 @@ Install `osmapi` simply by using pip:
pip install osmapi
-### Development
-
-If you want to help with the development of `osmapi`, you should clone this
repository and install the requirements:
-
- pip install -r requirements.txt
- pip install -r test-requirements.txt
-
-After that, it is recommended to install the `flake8` pre-commit-hook:
-
- flake8 --install-hook
-
-### Tests
-
-To run the tests use the following command:
-
- nosetests --verbose
-
-By using tox you can even run the tests against different versions of python
(2.6, 2.7, 3.2 and 3.3):
-
- tox
-
-## Note
-
-Scripted imports and automated edits should only be carried out by those with
experience and understanding of the way the OpenStreetMap community creates
maps, and only with careful **planning** and **consultation** with the local
community.
-
-See the
[Import/Guidelines](http://wiki.openstreetmap.org/wiki/Import/Guidelines) and
[Automated Edits/Code of
Conduct](http://wiki.openstreetmap.org/wiki/Automated_Edits/Code_of_Conduct)
for more information.
-
## Documentation
The documentation is generated using `pdoc` and can be [viewed
online](http://osmapi.metaodi.ch).
@@ -50,6 +23,9 @@ The build the documentation locally, you can use
pdoc --html osmapi.OsmApi # create HTML file
+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.
+
## Examples
### Read from OpenStreetMap
@@ -87,6 +63,33 @@ print api.NodeCreate({u"lon":1, u"lat":1, u"tag": {}})
api.ChangesetClose()
```
+## Note
+
+Scripted imports and automated edits should only be carried out by those with
experience and understanding of the way the OpenStreetMap community creates
maps, and only with careful **planning** and **consultation** with the local
community.
+
+See the
[Import/Guidelines](http://wiki.openstreetmap.org/wiki/Import/Guidelines) and
[Automated Edits/Code of
Conduct](http://wiki.openstreetmap.org/wiki/Automated_Edits/Code_of_Conduct)
for more information.
+
+### Development
+
+If you want to help with the development of `osmapi`, you should clone this
repository and install the requirements:
+
+ pip install -r requirements.txt
+ pip install -r test-requirements.txt
+
+After that, it is recommended to install the `flake8` pre-commit-hook:
+
+ flake8 --install-hook
+
+### Tests
+
+To run the tests use the following command:
+
+ nosetests --verbose
+
+By using tox you can even run the tests against different versions of python
(2.6, 2.7, 3.2 and 3.3):
+
+ tox
+
## Attribution
This project was orginally developed by Etienne Chové.
diff --git a/osmapi/__init__.py b/osmapi/__init__.py
index 437078d..98014f2 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.1'
+__version__ = '0.6.2'
from .OsmApi import * # noqa
diff --git a/tests/changeset_tests.py b/tests/changeset_tests.py
index 2d56957..c989f91 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.1">\n'
+ b'<osm version="0.6" generator="osmapi/0.6.2">\n'
b' <changeset visible="true">\n'
b' <tag k="test" v="foobar"/>\n'
- b' <tag k="created_by" v="osmapi/0.6.1"/>\n'
+ b' <tag k="created_by" v="osmapi/0.6.2"/>\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.1">\n'
+ b'<osm version="0.6" generator="osmapi/0.6.2">\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.1">\n'
+ b'<osm version="0.6" generator="osmapi/0.6.2">\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.1"/>\n'
+ b' <tag k="created_by" v="osmapi/0.6.2"/>\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.1">\n'
+ b'<osm version="0.6" generator="osmapi/0.6.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'
@@ -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.1">\n'
+ b'<osmChange version="0.6" generator="osmapi/0.6.2">\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.1">\n'
+ b'<osmChange version="0.6" generator="osmapi/0.6.2">\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.1">\n'
+ b'<osmChange version="0.6" generator="osmapi/0.6.2">\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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
