[python-osmapi] 01/02: Merge tag 'debian/0.7.1-1' into jessie-backports

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository python-osmapi.

commit 29a343ef37cc7f398219fa652af88bcdf1078357
Merge: 7b1312c 7e9b3e5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 21 18:35:11 2016 +0100

    Merge tag 'debian/0.7.1-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 .travis.yml                                        |   4 +-
 CHANGELOG.md                                       |  12 +-
 README.md                                          |   2 +-
 build.sh                                           |   2 +-
 debian/changelog                                   |  23 +++
 debian/control                                     |   6 +-
 debian/copyright                                   |   1 +
 debian/rules                                       |   4 -
 debian/watch                                       |   4 +-
 osmapi/OsmApi.py                                   | 164 +++++++++---------
 osmapi/__init__.py                                 |   2 +-
 requirements.txt                                   |   1 +
 setup.py                                           |   5 +-
 test-requirements.txt                              |   3 +-
 tests/capabilities_test.py                         |   5 +-
 tests/changeset_tests.py                           | 187 ++++++++++++---------
 .../test_ChangesetDownloadContainingUnicode.xml    |  17 ++
 tests/helper_tests.py                              |  68 ++++----
 tests/node_tests.py                                |  88 +++++-----
 tests/notes_tests.py                               |  52 +++---
 tests/osmapi_tests.py                              |  33 ++--
 tests/relation_tests.py                            |  65 ++++---
 tests/way_tests.py                                 |  65 +++----
 23 files changed, 437 insertions(+), 376 deletions(-)

diff --cc debian/changelog
index dc8edf1,ef38113..b6df9e9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,32 @@@
+ python-osmapi (0.7.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 10 Dec 2016 17:56:51 +0100
+ 
+ python-osmapi (0.7.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Add python{,3}-requests to build dependencies.
+   * Add test_ChangesetDownloadContainingUnicode.xml to ODbL licensed files.
+   * Update filenamemangle in watch file to handle other tar extensions.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 07 Dec 2016 19:25:06 +0100
+ 
+ python-osmapi (0.6.2-2) unstable; urgency=medium
+ 
+   * Update Vcs-Git URL to use HTTPS.
+   * Don't run flake8 in test taget, causes FTBFS.
+   * Bump Standards-Version to 3.9.8, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 May 2016 19:06:02 +0200
+ 
 +python-osmapi (0.6.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 11 Jan 2016 19:11:25 +0100
 +
  python-osmapi (0.6.2-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 7b3153c,0f73667..d45f308
--- a/debian/control
+++ b/debian/control
@@@ -16,11 -16,13 +16,13 @@@ Build-Depends: debhelper (>= 9)
                 python3-nose,
                 python-mock,
                 python3-mock,
+                python-requests,
+                python3-requests,
                 python-tox,
                 python-xmltodict
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/python-osmapi.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/python-osmapi.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/python-osmapi.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/python-osmapi.git -b jessie-backports
  Homepage: https://wiki.openstreetmap.org/wiki/Osmapi
  
  Package: python-osmapi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-osmapi.git