This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-osmapi.
commit af8673da6608e1c4d2aaf71ae2d3f81a1206124f Author: Bas Couwenberg <[email protected]> Date: Thu Dec 22 07:16:24 2016 +0100 Imported Upstream version 0.8.0 --- .travis.yml | 1 - CHANGELOG.md | 7 +++++++ build.sh | 4 ++++ osmapi/__init__.py | 2 +- setup.py | 9 +++++++-- test-requirements.txt | 1 + tests/changeset_tests.py | 18 +++++++++--------- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0975efd..8f21d4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: python python: - '2.6' - '2.7' -- '3.2' - '3.3' - '3.4' diff --git a/CHANGELOG.md b/CHANGELOG.md index c6a5918..0e443fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased][unreleased] +## 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 + +## Changed +- Read version from __init__.py instead of importing it in setup.py + ## 0.7.2 - 2016-12-21 ### Fixed - Added 'requests' as a dependency to setup.py to fix installation problems diff --git a/build.sh b/build.sh index d8e53f5..4ba4475 100755 --- a/build.sh +++ b/build.sh @@ -18,3 +18,7 @@ nosetests --verbose --with-coverage if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then pdoc --html --overwrite osmapi/OsmApi.py fi + +# setup a new virtualenv and try to install the lib +virtualenv pyenv +source pyenv/bin/activate && pip install . diff --git a/osmapi/__init__.py b/osmapi/__init__.py index 1f56b43..cdb2f71 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.2' +__version__ = '0.8.0' from .OsmApi import * # noqa diff --git a/setup.py b/setup.py index bbff568..c8e0870 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,15 @@ # -*- coding: utf-8 -*- import codecs +import re from distutils.core import setup -version = __import__('osmapi').__version__ +with open('osmapi/__init__.py', 'r') as fd: + version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', + fd.read(), re.MULTILINE).group(1) + +if not version: + raise RuntimeError('Cannot find version information') try: import pypandoc @@ -39,7 +45,6 @@ setup( 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', ], diff --git a/test-requirements.txt b/test-requirements.txt index bb61993..5a410d0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,3 +8,4 @@ coverage==3.7.1 coveralls==0.4.1 mock==1.0.1 xmltodict==0.9.0 +virtualenv==15.1.0 diff --git a/tests/changeset_tests.py b/tests/changeset_tests.py index dd11029..b78cd25 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.2">\n' + b'<osm version="0.6" generator="osmapi/0.8.0">\n' b' <changeset visible="true">\n' b' <tag k="test" v="foobar"/>\n' - b' <tag k="created_by" v="osmapi/0.7.2"/>\n' + b' <tag k="created_by" v="osmapi/0.8.0"/>\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.2">\n' + b'<osm version="0.6" generator="osmapi/0.8.0">\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.2">\n' + b'<osm version="0.6" generator="osmapi/0.8.0">\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.2"/>\n' + b' <tag k="created_by" v="osmapi/0.8.0"/>\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.2">\n' + b'<osm version="0.6" generator="osmapi/0.8.0">\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.2">\n' + b'<osmChange version="0.6" generator="osmapi/0.8.0">\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.2">\n' + b'<osmChange version="0.6" generator="osmapi/0.8.0">\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.2">\n' + b'<osmChange version="0.6" generator="osmapi/0.8.0">\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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
