[python-mapnik] 02/06: Merge tag 'upstream/0.0_20160726-1c4a51d'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-mapnik.

commit c1054ac41ce5bfe1aca2faf471b3d96f1d74c295
Merge: f3ed043 742dc3e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 5 15:42:14 2016 +0200

    Merge tag 'upstream/0.0_20160726-1c4a51d'
    
    Upstream version 0.0~20160726-1c4a51d

 .travis.yml                                        | 42 +++++++++++++++-------
 bootstrap.sh                                       | 30 +++++++---------
 mapnik/__init__.py                                 | 39 ++++++++++----------
 scripts/setup_mason.sh                             | 27 ++++++++++++++
 setup.py                                           | 11 +++---
 src/mapnik_featureset.cpp                          | 37 ++++---------------
 test/python_tests/csv_test.py                      | 36 +++++++++----------
 test/python_tests/datasource_test.py               | 16 ++++-----
 test/python_tests/feature_id_test.py               |  2 +-
 test/python_tests/geojson_plugin_test.py           | 12 +++----
 .../python_tests/markers_complex_rendering_test.py |  4 +--
 test/python_tests/memory_datasource_test.py        |  4 +--
 test/python_tests/ogr_and_shape_geometries_test.py |  2 +-
 test/python_tests/ogr_test.py                      |  2 +-
 test/python_tests/pickling_test.py                 | 30 +++++++---------
 test/python_tests/query_tolerance_test.py          | 12 +++----
 test/python_tests/raster_symbolizer_test.py        | 10 +++---
 test/python_tests/render_test.py                   |  2 +-
 test/python_tests/shapefile_test.py                | 14 ++++----
 test/python_tests/sqlite_rtree_test.py             |  6 ++--
 test/python_tests/sqlite_test.py                   | 12 +++----
 test/python_tests/topojson_plugin_test.py          |  6 ++--
 22 files changed, 184 insertions(+), 172 deletions(-)

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