Merge pull request #72 from metaodi/develop

Release 0.8.1
metaodi · Dec 21, 2016 · edb10d6 · edb10d6
2 parents 25992fc + 50dc9f0
commit edb10d6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased][unreleased]
 
+## 0.8.1 - 2016-12-21
+### Fixed
+- Use setuptools instead of distutils in setup.py
+
 ## 0.8.0 - 2016-12-21
 ### Removed
 - This release no longer supports Python 3.2, if you need it, go back to release <= 0.6.2

diff --git a/osmapi/__init__.py b/osmapi/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import (absolute_import, print_function, unicode_literals)
 
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 
 from .OsmApi import *  # noqa
diff --git a/setup.py b/setup.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import codecs
+from codecs import open
+from setuptools import setup
 import re
-from distutils.core import setup
 
 with open('osmapi/__init__.py', 'r') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -14,7 +14,7 @@
 try:
     import pypandoc
     from unidecode import unidecode
-    description = codecs.open('README.md', encoding='utf-8').read()
+    description = open('README.md', encoding='utf-8').read()
     description = unidecode(description)
     description = pypandoc.convert(description, 'rst', format='md')
 except (IOError, OSError, ImportError):

diff --git a/tests/changeset_tests.py b/tests/changeset_tests.py
@@ -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/0.8.0">\n'
+                b'<osm version="0.6" generator="osmapi/0.8.1">\n'
                 b'  <changeset visible="true">\n'
                 b'    <tag k="test" v="foobar"/>\n'
-                b'    <tag k="created_by" v="osmapi/0.8.0"/>\n'
+                b'    <tag k="created_by" v="osmapi/0.8.1"/>\n'
                 b'  </changeset>\n'
                 b'</osm>\n'
             )
@@ -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/0.8.0">\n'
+                b'<osm version="0.6" generator="osmapi/0.8.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 @@ def test_ChangesetCreate(self):
             xmltosorteddict(kwargs['data']),
             xmltosorteddict(
                 b'<?xml version="1.0" encoding="UTF-8"?>\n'
-                b'<osm version="0.6" generator="osmapi/0.8.0">\n'
+                b'<osm version="0.6" generator="osmapi/0.8.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.8.0"/>\n'
+                b'    <tag k="created_by" v="osmapi/0.8.1"/>\n'
                 b'  </changeset>\n'
                 b'</osm>\n'
             )
@@ -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/0.8.0">\n'
+                b'<osm version="0.6" generator="osmapi/0.8.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 @@ 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/0.8.0">\n'
+                b'<osmChange version="0.6" generator="osmapi/0.8.1">\n'
                 b'<create>\n'
                 b'  <node lat="47.123" lon="8.555" visible="true" '
                 b'changeset="4444">\n'
@@ -350,7 +350,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/0.8.0">\n'
+                b'<osmChange version="0.6" generator="osmapi/0.8.1">\n'
                 b'<modify>\n'
                 b'  <way id="4294967296" version="2" visible="true" '
                 b'changeset="4444">\n'
@@ -434,7 +434,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/0.8.0">\n'
+                b'<osmChange version="0.6" generator="osmapi/0.8.1">\n'
                 b'<delete>\n'
                 b'  <relation id="676" version="2" visible="true" '
                 b'changeset="4444">\n'