Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-MapProxy for openSUSE:Factory
checked in at 2024-05-15 21:29:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-MapProxy (Old)
and /work/SRC/openSUSE:Factory/.python-MapProxy.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-MapProxy"
Wed May 15 21:29:37 2024 rev:11 rq:1174288 version:2.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-MapProxy/python-MapProxy.changes
2024-01-03 12:25:19.864229354 +0100
+++
/work/SRC/openSUSE:Factory/.python-MapProxy.new.1880/python-MapProxy.changes
2024-05-15 21:29:53.600751315 +0200
@@ -1,0 +2,17 @@
+Wed May 15 09:18:07 UTC 2024 - ming li <[email protected]>
+
+- Update to 2.0.2:
+ * Revert PR "Fix mixed image format for file, S3 and azureblob
+ caches"
+
+ update to 2.0.1:
+ * Alpine based docker images have been added
+ * Added parameter to change background map source in layer preview
+ * Dependency updates
+ * Rendering issue: Check for existing tile coordinates before
+ using them
+ * Fix mixed image format for file, S3 and azureblob caches
+
+ Remove mapproxy-pr846-nofreetype.patch file
+
+-------------------------------------------------------------------
Old:
----
MapProxy-2.0.0.tar.gz
mapproxy-pr846-nofreetype.patch
New:
----
MapProxy-2.0.2.tar.gz
BETA DEBUG BEGIN:
Old:
Remove mapproxy-pr846-nofreetype.patch file
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-MapProxy.spec ++++++
--- /var/tmp/diff_new_pack.1EOgYa/_old 2024-05-15 21:29:54.456782299 +0200
+++ /var/tmp/diff_new_pack.1EOgYa/_new 2024-05-15 21:29:54.456782299 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-MapProxy
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
%endif
Name: python-MapProxy
-Version: 2.0.0
+Version: 2.0.2
Release: 0
Summary: Proxy for geospatial data
License: Apache-2.0
@@ -35,8 +35,6 @@
Source1:
https://github.com/mapproxy/mapproxy/raw/%{version}/mapproxy/test/system/fixture/cache.gpkg
Source2:
https://github.com/mapproxy/mapproxy/raw/%{version}/mapproxy/test/unit/polygons/polygons.geojson
Source99: python-MapProxy-rpmlintrc
-# PATCH-FIX-UPSTREAM mapproxy-pr846-nofreetype.patch gh#mapproxy/mapproxy#846
-Patch0: mapproxy-pr846-nofreetype.patch
BuildRequires: %{python_module GDAL}
BuildRequires: %{python_module Pillow}
BuildRequires: %{python_module PyYAML >= 3.0}
@@ -74,7 +72,7 @@
Provides: python-mapproxy = %{version}-%{release}
BuildArch: noarch
Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
%python_subpackages
%description
++++++ MapProxy-2.0.0.tar.gz -> MapProxy-2.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/CHANGES.txt
new/MapProxy-2.0.2/CHANGES.txt
--- old/MapProxy-2.0.0/CHANGES.txt 2023-12-19 11:55:45.000000000 +0100
+++ new/MapProxy-2.0.2/CHANGES.txt 2024-01-10 15:18:18.000000000 +0100
@@ -1,6 +1,27 @@
Nightly
~~~~~~~~~~~~~~~~~
+2.0.2 2024-01-10
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Revert PR "Fix mixed image format for file, S3 and azureblob caches"
+
+2.0.1 2024-01-05
+~~~~~~~~~~~~~~~~~
+Improvements:
+
+- Alpine based docker images have been added
+- Added parameter to change background map source in layer preview
+- Dependency updates
+
+Fixes:
+
+- Rendering issue: Check for existing tile coordinates before using them
+- Fix mixed image format for file, S3 and azureblob caches
+
+
2.0.0 2023-12-19
~~~~~~~~~~~~~~~~~
Breaking:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/MapProxy.egg-info/PKG-INFO
new/MapProxy-2.0.2/MapProxy.egg-info/PKG-INFO
--- old/MapProxy-2.0.0/MapProxy.egg-info/PKG-INFO 2023-12-19
12:02:55.000000000 +0100
+++ new/MapProxy-2.0.2/MapProxy.egg-info/PKG-INFO 2024-01-10
15:23:41.000000000 +0100
@@ -1,12 +1,11 @@
Metadata-Version: 2.1
Name: MapProxy
-Version: 2.0.0
+Version: 2.0.2
Summary: An accelerating proxy for tile and web map services
Home-page: https://mapproxy.org
Author: Oliver Tonnhofer
Author-email: [email protected]
License: Apache Software License 2.0
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: OS Independent
@@ -20,6 +19,8 @@
License-File: LICENSE.txt
License-File: COPYING.txt
License-File: AUTHORS.txt
+Requires-Dist: PyYAML>=3.0
+Requires-Dist: Pillow!=2.4.0,!=8.3.0,!=8.3.1
MapProxy is an open source proxy for geospatial data. It caches, accelerates
and transforms data from existing map services and serves any desktop or web
GIS client.
@@ -40,6 +41,27 @@
Nightly
~~~~~~~~~~~~~~~~~
+2.0.2 2024-01-10
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Revert PR "Fix mixed image format for file, S3 and azureblob caches"
+
+2.0.1 2024-01-05
+~~~~~~~~~~~~~~~~~
+Improvements:
+
+- Alpine based docker images have been added
+- Added parameter to change background map source in layer preview
+- Dependency updates
+
+Fixes:
+
+- Rendering issue: Check for existing tile coordinates before using them
+- Fix mixed image format for file, S3 and azureblob caches
+
+
2.0.0 2023-12-19
~~~~~~~~~~~~~~~~~
Breaking:
@@ -123,27 +145,7 @@
- Several minor bugfixes
- Security fix to avoid potential web cache poisoning.
-1.13.2 2021-07-14
-~~~~~~~~~~~~~~~~~
-
-Fixes:
-
-- Hotfix: Fixup demo service (#528).
-
-1.13.1 2021-07-13
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- Support cookie management for HTTP sources.
-
-Fixes:
-
-- Security fix for local file disclosure (#526).
-
Older changes
-------------
See https://raw.github.com/mapproxy/mapproxy/master/CHANGES.txt
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/PKG-INFO new/MapProxy-2.0.2/PKG-INFO
--- old/MapProxy-2.0.0/PKG-INFO 2023-12-19 12:02:56.021801000 +0100
+++ new/MapProxy-2.0.2/PKG-INFO 2024-01-10 15:23:41.859838200 +0100
@@ -1,12 +1,11 @@
Metadata-Version: 2.1
Name: MapProxy
-Version: 2.0.0
+Version: 2.0.2
Summary: An accelerating proxy for tile and web map services
Home-page: https://mapproxy.org
Author: Oliver Tonnhofer
Author-email: [email protected]
License: Apache Software License 2.0
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: OS Independent
@@ -20,6 +19,8 @@
License-File: LICENSE.txt
License-File: COPYING.txt
License-File: AUTHORS.txt
+Requires-Dist: PyYAML>=3.0
+Requires-Dist: Pillow!=2.4.0,!=8.3.0,!=8.3.1
MapProxy is an open source proxy for geospatial data. It caches, accelerates
and transforms data from existing map services and serves any desktop or web
GIS client.
@@ -40,6 +41,27 @@
Nightly
~~~~~~~~~~~~~~~~~
+2.0.2 2024-01-10
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Revert PR "Fix mixed image format for file, S3 and azureblob caches"
+
+2.0.1 2024-01-05
+~~~~~~~~~~~~~~~~~
+Improvements:
+
+- Alpine based docker images have been added
+- Added parameter to change background map source in layer preview
+- Dependency updates
+
+Fixes:
+
+- Rendering issue: Check for existing tile coordinates before using them
+- Fix mixed image format for file, S3 and azureblob caches
+
+
2.0.0 2023-12-19
~~~~~~~~~~~~~~~~~
Breaking:
@@ -123,27 +145,7 @@
- Several minor bugfixes
- Security fix to avoid potential web cache poisoning.
-1.13.2 2021-07-14
-~~~~~~~~~~~~~~~~~
-
-Fixes:
-
-- Hotfix: Fixup demo service (#528).
-
-1.13.1 2021-07-13
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- Support cookie management for HTTP sources.
-
-Fixes:
-
-- Security fix for local file disclosure (#526).
-
Older changes
-------------
See https://raw.github.com/mapproxy/mapproxy/master/CHANGES.txt
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/doc/conf.py
new/MapProxy-2.0.2/doc/conf.py
--- old/MapProxy-2.0.0/doc/conf.py 2023-12-19 11:55:45.000000000 +0100
+++ new/MapProxy-2.0.2/doc/conf.py 2024-01-10 15:20:19.000000000 +0100
@@ -51,7 +51,7 @@
# The short X.Y version.
version = '2.0'
# The full version, including alpha/beta/rc tags.
-release = '2.0.0'
+release = '2.0.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/doc/configuration.rst
new/MapProxy-2.0.2/doc/configuration.rst
--- old/MapProxy-2.0.0/doc/configuration.rst 2023-12-19 11:24:44.000000000
+0100
+++ new/MapProxy-2.0.2/doc/configuration.rst 2024-01-08 14:44:06.000000000
+0100
@@ -820,6 +820,18 @@
Here you can define some internals of MapProxy and default values that are
used in the other configuration directives.
+.. _globals_background:
+
+``background``
+""""""""""""""
+
+Configuration of the background displayed in the map viewer. This background
map can be observed in the /demo service
+of MapProxy, in any of the three types of service (WMS, WMTS and TMS).
+
+.. _background_url:
+
+``url``
+ URL of the tile service (it MUST be a service that offers tiles in XYZ
format e.g. "https://tile.openstreetmap.org/{z}/{x}/{y}.png";)
``image``
"""""""""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/doc/configuration_examples.rst
new/MapProxy-2.0.2/doc/configuration_examples.rst
--- old/MapProxy-2.0.0/doc/configuration_examples.rst 2023-12-19
11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/doc/configuration_examples.rst 2024-01-08
14:44:06.000000000 +0100
@@ -139,6 +139,25 @@
.. note:: Please make sure you are allowed to access the tile service.
Commercial tile provider often prohibit the direct access to tiles. The tile
service from OpenStreetMap has a strict `Tile Usage Prolicy
<http://wiki.openstreetmap.org/wiki/Tile_usage_policy>`_.
+
+.. _display_custom_background:
+
+Display custom background map in the map viewer of the demo service
+===================================================================
+
+In order to setup the background displayed in the map viewer of the /demo
service of Mapproxy
+you need to add the service of the background map to ``globals``.
+
+Here is a minimal example with the default configuration::
+
+ globals:
+ # background map of the demo service
+ background:
+ # tile source in ZXY format
+ url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
+
+.. note:: URL of the tile service MUST be in XYZ format. Please make sure you
are allowed to access the tile service. Commercial tile provider often prohibit
the direct access to tiles. The tile service from OpenStreetMap has a strict
`Tile Usage Prolicy <http://wiki.openstreetmap.org/wiki/Tile_usage_policy>`_.
+
.. _overlay_tiles_osm_openlayers:
Overlay tiles with OpenStreetMap or Google Maps in OpenLayers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/mapproxy/cache/tile.py
new/MapProxy-2.0.2/mapproxy/cache/tile.py
--- old/MapProxy-2.0.0/mapproxy/cache/tile.py 2023-12-19 11:24:44.000000000
+0100
+++ new/MapProxy-2.0.2/mapproxy/cache/tile.py 2024-01-10 15:16:10.000000000
+0100
@@ -143,10 +143,12 @@
rescale_till_zoom = self.grid.levels
# Remove tiles that are not in the cache coverage
- for t in tiles.tiles:
- tile_bbox = self.grid.tile_bbox(t.coord)
- if self.cache.coverage and not
self.cache.coverage.intersects(tile_bbox, self.grid.srs):
- t.coord = None
+ if self.cache.coverage:
+ for t in tiles.tiles:
+ if t.coord:
+ tile_bbox = self.grid.tile_bbox(t.coord)
+ if not self.cache.coverage.intersects(tile_bbox,
self.grid.srs):
+ t.coord = None
tiles = self._load_tile_coords(
tiles, dimensions=dimensions, with_metadata=with_metadata,
@@ -155,7 +157,7 @@
for t in tiles.tiles:
# Clip tiles if clipping is enabled for coverage
- if self.cache.coverage and self.cache.coverage.clip and t.source:
+ if t.coord and self.cache.coverage and self.cache.coverage.clip
and t.source:
tile_bbox = self.grid.tile_bbox(t.coord)
coverage = self.cache.coverage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/mapproxy/config/defaults.py
new/MapProxy-2.0.2/mapproxy/config/defaults.py
--- old/MapProxy-2.0.0/mapproxy/config/defaults.py 2023-12-19
11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/config/defaults.py 2024-01-10
15:16:10.000000000 +0100
@@ -26,6 +26,10 @@
)
debug_mode = False
+background = dict(
+ url = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
+)
+
srs = dict(
# user sets
axis_order_ne = set(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/mapproxy/config/loader.py
new/MapProxy-2.0.2/mapproxy/config/loader.py
--- old/MapProxy-2.0.0/mapproxy/config/loader.py 2023-12-19
11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/config/loader.py 2024-01-10
15:16:10.000000000 +0100
@@ -2208,9 +2208,10 @@
services.append('wms_111')
layers = odict(sorted(layers.items(), key=lambda x: x[1].name))
+ background = self.context.globals.get_value('background', conf)
return DemoServer(layers, md, tile_layers=tile_layers,
- image_formats=image_formats, srs=srs, services=services,
restful_template=restful_template)
+ image_formats=image_formats, srs=srs, services=services,
restful_template=restful_template, background = background)
def load_plugins():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MapProxy-2.0.0/mapproxy/config_template/base_config/full_example.yaml
new/MapProxy-2.0.2/mapproxy/config_template/base_config/full_example.yaml
--- old/MapProxy-2.0.0/mapproxy/config_template/base_config/full_example.yaml
2023-12-19 11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/config_template/base_config/full_example.yaml
2024-01-08 14:44:06.000000000 +0100
@@ -591,3 +591,8 @@
encoding_options:
# jpeg quality [0-100]
jpeg_quality: 60
+
+ # background map of the demo service
+ background:
+ # tile source in ZXY format
+ url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/mapproxy/service/demo.py
new/MapProxy-2.0.2/mapproxy/service/demo.py
--- old/MapProxy-2.0.0/mapproxy/service/demo.py 2023-12-19 11:24:44.000000000
+0100
+++ new/MapProxy-2.0.2/mapproxy/service/demo.py 2024-01-10 15:16:10.000000000
+0100
@@ -86,7 +86,7 @@
class DemoServer(Server):
names = ('demo',)
def __init__(self, layers, md, request_parser=None, tile_layers=None,
- srs=None, image_formats=None, services=None,
restful_template=None):
+ srs=None, image_formats=None, services=None,
restful_template=None, background = None):
Server.__init__(self)
self.layers = layers
self.tile_layers = tile_layers or {}
@@ -100,6 +100,7 @@
self.srs = srs
self.services = services or []
self.restful_template = restful_template
+ self.background = background
def handle(self, req):
if req.path.startswith('/demo/static/'):
@@ -258,13 +259,17 @@
width = bbox[2] - bbox[0]
height = bbox[3] - bbox[1]
min_res = max(width/256, height/256)
+ background_url = base_config().background.url
+ if self.background:
+ background_url = self.background["url"]
return template.substitute(layer=layer,
image_formats=self.image_formats,
format=escape(req.args['format']),
srs=srs,
layer_srs=self.layer_srs,
bbox=bbox,
- res=min_res)
+ res=min_res,
+ background_url = background_url)
def _render_tms_template(self, template, req):
template = get_template(template, default_inherit="demo/static.html")
@@ -288,13 +293,17 @@
add_res_to_options = True
else:
add_res_to_options = False
+ background_url = base_config().background.url
+ if self.background:
+ background_url = self.background["url"]
return template.substitute(layer=tile_layer,
srs=escape(req.args['srs']),
format=escape(req.args['format']),
resolutions=res,
units=units,
add_res_to_options=add_res_to_options,
- all_tile_layers=self.tile_layers)
+ all_tile_layers=self.tile_layers,
+ background_url = background_url)
def _render_wmts_template(self, template, req):
template = get_template(template, default_inherit="demo/static.html")
@@ -312,6 +321,9 @@
units = 'degree'
else:
units = 'm'
+ background_url = base_config().background.url
+ if self.background:
+ background_url = self.background["url"]
return template.substitute(layer=wmts_layer,
matrix_set=wmts_layer.grid.name,
format=escape(req.args['format']),
@@ -319,7 +331,8 @@
resolutions=wmts_layer.grid.resolutions,
units=units,
all_tile_layers=self.tile_layers,
- restful_url=restful_url)
+ restful_url=restful_url,
+ background_url = background_url)
def _render_capabilities_template(self, template, xmlfile, service, url):
template = get_template(template, default_inherit="demo/static.html")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MapProxy-2.0.0/mapproxy/service/templates/demo/tms_demo.html
new/MapProxy-2.0.2/mapproxy/service/templates/demo/tms_demo.html
--- old/MapProxy-2.0.0/mapproxy/service/templates/demo/tms_demo.html
2023-12-19 11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/service/templates/demo/tms_demo.html
2024-01-10 15:16:10.000000000 +0100
@@ -42,9 +42,13 @@
maxResolution: {{resolutions[0]}}
});
+ const background_source = new ol.source.XYZ({
+ url: "{{background_url}}"
+ });
+
const layers = [
new ol.layer.Tile({
- source: new ol.source.OSM()
+ source: background_source
}),
new ol.layer.Tile({source})
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MapProxy-2.0.0/mapproxy/service/templates/demo/wms_demo.html
new/MapProxy-2.0.2/mapproxy/service/templates/demo/wms_demo.html
--- old/MapProxy-2.0.0/mapproxy/service/templates/demo/wms_demo.html
2023-12-19 11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/service/templates/demo/wms_demo.html
2024-01-10 15:16:10.000000000 +0100
@@ -42,9 +42,13 @@
}
});
+ const background_source = new ol.source.XYZ({
+ url: "{{background_url}}"
+ });
+
const layers = [
new ol.layer.Tile({
- source: new ol.source.OSM()
+ source: background_source
}),
new ol.layer.Image({source})
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MapProxy-2.0.0/mapproxy/service/templates/demo/wmts_demo.html
new/MapProxy-2.0.2/mapproxy/service/templates/demo/wmts_demo.html
--- old/MapProxy-2.0.0/mapproxy/service/templates/demo/wmts_demo.html
2023-12-19 11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/service/templates/demo/wmts_demo.html
2024-01-10 15:16:10.000000000 +0100
@@ -58,9 +58,13 @@
})
});
+ const background_source = new ol.source.XYZ({
+ url: "{{background_url}}"
+ });
+
const layers = [
new ol.layer.Tile({
- source: new ol.source.OSM()
+ source: background_source
}),
new ol.layer.Tile({source})
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/mapproxy/test/mocker.py
new/MapProxy-2.0.2/mapproxy/test/mocker.py
--- old/MapProxy-2.0.0/mapproxy/test/mocker.py 2023-12-19 11:24:44.000000000
+0100
+++ new/MapProxy-2.0.2/mapproxy/test/mocker.py 2024-01-10 15:16:10.000000000
+0100
@@ -453,8 +453,12 @@
assertNotIsInstance = failIfIsInstance # Poor choice in 2.7/3.2+.
# The following are missing in Python < 2.4.
- assertTrue = unittest.TestCase.failUnless
- assertFalse = unittest.TestCase.failIf
+ if sys.version_info < (2, 4):
+ assertTrue = unittest.TestCase.failUnless
+ assertFalse = unittest.TestCase.failIf
+ else:
+ assertTrue = unittest.TestCase.assertTrue
+ assertFalse = unittest.TestCase.assertFalse
# The following is provided for compatibility with Twisted's trial.
assertIdentical = assertIs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MapProxy-2.0.0/mapproxy/test/unit/test_image_messages.py
new/MapProxy-2.0.2/mapproxy/test/unit/test_image_messages.py
--- old/MapProxy-2.0.0/mapproxy/test/unit/test_image_messages.py
2023-12-19 11:24:44.000000000 +0100
+++ new/MapProxy-2.0.2/mapproxy/test/unit/test_image_messages.py
2024-01-10 15:16:10.000000000 +0100
@@ -23,9 +23,13 @@
from mapproxy.image.opts import ImageOptions
from mapproxy.tilefilter import watermark_filter
+import pytest
PNG_FORMAT = ImageOptions(format="image/png")
+requires_freetype = pytest.mark.skipif(
+ not isinstance(ImageFont.load_default(), ImageFont.FreeTypeFont),
+ reason="Test expects the default Pillow FreeTypeFont")
class TestTextDraw(object):
@@ -38,6 +42,7 @@
assert total_box == boxes[0]
assert len(boxes) == 1
+ @requires_freetype
def test_multiline_ul(self):
font = ImageFont.load_default()
td = TextDraw("Hello\nWorld", font)
@@ -47,6 +52,7 @@
assert total_box == (5, 7, 33, 28)
assert boxes == [(5, 7, 30, 15), (5, 20, 33, 28)]
+ @requires_freetype
def test_multiline_lr(self):
font = ImageFont.load_default()
td = TextDraw("Hello\nWorld", font, placement="lr")
@@ -56,6 +62,7 @@
assert total_box == (67, 76, 95, 97)
assert boxes == [(67, 76, 92, 84), (67, 89, 95, 97)]
+ @requires_freetype
def test_multiline_center(self):
font = ImageFont.load_default()
td = TextDraw("Hello\nWorld", font, placement="cc")
@@ -65,6 +72,7 @@
assert total_box == (36, 42, 64, 63)
assert boxes == [(36, 42, 61, 50), (36, 55, 64, 63)]
+ @requires_freetype
def test_unicode(self):
font = ImageFont.load_default()
td = TextDraw(u"Héllö\nWørld", font, placement="cc")
@@ -124,6 +132,7 @@
15000,
]
+ @requires_freetype
def test_message(self):
image_opts = PNG_FORMAT.copy()
image_opts.bgcolor = "#113399"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/requirements-tests.txt
new/MapProxy-2.0.2/requirements-tests.txt
--- old/MapProxy-2.0.0/requirements-tests.txt 2023-12-19 11:24:44.000000000
+0100
+++ new/MapProxy-2.0.2/requirements-tests.txt 2024-01-10 15:16:10.000000000
+0100
@@ -8,13 +8,13 @@
WebTest==3.0.0
attrs==19.3.0;python_version<"3.10"
attrs==23.1.0;python_version>="3.10"
-aws-sam-translator==1.81.0
+aws-sam-translator==1.82.0
aws-xray-sdk==2.12.1
beautifulsoup4==4.12.2
-boto3==1.33.12
+boto3==1.34.4
boto==2.49.0
-botocore==1.33.12
-certifi==2023.7.22
+botocore==1.34.5
+certifi==2023.11.17
cffi==1.16.0;
cfn-lint==0.80.3
chardet==5.2.0
@@ -25,7 +25,7 @@
ecdsa==0.18.0
future==0.18.3
idna==2.9
-importlib-metadata==5.2.0
+importlib-metadata==7.0.0
iniconfig==2.0.0
jmespath==1.0.1
jsondiff==1.3.1
@@ -34,10 +34,10 @@
jsonpointer==2.4
jsonschema==3.2.0
junit-xml==1.9
-lxml==4.9.3
+lxml==4.9.4
mock==5.1.0
more-itertools==10.1.0
-moto==4.2.11
+moto==4.2.12
networkx==3.1
numpy==1.26.0;python_version>="3.9"
numpy==1.24.0;python_version=="3.8"
@@ -60,14 +60,14 @@
responses==0.24.1
riak==2.7.0
rsa==4.9
-s3transfer==0.8.2
+s3transfer==0.9.0
six==1.16.0
soupsieve==2.0.1
sshpubkeys==3.3.1
toml==0.10.2
urllib3==1.26.18
waitress==2.1.2
-websocket-client==1.6.1
+websocket-client==1.7.0
werkzeug==1.0.1
wrapt==1.16.0
xmltodict==0.13.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MapProxy-2.0.0/setup.py new/MapProxy-2.0.2/setup.py
--- old/MapProxy-2.0.0/setup.py 2023-12-19 11:55:45.000000000 +0100
+++ new/MapProxy-2.0.2/setup.py 2024-01-10 15:20:19.000000000 +0100
@@ -54,7 +54,7 @@
setup(
name='MapProxy',
- version="2.0.0",
+ version="2.0.2",
description='An accelerating proxy for tile and web map services',
long_description=long_description(7),
author='Oliver Tonnhofer',
![https://tile.openstreetmap.org/{z}/{x}/{y}.png"](https://tile.openstreetmap.org/{z}/{x}/{y}.png"){kind=link}