[mapproxy] 02/07: Merge tag 'upstream/1.11.0'

Bas Couwenberg sebastic at debian.org
Mon Nov 20 16:28:15 UTC 2017


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

sebastic pushed a commit to branch master
in repository mapproxy.

commit 12792f63f7e2a24107659563d6858c8a96d11cb6
Merge: 8359042 e3c9905
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Nov 20 16:42:42 2017 +0100

    Merge tag 'upstream/1.11.0'
    
    Upstream version 1.11.0

 .travis.yml                                        |  17 +-
 AUTHORS.txt                                        |   2 +-
 CHANGES.txt                                        |  34 ++
 doc/caches.rst                                     |  59 +-
 doc/conf.py                                        |   4 +-
 doc/configuration.rst                              |  36 +-
 doc/deployment.rst                                 |   6 +-
 doc/install_osgeo4w.rst                            |  13 +-
 doc/mapproxy_util.rst                              |  51 +-
 doc/sources.rst                                    |  31 +-
 mapproxy/__init__.py                               |   1 -
 mapproxy/cache/compact.py                          | 622 ++++++++++++++++-----
 mapproxy/cache/couchdb.py                          |  12 +-
 mapproxy/cache/file.py                             |   8 +-
 mapproxy/cache/geopackage.py                       |   6 +-
 mapproxy/cache/legend.py                           |   1 -
 mapproxy/cache/mbtiles.py                          |   8 +-
 mapproxy/cache/redis.py                            |   2 +-
 mapproxy/cache/renderd.py                          |   1 -
 mapproxy/cache/riak.py                             |  20 +-
 mapproxy/cache/s3.py                               |   4 +-
 mapproxy/cache/sqlite.py                           | 413 --------------
 mapproxy/cache/tile.py                             |   2 -
 mapproxy/client/http.py                            | 187 +++----
 mapproxy/client/wms.py                             |   1 -
 mapproxy/compat/__init__.py                        |   7 +-
 mapproxy/config/config.py                          |   1 -
 mapproxy/config/loader.py                          |  41 +-
 mapproxy/config/validator.py                       |   2 +-
 .../config_template/base_config/full_example.yaml  |  16 +
 mapproxy/image/__init__.py                         |   9 +-
 mapproxy/image/merge.py                            |   1 -
 mapproxy/image/transform.py                        | 234 ++++++--
 mapproxy/layer.py                                  |  31 +-
 mapproxy/multiapp.py                               |   1 -
 mapproxy/request/wms/__init__.py                   |   1 -
 mapproxy/request/wmts.py                           |   2 +-
 mapproxy/script/defrag.py                          | 184 ++++++
 mapproxy/script/export.py                          |   8 +-
 mapproxy/script/util.py                            |  23 +-
 mapproxy/script/wms_capabilities.py                |   6 +-
 mapproxy/seed/cachelock.py                         |   1 -
 mapproxy/seed/cleanup.py                           |   4 +-
 mapproxy/seed/script.py                            |   1 +
 mapproxy/seed/seeder.py                            |   2 +
 mapproxy/service/demo.py                           |  13 +-
 mapproxy/service/template_helper.py                |  22 +-
 mapproxy/service/templates/wms100capabilities.xml  |   2 +-
 mapproxy/service/templates/wms110capabilities.xml  |   2 +-
 mapproxy/service/templates/wms111capabilities.xml  |   2 +-
 mapproxy/service/templates/wms130capabilities.xml  |   2 +-
 mapproxy/service/templates/wmts100capabilities.xml |  10 +
 mapproxy/service/tile.py                           |   2 +-
 mapproxy/service/wms.py                            |  59 +-
 mapproxy/source/__init__.py                        |   5 +-
 mapproxy/source/mapnik.py                          |   4 +-
 mapproxy/source/wms.py                             |  26 +-
 mapproxy/srs.py                                    |  12 +-
 mapproxy/test/image.py                             |   2 +
 mapproxy/test/system/__init__.py                   |   2 +-
 mapproxy/test/system/fixture/layer.yaml            |  11 +-
 mapproxy/test/system/fixture/wms_srs_extent.yaml   |  20 +-
 mapproxy/test/system/test_arcgis.py                |   2 +-
 mapproxy/test/system/test_auth.py                  |   2 +-
 mapproxy/test/system/test_behind_proxy.py          |   2 +-
 mapproxy/test/system/test_cache_band_merge.py      |   1 -
 mapproxy/test/system/test_cache_geopackage.py      |   2 +-
 mapproxy/test/system/test_cache_grid_names.py      |   1 -
 mapproxy/test/system/test_cache_mbtiles.py         |   2 +-
 mapproxy/test/system/test_cache_s3.py              |   2 +-
 mapproxy/test/system/test_cache_source.py          |   1 -
 mapproxy/test/system/test_combined_sources.py      |   2 +-
 mapproxy/test/system/test_coverage.py              |   2 +-
 mapproxy/test/system/test_disable_storage.py       |   1 -
 mapproxy/test/system/test_formats.py               |   2 +-
 mapproxy/test/system/test_kml.py                   |   1 -
 mapproxy/test/system/test_layergroups.py           |   2 +-
 mapproxy/test/system/test_legendgraphic.py         |   2 +-
 mapproxy/test/system/test_mapnik.py                |   2 +-
 mapproxy/test/system/test_mapserver.py             |   2 +-
 mapproxy/test/system/test_mixed_mode_format.py     |   2 +-
 mapproxy/test/system/test_multi_cache_layers.py    |   2 +-
 mapproxy/test/system/test_multiapp.py              |   2 +-
 mapproxy/test/system/test_renderd_client.py        |   1 -
 mapproxy/test/system/test_scalehints.py            |   2 +-
 mapproxy/test/system/test_seed.py                  |   1 -
 mapproxy/test/system/test_seed_only.py             |   2 +-
 mapproxy/test/system/test_sld.py                   |   2 +-
 mapproxy/test/system/test_source_errors.py         |   2 +-
 mapproxy/test/system/test_tilesource_minmax_res.py |   1 -
 mapproxy/test/system/test_tms.py                   |   1 -
 mapproxy/test/system/test_tms_origin.py            |   1 -
 mapproxy/test/system/test_util_conf.py             |   1 -
 mapproxy/test/system/test_util_export.py           |   1 -
 mapproxy/test/system/test_util_grids.py            |   1 -
 mapproxy/test/system/test_util_wms_capabilities.py |   1 -
 mapproxy/test/system/test_watermark.py             |   2 +-
 mapproxy/test/system/test_wms.py                   |  12 +-
 mapproxy/test/system/test_wms_srs_extent.py        |  56 +-
 mapproxy/test/system/test_wms_version.py           |   2 +-
 mapproxy/test/system/test_wmsc.py                  |   2 +-
 mapproxy/test/system/test_wmts.py                  |   9 +-
 mapproxy/test/system/test_wmts_dimensions.py       |   2 +-
 mapproxy/test/system/test_wmts_restful.py          |   5 +-
 mapproxy/test/system/test_xslt_featureinfo.py      |   2 +-
 mapproxy/test/unit/test_cache.py                   |   2 -
 mapproxy/test/unit/test_cache_compact.py           | 197 ++++++-
 mapproxy/test/unit/test_cache_couchdb.py           |   1 -
 mapproxy/test/unit/test_cache_geopackage.py        |   2 +-
 mapproxy/test/unit/test_cache_redis.py             |   1 -
 mapproxy/test/unit/test_cache_riak.py              |   1 -
 mapproxy/test/unit/test_cache_tile.py              |   4 +-
 mapproxy/test/unit/test_client.py                  | 119 ++--
 mapproxy/test/unit/test_client_cgi.py              |   1 -
 mapproxy/test/unit/test_concat_legends.py          |   1 -
 mapproxy/test/unit/test_conf_loader.py             |   6 +-
 mapproxy/test/unit/test_conf_validator.py          |  15 +-
 mapproxy/test/unit/test_config.py                  |   1 -
 mapproxy/test/unit/test_featureinfo.py             |   1 -
 mapproxy/test/unit/test_geom.py                    |   9 +-
 mapproxy/test/unit/test_grid.py                    |   3 +-
 mapproxy/test/unit/test_image.py                   |  91 ++-
 mapproxy/test/unit/test_multiapp.py                |   1 -
 mapproxy/test/unit/test_seed.py                    |   2 +-
 mapproxy/test/unit/test_seed_cachelock.py          |   1 -
 mapproxy/test/unit/test_tiled_source.py            |   1 -
 mapproxy/test/unit/test_utils.py                   |   1 -
 mapproxy/test/unit/test_wms_layer.py               |   2 +-
 mapproxy/util/async.py                             |   1 -
 mapproxy/util/coverage.py                          |   1 -
 mapproxy/util/ext/dictspec/validator.py            |   1 -
 mapproxy/util/ext/serving.py                       | 278 +--------
 mapproxy/util/fs.py                                |  20 +-
 mapproxy/util/geom.py                              |   8 +-
 mapproxy/util/lock.py                              |   1 -
 mapproxy/util/py.py                                |   1 -
 mapproxy/util/yaml.py                              |   2 +-
 mapproxy/wsgiapp.py                                |  10 +-
 release.py                                         |  18 +-
 requirements-tests.txt                             |   1 +
 requirements-travis.txt                            |   3 +-
 setup.py                                           |   9 +-
 142 files changed, 1963 insertions(+), 1312 deletions(-)

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



More information about the Pkg-grass-devel mailing list