[pyosmium] 02/06: Merge tag 'upstream/2.12.2'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit f6013096dd0b2b4f6820ada53d7ee3cf35cfcb2c
Merge: 221dc85 6034e86
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 5 08:59:37 2017 +0200

    Merge tag 'upstream/2.12.2'
    
    Upstream version 2.12.2

 CHANGELOG.md                                   | 23 ++++++++-
 README.md                                      |  3 +-
 appveyor.yml                                   | 54 +++++++++++++++++++++
 examples/use_nodecache.py                      |  2 +-
 lib/generic_writer.hpp                         |  9 ++--
 lib/index.cc                                   | 12 ++++-
 lib/osm.cc                                     | 15 +++---
 lib/osmium.cc                                  | 14 ++++++
 lib/win_boost_fix.hpp                          | 20 ++++++++
 setup.py                                       | 54 +++++++++++++++++----
 {osmium => src/osmium}/__init__.py             |  0
 {osmium => src/osmium}/osm/__init__.py         |  0
 {osmium => src/osmium}/osm/mutable.py          |  0
 {osmium => src/osmium}/replication/__init__.py |  0
 {osmium => src/osmium}/replication/server.py   |  0
 {osmium => src/osmium}/replication/utils.py    |  0
 {osmium => src/osmium}/version.py              |  4 +-
 test/helpers.py                                |  4 +-
 test/test_index.py                             | 11 +++++
 test/test_memberlist.py                        | 44 +++++++++++++++++
 test/test_nodelist.py                          | 65 ++++++++++++++++++++++++++
 test/test_osm.py                               | 10 +++-
 test/test_writer.py                            |  2 +-
 23 files changed, 317 insertions(+), 29 deletions(-)

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