[mapproxy] 20/28: Merge tag 'upstream/1.9.0'
Bas Couwenberg
sebastic at debian.org
Wed Jul 27 00:32:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapproxy.
commit ee2104260a707f545dece187921ba53623d8bf25
Merge: c8f44a2 12ab634
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jul 26 19:01:21 2016 +0200
Merge tag 'upstream/1.9.0'
Upstream version 1.9.0
Conflicts:
debian/changelog
debian/compat
debian/control
debian/copyright
debian/patches/series
debian/rules
debian/watch
.gitignore | 17 +
.travis.yml | 43 +
AUTHORS.txt | 32 +
CHANGES.txt | 31 +
Makefile | 40 +
MapProxy.egg-info/PKG-INFO | 227 -
MapProxy.egg-info/SOURCES.txt | 484 ---
MapProxy.egg-info/dependency_links.txt | 1 -
MapProxy.egg-info/entry_points.txt | 14 -
MapProxy.egg-info/namespace_packages.txt | 1 -
MapProxy.egg-info/not-zip-safe | 1 -
MapProxy.egg-info/pbr.json | 1 -
MapProxy.egg-info/requires.txt | 2 -
MapProxy.egg-info/top_level.txt | 1 -
PKG-INFO | 227 -
debian/pyversions | 1 +
doc/Makefile | 6 +
doc/_static/mapproxy.css | 6 -
doc/_templates/layout.html | 22 +
doc/_templates/navbar.html | 20 +-
doc/caches.rst | 4 +-
doc/conf.py | 2 +-
doc/configuration.rst | 49 +-
doc/configuration_examples.rst | 86 +-
doc/deployment.rst | 2 +-
doc/epydoc.ini | 17 +
doc/imgs/labeling.graffle | 4373 ++++++++++++++++++++
doc/make.bat | 113 +
doc/mapproxy_util.rst | 3 +
doc/seed.rst | 12 +-
doc/services.rst | 1 +
doc/sources.rst | 49 +-
doc/test.html | 43 +
doc/tutorial.rst | 174 +-
mapproxy/cache/file.py | 72 +-
mapproxy/cache/mbtiles.py | 45 +-
mapproxy/cache/tile.py | 16 +-
mapproxy/client/arcgis.py | 35 +
mapproxy/compat/image.py | 8 +-
mapproxy/config/loader.py | 245 +-
mapproxy/config/spec.py | 28 +-
mapproxy/config/validator.py | 93 +-
mapproxy/config_template/paster/tmp/.empty | 0
mapproxy/config_template/paster/var/.empty | 0
mapproxy/grid.py | 4 +-
mapproxy/image/__init__.py | 15 +-
mapproxy/image/merge.py | 101 +-
mapproxy/image/opts.py | 15 +
mapproxy/image/transform.py | 15 +-
mapproxy/request/arcgis.py | 125 +
mapproxy/script/export.py | 6 +
mapproxy/script/grids.py | 73 +-
mapproxy/script/util.py | 19 +-
mapproxy/seed/script.py | 2 +-
mapproxy/seed/util.py | 9 +-
mapproxy/service/templates/demo/wmts_demo.html | 3 +-
mapproxy/service/wms.py | 6 +-
mapproxy/service/wmts.py | 7 +-
mapproxy/source/arcgis.py | 26 +
mapproxy/test/http.py | 2 +-
.../1.0/examples/inspireresourcemddataset.xml | 128 -
.../1.0/examples/inspireresourcemdseries.xml | 114 -
.../1.0/examples/inspireresourcemdservice.xml | 91 -
.../WMS_Image2000GetCapabilities_InspireSchema.xml | 271 --
.../inspire/inspire_vs/1.0/examples/wms_at.xml | 358 --
.../inspire_vs/1.0/examples/wms_geoimage.xml | 346 --
mapproxy/test/system/fixture/arcgis.yaml | 39 +
mapproxy/test/system/fixture/cache_band_merge.yaml | 73 +
.../00/000/000/000/000/000/000.png | Bin 0 -> 760 bytes
.../test/system/fixture/multi_cache_layers.yaml | 100 +
mapproxy/test/system/test_arcgis.py | 71 +
mapproxy/test/system/test_cache_band_merge.py | 96 +
mapproxy/test/system/test_multi_cache_layers.py | 151 +
mapproxy/test/system/test_wmts.py | 4 +-
mapproxy/test/unit/test_cache_tile.py | 14 +-
mapproxy/test/unit/test_client.py | 15 +-
mapproxy/test/unit/test_conf_loader.py | 40 +-
mapproxy/test/unit/test_conf_validator.py | 46 +
mapproxy/test/unit/test_geom.py | 19 +
mapproxy/test/unit/test_image.py | 200 +-
mapproxy/test/unit/test_request.py | 19 +
mapproxy/test/unit/test_utils.py | 16 +-
mapproxy/util/ext/dictspec/validator.py | 2 +-
mapproxy/util/ext/odict.py | 2 +-
mapproxy/util/ext/wmsparse/parse.py | 4 +-
mapproxy/util/geom.py | 6 +-
mapproxy/util/ogr.py | 3 +
pylint.ini | 237 ++
release.py | 121 +
requirements-travis.txt | 9 +
setup.cfg | 8 +-
setup.py | 2 +-
tox.ini | 35 +
93 files changed, 7096 insertions(+), 2619 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