Merge pull request #100 from metaodi/develop

Release 1.2.2
metaodi · Nov 7, 2018 · ced86e9 · ced86e9
2 parents 00b2736 + 6d013d6
commit ced86e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,10 +26,9 @@ after_success: coveralls
 
 deploy:
   - provider: pypi
-    twine_version: 1.12.1
     user: odi
     password:
-      secure: MU3ZQ4rcpsXo0xIYSWXBfaKTAPn1IrL7AEcH231sseFV1RVmdC96Sfmtc2llvD9Eoc0KJpdW0Vy50azNqAMJwXCt/q3gagfao1PTnAEbklU+g1s2PTqW401E95Qm6w192WzWk/q0dy3SJwxEQt023QR78K+nEcYaCdLWDHjR2hY=
+      secure: "EfW0Fje7pn/iLv2+eiFGc/PwD2jcdfF5Df9uUKWTCRP8wqMrFriErTczlWqfEIARZDnxQXU5c+UWEQvZ/5D5/4ZctJyvMcmgYi7I1ECXVwYQh0c5prsFl+9uynNJQWfW404v5Kb3MJE1iGaSEOeonObeqThQGdtDTPYZd9H4j20="
     on:
       tags: true
       all_branches: true

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]
 
+## 1.2.2 - 2018-11-05
+### Fixed
+- Update PyPI password for deployment
+
 ## 1.2.1 - 2018-11-05
 ### Fixed
 - Deployment to PyPI with Travis

diff --git a/osmapi/__init__.py b/osmapi/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import (absolute_import, print_function, unicode_literals)
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 
 from .OsmApi import *  # noqa
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/1.2.1">\n'
+                b'<osm version="0.6" generator="osmapi/1.2.2">\n'
                 b'  <changeset visible="true">\n'
                 b'    <tag k="test" v="foobar"/>\n'
-                b'    <tag k="created_by" v="osmapi/1.2.1"/>\n'
+                b'    <tag k="created_by" v="osmapi/1.2.2"/>\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/1.2.1">\n'
+                b'<osm version="0.6" generator="osmapi/1.2.2">\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/1.2.1">\n'
+                b'<osm version="0.6" generator="osmapi/1.2.2">\n'
                 b'  <changeset visible="true">\n'
                 b'    <tag k="foobar" v="A new test changeset"/>\n'
-                b'    <tag k="created_by" v="osmapi/1.2.1"/>\n'
+                b'    <tag k="created_by" v="osmapi/1.2.2"/>\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/1.2.1">\n'
+                b'<osm version="0.6" generator="osmapi/1.2.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'
@@ -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/1.2.1">\n'
+                b'<osmChange version="0.6" generator="osmapi/1.2.2">\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/1.2.1">\n'
+                b'<osmChange version="0.6" generator="osmapi/1.2.2">\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/1.2.1">\n'
+                b'<osmChange version="0.6" generator="osmapi/1.2.2">\n'
                 b'<delete>\n'
                 b'  <relation id="676" version="2" visible="true" '
                 b'changeset="4444">\n'