MapProxy 4.1.0__tar.gz → 4.1.2__tar.gz

{mapproxy-4.1.0 → mapproxy-4.1.2}/CHANGES.txt

@@ -1,3 +1,22 @@
+4.1.2 2025-05-27
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+    - Set Pillow versions in setup.py to actually supported versions
+    - Using PIL instead of Pillow was not working since Python 2, so it is removed from setup.py
+    - Using a higher pyproj version for Python 3.13 is necessary
+    - Added a test for an older Pillow version with Python 3.9
+
+
+4.1.1 2025-04-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - The scale denominator in the WMTS capabilites is now rounded to 10 digits after the decimal place.
+
+
 4.1.0 2025-04-29
 ~~~~~~~~~~~~~~~~
 

{mapproxy-4.1.0 → mapproxy-4.1.2}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.1.0
+Version: 4.1.2
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -11,6 +11,7 @@ License: Apache Software License 2.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -28,7 +29,11 @@ Requires-Dist: future
 Requires-Dist: pyproj>=2
 Requires-Dist: jsonschema>=4
 Requires-Dist: werkzeug<4
-Requires-Dist: Pillow!=2.4.0,!=8.3.0,!=8.3.1
+Requires-Dist: Pillow!=8.3.0,!=8.3.1,>=8; python_version == "3.9"
+Requires-Dist: Pillow>=9; python_version == "3.10"
+Requires-Dist: Pillow>=10; python_version == "3.11"
+Requires-Dist: Pillow>=10.1; python_version == "3.12"
+Requires-Dist: Pillow>=11; python_version == "3.13"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -54,6 +59,25 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+4.1.2 2025-05-27
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+    - Set Pillow versions in setup.py to actually supported versions
+    - Using PIL instead of Pillow was not working since Python 2, so it is removed from setup.py
+    - Using a higher pyproj version for Python 3.13 is necessary
+    - Added a test for an older Pillow version with Python 3.9
+
+
+4.1.1 2025-04-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - The scale denominator in the WMTS capabilites is now rounded to 10 digits after the decimal place.
+
+
 4.1.0 2025-04-29
 ~~~~~~~~~~~~~~~~
 
@@ -149,33 +173,6 @@ Fixes:
   - A bug with clipping polygons that become multi polygons due to the clipping is now fixed
 
 
-3.1.2 2024-11-20
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Several dependencies for the tests and github actions have been updated
-
-Fixes:
-
-  - Metadata URLs are now required to have a `url`, `type` and `format`
-  - The layers of a wms `req` are now correctly splitted at `,` for validation
-  - The validation for seeding configs is fixed
-  - Single color tiles are now created with configured file_permissions
-
-
-3.1.1 2024-11-15
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Werkzeug version is no longer pinned and can be chosen freely.
-
-Fixes:
-
-  - The permission handling for file locks now also sets permissions on the files not just on the directories.
-
-
 
 Older changes
 -------------

mapproxy-4.1.2/MapProxy.egg-info/requires.txt

@@ -0,0 +1,20 @@
+PyYAML>=3.0
+future
+pyproj>=2
+jsonschema>=4
+werkzeug<4
+
+[:python_version == "3.10"]
+Pillow>=9
+
+[:python_version == "3.11"]
+Pillow>=10
+
+[:python_version == "3.12"]
+Pillow>=10.1
+
+[:python_version == "3.13"]
+Pillow>=11
+
+[:python_version == "3.9"]
+Pillow!=8.3.0,!=8.3.1,>=8

{mapproxy-4.1.0 → mapproxy-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.1.0
+Version: 4.1.2
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -11,6 +11,7 @@ License: Apache Software License 2.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -28,7 +29,11 @@ Requires-Dist: future
 Requires-Dist: pyproj>=2
 Requires-Dist: jsonschema>=4
 Requires-Dist: werkzeug<4
-Requires-Dist: Pillow!=2.4.0,!=8.3.0,!=8.3.1
+Requires-Dist: Pillow!=8.3.0,!=8.3.1,>=8; python_version == "3.9"
+Requires-Dist: Pillow>=9; python_version == "3.10"
+Requires-Dist: Pillow>=10; python_version == "3.11"
+Requires-Dist: Pillow>=10.1; python_version == "3.12"
+Requires-Dist: Pillow>=11; python_version == "3.13"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -54,6 +59,25 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+4.1.2 2025-05-27
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+    - Set Pillow versions in setup.py to actually supported versions
+    - Using PIL instead of Pillow was not working since Python 2, so it is removed from setup.py
+    - Using a higher pyproj version for Python 3.13 is necessary
+    - Added a test for an older Pillow version with Python 3.9
+
+
+4.1.1 2025-04-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - The scale denominator in the WMTS capabilites is now rounded to 10 digits after the decimal place.
+
+
 4.1.0 2025-04-29
 ~~~~~~~~~~~~~~~~
 
@@ -149,33 +173,6 @@ Fixes:
   - A bug with clipping polygons that become multi polygons due to the clipping is now fixed
 
 
-3.1.2 2024-11-20
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Several dependencies for the tests and github actions have been updated
-
-Fixes:
-
-  - Metadata URLs are now required to have a `url`, `type` and `format`
-  - The layers of a wms `req` are now correctly splitted at `,` for validation
-  - The validation for seeding configs is fixed
-  - Single color tiles are now created with configured file_permissions
-
-
-3.1.1 2024-11-15
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Werkzeug version is no longer pinned and can be chosen freely.
-
-Fixes:
-
-  - The permission handling for file locks now also sets permissions on the files not just on the directories.
-
-
 
 Older changes
 -------------

{mapproxy-4.1.0 → mapproxy-4.1.2}/doc/configuration.rst

@@ -1302,10 +1302,9 @@ The following encoding options are available:
 
 ``quantizer``
   The algorithm used to quantize (reduce) the image colors. Quantizing is used for GIF and paletted PNG images. Available quantizers are ``mediancut`` and ``fastoctree``. ``fastoctree`` is much faster and also supports 8bit PNG with full alpha support, but the image quality can be better with ``mediancut`` in some cases.
-  The quantizing is done by the Python Image Library (PIL). ``fastoctree`` is a `new quantizer <http://mapproxy.org/blog/improving-the-performance-for-png-requests/>`_ that is only available in Pillow >=2.0. See :ref:`installation of PIL<dependencies_pil>`.
 
 ``tiff_compression``
-  Enable compression for TIFF images. Available compression methods are `tiff_lzw` for lossless LZW compression, `jpeg` for JPEG compression and `raw` for no compression (default). You can use the ``jpeg_quality`` option to tune the image quality for JPEG compressed TIFFs. Requires Pillow >= 6.1.0.
+  Enable compression for TIFF images. Available compression methods are `tiff_lzw` for lossless LZW compression, `jpeg` for JPEG compression and `raw` for no compression (default). You can use the ``jpeg_quality`` option to tune the image quality for JPEG compressed TIFFs.
 
   .. versionadded:: 1.12.0
 

{mapproxy-4.1.0 → mapproxy-4.1.2}/mapproxy/image/merge.py

@@ -211,10 +211,14 @@ class BandMerger(object):
         for op in self.ops:
             chan = src_img_bands[op.src_img][op.src_band]
             if op.factor != 1.0:
-                chan = ImageMath.lambda_eval(
-                    lambda args: args["convert"](args["int"](args["float"](args["a"]) * op.factor), 'L'),
-                    a=chan
-                )
+                # eval is deprecated since Pillow==10.3.0, lambda_eval is the replacement
+                if hasattr(ImageMath, 'lambda_eval'):
+                    chan = ImageMath.lambda_eval(
+                        lambda args: args["convert"](args["int"](args["float"](args["a"]) * op.factor), 'L'),
+                        a=chan
+                    )
+                else:
+                    chan = ImageMath.eval("convert(int(float(a) * %f), 'L')" % op.factor, a=chan)
                 if result_bands[op.dst_band] is None:
                     result_bands[op.dst_band] = chan
                 else:

{mapproxy-4.1.0 → mapproxy-4.1.2}/mapproxy/service/demo.py

@@ -126,7 +126,7 @@ class DemoServer(Server):
         if pattern.match(url):
             return True
         else:
-            logging.warn(f"A request was blocked that was trying to access a non-http resource: {url}")
+            logging.warning(f"A request was blocked that was trying to access a non-http resource: {url}")
             return False
 
     @staticmethod

{mapproxy-4.1.0 → mapproxy-4.1.2}/mapproxy/service/wmts.py

@@ -45,7 +45,7 @@ log = logging.getLogger(__name__)
 class WMTSServer(Server):
     service = 'wmts'
 
-    def __init__(self, layers, md, request_parser=None, max_tile_age=None, info_formats={}):
+    def __init__(self, layers, md, request_parser=None, max_tile_age=None, info_formats=None):
         Server.__init__(self)
         self.request_parser = request_parser or wmts_request
         self.md = md
@@ -53,7 +53,7 @@ class WMTSServer(Server):
         self.layers, self.matrix_sets = self._matrix_sets(layers)
         self.capabilities_class = Capabilities
         self.fi_transformers = None
-        self.info_formats = info_formats
+        self.info_formats = info_formats or {}
 
     def _matrix_sets(self, layers):
         sets = {}
@@ -237,12 +237,12 @@ class WMTSRestServer(WMTSServer):
     default_template = '/{Layer}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.{Format}'
     default_info_template = '/{Layer}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}/{I}/{J}.{InfoFormat}'
 
-    def __init__(self, layers, md, max_tile_age=None, template=None, fi_template=None, info_formats={}):
+    def __init__(self, layers, md, max_tile_age=None, template=None, fi_template=None, info_formats=None):
         WMTSServer.__init__(self, layers, md)
         self.max_tile_age = max_tile_age
         self.template = template or self.default_template
         self.fi_template = fi_template or self.default_info_template
-        self.info_formats = info_formats
+        self.info_formats = info_formats or {}
         self.url_converter = URLTemplateConverter(self.template)
         self.fi_url_converter = FeatureInfoURLTemplateConverter(self.fi_template)
         self.request_parser = make_wmts_rest_request_parser(self.url_converter, self.fi_url_converter)
@@ -264,10 +264,10 @@ class Capabilities(object):
     Renders WMS capabilities documents.
     """
 
-    def __init__(self, server_md, layers, matrix_sets, info_formats={}):
+    def __init__(self, server_md, layers, matrix_sets, info_formats=None):
         self.service = server_md
         self.layers = layers
-        self.info_formats = info_formats
+        self.info_formats = info_formats or {}
         self.matrix_sets = matrix_sets
 
     def render(self, _map_request):
@@ -303,7 +303,7 @@ class Capabilities(object):
 
 
 class RestfulCapabilities(Capabilities):
-    def __init__(self, server_md, layers, matrix_sets, url_converter, fi_url_converter, info_formats={}):
+    def __init__(self, server_md, layers, matrix_sets, url_converter, fi_url_converter, info_formats=None):
         Capabilities.__init__(self, server_md, layers, matrix_sets, info_formats=info_formats)
         self.url_converter = url_converter
         self.fi_url_converter = fi_url_converter
@@ -406,11 +406,11 @@ class TileMatrixSet(object):
             if self.grid.srs.is_axis_order_ne:
                 topleft = bbox[3], bbox[0]
             grid_size = self.grid.grid_sizes[level]
-            scale_denom = res / (0.28 / 1000) * meter_per_unit(self.grid.srs)
+            scale_denom = round(res / (0.28 / 1000) * meter_per_unit(self.grid.srs), 10)
             yield bunch(
                 identifier=level,
                 topleft=topleft,
                 grid_size=grid_size,
-                scale_denom=scale_denom,
+                scale_denom=f'{scale_denom}'.strip('0').strip('.'),
                 tile_size=self.grid.tile_size,
             )

{mapproxy-4.1.0 → mapproxy-4.1.2}/requirements-tests.txt

@@ -7,7 +7,7 @@ beautifulsoup4==4.12.3
 boto3==1.35.6
 boto==2.49.0
 botocore==1.35.6
-certifi==2024.7.4
+certifi==2025.4.26
 cffi==1.17.1;
 cfn-lint==0.80.3
 chardet==5.2.0
@@ -38,13 +38,14 @@ networkx==3.1;python_version<"3.10"
 networkx==3.4.2;python_version>="3.10"
 numpy==1.26.4
 packaging==24.2
-Pillow==11.1.0
+Pillow==11.2.1 # This version is overwritten in the test workflow, please adjust there as well
 pluggy==1.5.0
 py==1.11.0
 pyasn1==0.5.1
 pycparser==2.22
 pyparsing==3.2.3
-pyproj==3.6.1
+pyproj==3.6.1;python_version<"3.10"
+pyproj==3.7.1;python_version>="3.10"
 pyrsistent==0.20.0
 pytest-rerunfailures==13.0
 pytest==8.3.2
@@ -54,7 +55,7 @@ pytz==2024.2
 redis==5.0.1
 requests==2.32.3
 responses==0.25.3
-rsa==4.9
+rsa==4.9.1
 s3transfer==0.10.2
 Shapely==2.0.1;python_version<"3.10"
 Shapely==2.1.0;python_version>="3.10"

{mapproxy-4.1.0 → mapproxy-4.1.2}/setup.py

@@ -1,6 +1,3 @@
-import platform
-import importlib.metadata
-
 from setuptools import setup, find_packages
 
 
@@ -9,35 +6,15 @@ install_requires = [
     'future',
     'pyproj>=2',
     'jsonschema>=4',
-    'werkzeug<4'
+    'werkzeug<4',
+    'Pillow>=8,!=8.3.0,!=8.3.1;python_version=="3.9"',
+    'Pillow>=9;python_version=="3.10"',
+    'Pillow>=10;python_version=="3.11"',
+    'Pillow>=10.1;python_version=="3.12"',
+    'Pillow>=11;python_version=="3.13"'
 ]
 
 
-def package_installed(pkg):
-    """Check if package is installed"""
-    try:
-        importlib.metadata.version(pkg)
-    except importlib.metadata.PackageNotFoundError:
-        return False
-    else:
-        return True
-
-
-# depend on Pillow if it is installed, otherwise
-# depend on PIL if it is installed, otherwise
-# require Pillow
-if package_installed('Pillow'):
-    install_requires.append('Pillow !=2.4.0,!=8.3.0,!=8.3.1')
-elif package_installed('PIL'):
-    install_requires.append('PIL>=1.1.6,<1.2.99')
-else:
-    install_requires.append('Pillow !=2.4.0,!=8.3.0,!=8.3.1')
-
-if platform.python_version_tuple() < ('2', '6'):
-    # for mapproxy-seed
-    install_requires.append('multiprocessing>=2.6')
-
-
 def long_description(changelog_releases=10):
     import re
     import textwrap
@@ -62,7 +39,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="4.1.0",
+    version="4.1.2",
     description='An accelerating proxy for tile and web map services',
     long_description=long_description(7),
     long_description_content_type='text/x-rst',
@@ -86,6 +63,7 @@ setup(
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",

mapproxy-4.1.0/MapProxy.egg-info/requires.txt

@@ -1,6 +0,0 @@
-PyYAML>=3.0
-future
-pyproj>=2
-jsonschema>=4
-werkzeug<4
-Pillow!=2.4.0,!=8.3.0,!=8.3.1