[python-osmapi] 01/04: Imported Upstream version 0.7.1
Bas Couwenberg
sebastic at debian.org
Sat Dec 10 17:02:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-osmapi.
commit 7926596d8c93d9dca1bfc5208369b899a1961506
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Dec 10 17:55:46 2016 +0100
Imported Upstream version 0.7.1
---
CHANGELOG.md | 6 +++++-
osmapi/__init__.py | 2 +-
setup.py | 5 +++--
tests/changeset_tests.py | 18 +++++++++---------
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50a6710..541f226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,13 @@
# Change Log
All notable changes to this project will be documented in this file.
-This project follows [Semantic Versioning](http://semver.org/).
+The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project follows [Semantic Versioning](http://semver.org/).
## [Unreleased][unreleased]
+## 0.7.1 - 2016-12-12
+### Changed
+- Catch OSError in setup.py to avoid installation errors
+
## 0.7.0 - 2016-12-07
### Changed
- Replace the old httplib with requests library (thanks a lot [Austin Hartzheim](http://austinhartzheim.me/)!)
diff --git a/osmapi/__init__.py b/osmapi/__init__.py
index 471b807..3b095cc 100644
--- a/osmapi/__init__.py
+++ b/osmapi/__init__.py
@@ -1,5 +1,5 @@
from __future__ import (absolute_import, print_function, unicode_literals)
-__version__ = '0.7.0'
+__version__ = '0.7.1'
from .OsmApi import * # noqa
diff --git a/setup.py b/setup.py
index 19dbba4..7a9296f 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ try:
description = codecs.open('README.md', encoding='utf-8').read()
description = unidecode(description)
description = pypandoc.convert(description, 'rst', format='md')
-except (IOError, ImportError):
+except (IOError, OSError, ImportError):
description = 'Python wrapper for the OSM API'
setup(
@@ -23,7 +23,7 @@ setup(
author='Etienne Chové',
author_email='chove at crans.org',
maintainer='Stefan Oderbolz',
- maintainer_email='odi at readmore.ch',
+ maintainer_email='odi at metaodi.ch',
url='https://github.com/metaodi/osmapi',
download_url='https://github.com/metaodi/osmapi/archive/v%s.zip' % version,
keywords=['openstreetmap', 'osm', 'api'],
@@ -40,5 +40,6 @@ setup(
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
],
)
diff --git a/tests/changeset_tests.py b/tests/changeset_tests.py
index ba19452..c679e56 100644
--- a/tests/changeset_tests.py
+++ b/tests/changeset_tests.py
@@ -92,10 +92,10 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osm version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osm version="0.6" generator="osmapi/0.7.1">\n'
b' <changeset visible="true">\n'
b' <tag k="test" v="foobar"/>\n'
- b' <tag k="created_by" v="osmapi/0.7.0"/>\n'
+ b' <tag k="created_by" v="osmapi/0.7.1"/>\n'
b' </changeset>\n'
b'</osm>\n'
)
@@ -125,7 +125,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osm version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osm version="0.6" generator="osmapi/0.7.1">\n'
b' <changeset visible="true">\n'
b' <tag k="test" v="foobar"/>\n'
b' <tag k="created_by" v="MyTestOSMApp"/>\n'
@@ -163,10 +163,10 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osm version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osm version="0.6" generator="osmapi/0.7.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.7.0"/>\n'
+ b' <tag k="created_by" v="osmapi/0.7.1"/>\n'
b' </changeset>\n'
b'</osm>\n'
)
@@ -190,7 +190,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osm version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osm version="0.6" generator="osmapi/0.7.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'
@@ -276,7 +276,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osmChange version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osmChange version="0.6" generator="osmapi/0.7.1">\n'
b'<create>\n'
b' <node lat="47.123" lon="8.555" visible="true" '
b'changeset="4444">\n'
@@ -350,7 +350,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osmChange version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osmChange version="0.6" generator="osmapi/0.7.1">\n'
b'<modify>\n'
b' <way id="4294967296" version="2" visible="true" '
b'changeset="4444">\n'
@@ -434,7 +434,7 @@ class TestOsmApiChangeset(osmapi_tests.TestOsmApi):
xmltosorteddict(kwargs['data']),
xmltosorteddict(
b'<?xml version="1.0" encoding="UTF-8"?>\n'
- b'<osmChange version="0.6" generator="osmapi/0.7.0">\n'
+ b'<osmChange version="0.6" generator="osmapi/0.7.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
More information about the Pkg-grass-devel
mailing list