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

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

commit 7e0925ce580d6d8b343e1180635891fc16e6f240
Merge: 973c69d 79d3466
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Aug 25 22:25:13 2015 +0200

    Merge tag 'upstream/0.0_20150817-da1d9dd'
    
    Upstream version 0.0~20150817-da1d9dd

 bootstrap.sh                                       |    2 +-
 mapnik/__init__.py                                 |  183 +--
 mapnik/mapnik_settings.py                          |    1 +
 mapnik/printing.py                                 |  955 +++++++++------
 setup.py                                           |  232 ++--
 src/mapnik_color.cpp                               |    2 +
 src/mapnik_coord.cpp                               |    2 +
 src/mapnik_datasource.cpp                          |    2 +
 src/mapnik_datasource_cache.cpp                    |    2 +
 src/mapnik_envelope.cpp                            |    2 +
 src/mapnik_expression.cpp                          |    2 +
 src/mapnik_feature.cpp                             |    2 +
 src/mapnik_featureset.cpp                          |    2 +
 src/mapnik_font_engine.cpp                         |    2 +
 src/mapnik_fontset.cpp                             |    2 +
 src/mapnik_gamma_method.cpp                        |    2 +
 src/mapnik_geometry.cpp                            |    2 +
 src/mapnik_grid.cpp                                |    2 +
 src/mapnik_grid_view.cpp                           |    2 +
 src/mapnik_image.cpp                               |    4 +-
 src/mapnik_image_view.cpp                          |    2 +
 src/mapnik_label_collision_detector.cpp            |    2 +
 src/mapnik_layer.cpp                               |    2 +
 src/mapnik_logger.cpp                              |    2 +
 src/mapnik_map.cpp                                 |    2 +
 src/mapnik_palette.cpp                             |    2 +
 src/mapnik_parameters.cpp                          |    4 +-
 src/mapnik_proj_transform.cpp                      |    2 +
 src/mapnik_projection.cpp                          |    2 +
 src/mapnik_python.cpp                              |    2 +
 src/mapnik_query.cpp                               |    2 +
 src/mapnik_raster_colorizer.cpp                    |    2 +
 src/mapnik_rule.cpp                                |    2 +
 src/mapnik_scaling_method.cpp                      |    2 +
 src/mapnik_style.cpp                               |    2 +
 src/mapnik_symbolizer.cpp                          |    2 +
 src/mapnik_text_placement.cpp                      |    2 +
 src/mapnik_view_transform.cpp                      |    2 +
 src/python_grid_utils.cpp                          |   15 +-
 src/python_to_value.hpp                            |    3 +
 .../agg_rasterizer_integer_overflow_test.py        |  133 +-
 test/python_tests/box2d_test.py                    |   82 +-
 test/python_tests/buffer_clear_test.py             |   40 +-
 test/python_tests/cairo_test.py                    |  213 ++--
 test/python_tests/color_test.py                    |   26 +-
 test/python_tests/compare_test.py                  |  130 +-
 test/python_tests/compositing_test.py              |  238 ++--
 test/python_tests/copy_test.py                     |  115 +-
 test/python_tests/csv_test.py                      |  656 +++++-----
 test/python_tests/datasource_test.py               |   99 +-
 test/python_tests/datasource_xml_template_test.py  |   12 +-
 test/python_tests/extra_map_props_test.py          |   76 +-
 test/python_tests/feature_id_test.py               |   38 +-
 test/python_tests/feature_test.py                  |   82 +-
 test/python_tests/filter_test.py                   |  397 +++---
 test/python_tests/fontset_test.py                  |   18 +-
 test/python_tests/geojson_plugin_test.py           |   73 +-
 test/python_tests/geometry_io_test.py              |  277 +++--
 test/python_tests/grayscale_test.py                |   13 +-
 test/python_tests/image_encoding_speed_test.py     |   47 +-
 test/python_tests/image_filters_test.py            |   38 +-
 test/python_tests/image_test.py                    |  381 +++---
 test/python_tests/image_tiff_test.py               |  397 +++---
 test/python_tests/introspection_test.py            |   26 +-
 test/python_tests/json_feature_properties_test.py  |  156 +--
 test/python_tests/layer_buffer_size_test.py        |   31 +-
 test/python_tests/layer_modification_test.py       |   36 +-
 test/python_tests/layer_test.py                    |   37 +-
 test/python_tests/load_map_test.py                 |   61 +-
 test/python_tests/map_query_test.py                |   90 +-
 test/python_tests/mapnik_logger_test.py            |   17 +-
 test/python_tests/mapnik_test_data_test.py         |   53 +-
 .../python_tests/markers_complex_rendering_test.py |   44 +-
 test/python_tests/memory_datasource_test.py        |   19 +-
 test/python_tests/multi_tile_raster_test.py        |   62 +-
 test/python_tests/object_test.py                   |    3 +-
 test/python_tests/ogr_and_shape_geometries_test.py |   34 +-
 test/python_tests/ogr_test.py                      |  245 +++-
 test/python_tests/osm_test.py                      |   43 +-
 test/python_tests/palette_test.py                  |   62 +-
 test/python_tests/parameters_test.py               |   62 +-
 test/python_tests/pgraster_test.py                 | 1291 +++++++++++---------
 test/python_tests/pickling_test.py                 |   19 +-
 test/python_tests/png_encoding_test.py             |  172 +--
 test/python_tests/pngsuite_test.py                 |   18 +-
 test/python_tests/postgis_test.py                  | 1149 +++++++++--------
 test/python_tests/projection_test.py               |  111 +-
 test/python_tests/python_plugin_test.py            |    2 +-
 test/python_tests/query_test.py                    |   17 +-
 test/python_tests/query_tolerance_test.py          |   25 +-
 test/python_tests/raster_colorizer_test.py         |  125 +-
 test/python_tests/raster_symbolizer_test.py        |  134 +-
 test/python_tests/rasterlite_test.py               |   26 +-
 test/python_tests/render_grid_test.py              |  941 +++++++++++---
 test/python_tests/render_test.py                   |  222 ++--
 test/python_tests/reprojection_test.py             |   93 +-
 test/python_tests/save_map_test.py                 |   47 +-
 test/python_tests/shapefile_test.py                |  112 +-
 test/python_tests/shapeindex_test.py               |   67 +-
 test/python_tests/sqlite_rtree_test.py             |  110 +-
 test/python_tests/sqlite_test.py                   |  841 +++++++++----
 test/python_tests/style_test.py                    |   19 +-
 test/python_tests/topojson_plugin_test.py          |   54 +-
 test/python_tests/utilities.py                     |   63 +-
 test/python_tests/webp_encoding_test.py            |  131 +-
 test/run_tests.py                                  |   61 +-
 test/visual.py                                     |  203 +--
 107 files changed, 7458 insertions(+), 4718 deletions(-)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to