MapProxy 4.0.2__tar.gz → 4.1.0__tar.gz

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

@@ -1,3 +1,31 @@
+4.1.0 2025-04-29
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - It is now possible to integrate the grid name into paths for AWS buckets. This allows storage of tiles for multiple
+    grids in the same bucket.
+  - We are returning a 404 http status code instead of a 500 if no legend graphic is found for a service.
+  - We are using utf-8 in GetFeatureInfo requests now.
+
+Maintenance:
+
+  - Updated some dependencies.
+  - Updated the GitHub runner versions.
+  - Refactored the grid.py file into multiple files.
+  - Removed the implementation of odict in favour of the builtin OrderedDict class.
+  - Added support for python 3.13.
+  - Skipping permissions tests if tests are run with root user. This is necessary to build and test MapProxy in a chroot
+    environment which is used to package MapProxy for Debian. Normal testing is not affected.
+
+Fixes:
+
+  - Fixed deprecation warnings for utctime, sqlite, ImageMath.eval, mock_s3.
+  - Fix entrypoint.sh to create default MapProxy configurations if none are found.
+  - Allowed the trivy security scan workflow to write the results to the GitHub security tab.
+  - We are not allowing the deprecated TLS Versions 1.1 or lower for connections to servers anymore.
+
+
 4.0.2 2025-04-10
 ~~~~~~~~~~~~~~~~
 

{mapproxy-4.0.2 → mapproxy-4.1.0}/COPYING.txt

@@ -23,11 +23,6 @@ Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
 
 See mapproxy/image/fonts/LICENSE
 
-mapproxy/util/ext/odict.py
---------------------------
-(c) 2008 by Armin Ronacher and PEP 273 authors.
-Modified "3-clause" BSD license.
-
 mapproxy/util/ext/tempita/*.py
 ------------------------------
 (c) 2009 by Ian Bicking.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.0.2
+Version: 4.1.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: Proxy Servers
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -53,6 +54,34 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+4.1.0 2025-04-29
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - It is now possible to integrate the grid name into paths for AWS buckets. This allows storage of tiles for multiple
+    grids in the same bucket.
+  - We are returning a 404 http status code instead of a 500 if no legend graphic is found for a service.
+  - We are using utf-8 in GetFeatureInfo requests now.
+
+Maintenance:
+
+  - Updated some dependencies.
+  - Updated the GitHub runner versions.
+  - Refactored the grid.py file into multiple files.
+  - Removed the implementation of odict in favour of the builtin OrderedDict class.
+  - Added support for python 3.13.
+  - Skipping permissions tests if tests are run with root user. This is necessary to build and test MapProxy in a chroot
+    environment which is used to package MapProxy for Debian. Normal testing is not affected.
+
+Fixes:
+
+  - Fixed deprecation warnings for utctime, sqlite, ImageMath.eval, mock_s3.
+  - Fix entrypoint.sh to create default MapProxy configurations if none are found.
+  - Allowed the trivy security scan workflow to write the results to the GitHub security tab.
+  - We are not allowing the deprecated TLS Versions 1.1 or lower for connections to servers anymore.
+
+
 4.0.2 2025-04-10
 ~~~~~~~~~~~~~~~~
 
@@ -147,23 +176,6 @@ Fixes:
   - The permission handling for file locks now also sets permissions on the files not just on the directories.
 
 
-3.1.0 2024-10-22
-~~~~~~~~~~~~~~~~
-
-Improvements:
-
-  - Add new config parameters `file_permissions` and `directory_permissions` to set file and directory
-    permissions on newly created cache files and directories.
-
-Maintenance:
-
-  - Dependency updates
-
-Fixes:
-
-  - Fix transparency in TMS demo page.
-
-
 
 Older changes
 -------------

{mapproxy-4.0.2 → mapproxy-4.1.0}/MapProxy.egg-info/SOURCES.txt

@@ -68,7 +68,6 @@ doc/yaml/simple_conf.yaml
 mapproxy/__init__.py
 mapproxy/exception.py
 mapproxy/featureinfo.py
-mapproxy/grid.py
 mapproxy/layer.py
 mapproxy/multiapp.py
 mapproxy/proj.py
@@ -118,6 +117,10 @@ mapproxy/config_template/base_config/full_seed_example.yaml
 mapproxy/config_template/base_config/log.ini
 mapproxy/config_template/base_config/mapproxy.yaml
 mapproxy/config_template/base_config/seed.yaml
+mapproxy/grid/__init__.py
+mapproxy/grid/meta_grid.py
+mapproxy/grid/resolutions.py
+mapproxy/grid/tile_grid.py
 mapproxy/image/__init__.py
 mapproxy/image/mask.py
 mapproxy/image/merge.py
@@ -482,6 +485,7 @@ mapproxy/test/unit/polygons/polygons.shp
 mapproxy/test/unit/polygons/polygons.shx
 mapproxy/util/__init__.py
 mapproxy/util/async_.py
+mapproxy/util/bbox.py
 mapproxy/util/collections.py
 mapproxy/util/coverage.py
 mapproxy/util/escape.py
@@ -491,12 +495,12 @@ mapproxy/util/lib.py
 mapproxy/util/lock.py
 mapproxy/util/ogr.py
 mapproxy/util/py.py
+mapproxy/util/sqlite3.py
 mapproxy/util/times.py
 mapproxy/util/yaml.py
 mapproxy/util/ext/__init__.py
 mapproxy/util/ext/local.py
 mapproxy/util/ext/lockfile.py
-mapproxy/util/ext/odict.py
 mapproxy/util/ext/serving.py
 mapproxy/util/ext/dictspec/__init__.py
 mapproxy/util/ext/dictspec/spec.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.0.2
+Version: 4.1.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: Proxy Servers
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -53,6 +54,34 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+4.1.0 2025-04-29
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - It is now possible to integrate the grid name into paths for AWS buckets. This allows storage of tiles for multiple
+    grids in the same bucket.
+  - We are returning a 404 http status code instead of a 500 if no legend graphic is found for a service.
+  - We are using utf-8 in GetFeatureInfo requests now.
+
+Maintenance:
+
+  - Updated some dependencies.
+  - Updated the GitHub runner versions.
+  - Refactored the grid.py file into multiple files.
+  - Removed the implementation of odict in favour of the builtin OrderedDict class.
+  - Added support for python 3.13.
+  - Skipping permissions tests if tests are run with root user. This is necessary to build and test MapProxy in a chroot
+    environment which is used to package MapProxy for Debian. Normal testing is not affected.
+
+Fixes:
+
+  - Fixed deprecation warnings for utctime, sqlite, ImageMath.eval, mock_s3.
+  - Fix entrypoint.sh to create default MapProxy configurations if none are found.
+  - Allowed the trivy security scan workflow to write the results to the GitHub security tab.
+  - We are not allowing the deprecated TLS Versions 1.1 or lower for connections to servers anymore.
+
+
 4.0.2 2025-04-10
 ~~~~~~~~~~~~~~~~
 
@@ -147,23 +176,6 @@ Fixes:
   - The permission handling for file locks now also sets permissions on the files not just on the directories.
 
 
-3.1.0 2024-10-22
-~~~~~~~~~~~~~~~~
-
-Improvements:
-
-  - Add new config parameters `file_permissions` and `directory_permissions` to set file and directory
-    permissions on newly created cache files and directories.
-
-Maintenance:
-
-  - Dependency updates
-
-Fixes:
-
-  - Fix transparency in TMS demo page.
-
-
 
 Older changes
 -------------

{mapproxy-4.0.2 → mapproxy-4.1.0}/doc/caches.rst

@@ -480,6 +480,9 @@ Available options:
 ``use_http_get``:
   When set to ``true``, requests to S3 ``GetObject`` will be fetched via urllib2 instead of boto, which decreases response times. Defaults to ``false``.
 
+``include_grid_name``:
+  When set to ``true``, the grid name will be included in the path in the bucket (``[directory]/[grid.name]/[z]/...``). Defaults to ``false``.
+
 .. note::
   The hierarchical ``directory_layouts`` can hit limitations of AWS S3 if you are routinely processing 3500 or more requests per second. ``directory_layout: reverse_tms`` can work around this limitation. Please read `S3 Request Rate and Performance Considerations <http://docs.aws.amazon.com/AmazonS3/latest/dev/request-rate-perf-considerations.html>`_ for more information on this issue.
 

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/cache/couchdb.py

@@ -15,7 +15,7 @@
 
 
 import codecs
-import datetime
+from datetime import timezone, datetime
 import json
 import socket
 import time
@@ -245,7 +245,7 @@ class CouchDBCache(TileCacheBase):
 
 
 def utc_now_isoformat():
-    now = datetime.datetime.utcnow()
+    now = datetime.now(timezone.utc)
     now = now.isoformat()
     # remove milliseconds, add Zulu timezone
     now = now.rsplit('.', 1)[0] + 'Z'

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/cache/geopackage.py

@@ -14,12 +14,11 @@
 # limitations under the License.
 
 
-import datetime
+from datetime import timezone, datetime
 import hashlib
 import logging
 import os
 import re
-import sqlite3
 import threading
 import time
 from io import BytesIO
@@ -30,6 +29,7 @@ from mapproxy.image import ImageSource
 from mapproxy.srs import get_epsg_num
 from mapproxy.util.fs import ensure_directory
 from mapproxy.util.lock import FileLock
+from mapproxy.util.sqlite3 import sqlite3
 
 
 log = logging.getLogger(__name__)
@@ -246,8 +246,9 @@ class GeopackageCache(TileCacheBase):
                     log.info("srs_id already exists.")
             db.commit()
 
-            last_change = datetime.datetime.utcfromtimestamp(
-                int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))
+            last_change = datetime.fromtimestamp(
+                int(os.environ.get('SOURCE_DATE_EPOCH', time.time())),
+                timezone.utc
             )
 
             # Ensure that tile table exists here, don't overwrite a valid entry.

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/cache/mbtiles.py

@@ -16,7 +16,6 @@
 import glob
 import hashlib
 import os
-import sqlite3
 import threading
 import time
 from io import BytesIO
@@ -26,6 +25,7 @@ from mapproxy.image import ImageSource
 from mapproxy.cache.base import TileCacheBase, tile_buffer, REMOVE_ON_UNLOCK
 from mapproxy.util.fs import ensure_directory
 from mapproxy.util.lock import FileLock
+from mapproxy.util.sqlite3 import sqlite3
 
 import logging
 log = logging.getLogger(__name__)

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/cache/tile.py

@@ -36,7 +36,7 @@ Tile caching (creation, caching and retrieval of tiles).
 """
 from functools import partial
 from contextlib import contextmanager
-from mapproxy.grid import MetaGrid
+from mapproxy.grid.meta_grid import MetaGrid
 from mapproxy.image import BlankImageSource
 from mapproxy.image.mask import mask_image_source_from_coverage
 from mapproxy.image.opts import ImageOptions

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/client/http.py

@@ -18,6 +18,7 @@ Tile retrieval (WMS, TMS, etc.).
 """
 import sys
 import time
+from typing import Any
 
 from mapproxy.version import version
 from mapproxy.image import ImageSource
@@ -76,11 +77,13 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
 
         # wrap the socket using verification with the root
         #    certs in self.ca_certs_path
-        self.sock = ssl.wrap_socket(sock,
-                                    self.key_file,
-                                    self.cert_file,
-                                    cert_reqs=ssl.CERT_REQUIRED,
-                                    ca_certs=self._ca_certs)
+        context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
+        context.verify_mode = ssl.CERT_REQUIRED
+        context.load_cert_chain(certfile=self.cert_file, keyfile=self.key_file)
+        context.load_verify_locations(cafile=self._ca_certs)
+        context.minimum_version = ssl.TLSVersion.TLSv1_2
+
+        self.sock = context.wrap_socket(sock, server_hostname=self.host)
 
 
 def verified_https_connection_with_ca_certs(ca_certs):
@@ -151,18 +154,19 @@ class HTTPClient(object):
                  ssl_ca_certs=None, timeout=None, headers=None, hide_error_details=False,
                  manage_cookies=False):
         self._timeout = timeout
-        if url and url.startswith('https'):
-            if insecure:
-                ssl_ca_certs = None
+        if url and url.startswith('https') and insecure:
+            ssl_ca_certs = None
 
         self.opener = create_url_opener(ssl_ca_certs, url, username, password,
                                         insecure=insecure, manage_cookies=manage_cookies)
         self.header_list = headers.items() if headers else []
         self.hide_error_details = hide_error_details
 
-    def open(self, url, data=None, method=None):
+    def open(self, url, data=None, method=None) -> Any:
         code = None
         result = None
+        start_time = time.time()
+        req = None
         try:
             req = urllib2.Request(url, data=data)
         except ValueError as e:
@@ -173,7 +177,6 @@ class HTTPClient(object):
         if method:
             req.method = method
         try:
-            start_time = time.time()
             if self._timeout is not None:
                 result = self.opener.open(req, timeout=self._timeout)
             else:

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/client/tile.py

@@ -144,7 +144,7 @@ def arcgiscache_path(tile_coord):
 
 def bbox(tile_coord, grid):
     """
-    >>> from mapproxy.grid import tile_grid
+    >>> from mapproxy.grid.tile_grid import tile_grid
     >>> grid = tile_grid(4326, bbox=(0, -15, 10, -5))
     >>> bbox((0, 0, 0), grid)
     '0.00000000,-15.00000000,10.00000000,-5.00000000'

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/client/wms.py

@@ -16,6 +16,8 @@
 """
 WMS clients for maps and information.
 """
+from codecs import decode
+
 from mapproxy.request.base import split_mime_type
 from mapproxy.layer import InfoQuery
 from mapproxy.source import SourceError
@@ -137,7 +139,7 @@ class WMSInfoClient(object):
         if not info_format:
             # otherwise from query
             info_format = query.info_format
-        return create_featureinfo_doc(resp.read(), info_format)
+        return create_featureinfo_doc(decode(resp.read()), info_format)
 
     def _get_transformed_query(self, query):
         """

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/config/loader.py

@@ -19,7 +19,6 @@ Configuration loading and system initializing.
 from __future__ import division
 from mapproxy.util.fs import find_exec
 from mapproxy.util.yaml import load_yaml_file, YAMLError
-from mapproxy.util.ext.odict import odict
 from mapproxy.util.py import memoize
 from mapproxy.config.spec import validate_options, add_source_to_mapproxy_yaml_spec, add_service_to_mapproxy_yaml_spec
 from mapproxy.config.validator import validate
@@ -32,6 +31,7 @@ import hashlib
 import warnings
 from copy import deepcopy, copy
 from functools import partial
+from collections import OrderedDict
 
 import logging
 from urllib.parse import urlparse
@@ -74,7 +74,7 @@ class ProxyConfiguration(object):
             self.grids[grid_name] = GridConfiguration(grid_conf, context=self)
 
     def load_caches(self):
-        self.caches = odict()
+        self.caches = OrderedDict()
         caches_conf = self.configuration.get('caches')
         if not caches_conf:
             return
@@ -91,7 +91,7 @@ class ProxyConfiguration(object):
             self.sources[source_name] = SourceConfiguration.load(conf=source_conf, context=self)
 
     def load_tile_layers(self):
-        self.layers = odict()
+        self.layers = OrderedDict()
         layers_conf = deepcopy(self._layers_conf_dict())
         if layers_conf is None:
             return
@@ -178,7 +178,7 @@ class ProxyConfiguration(object):
                 # layer list without root -> wrap in root layer
                 layers_conf = dict(title=None, layers=layers_conf)
 
-        if len(set(layers_conf.keys()) &
+        if len(layers_conf.keys() &
                set('layers name title sources'.split())) < 2:
             # looks like unordered legacy config
             layers_conf = self._legacy_layers_conf_dict()
@@ -190,7 +190,7 @@ class ProxyConfiguration(object):
         Returns a dictionary with all layers that have a name and sources.
         Flattens the layer tree.
         """
-        layers = _layers if _layers is not None else odict()
+        layers = _layers if _layers is not None else OrderedDict()
 
         if 'layers' in layers_conf:
             for layer in layers_conf.pop('layers'):
@@ -245,7 +245,7 @@ def list_of_dicts_to_ordered_dict(dictlist):
     [('a', 1), ('b', 2), ('c', 3)]
     """
 
-    result = odict()
+    result = OrderedDict()
     for d in dictlist:
         for k, v in d.items():
             result[k] = v
@@ -274,7 +274,7 @@ class ConfigurationBase(object):
 class GridConfiguration(ConfigurationBase):
     @memoize
     def tile_grid(self):
-        from mapproxy.grid import tile_grid
+        from mapproxy.grid.tile_grid import tile_grid
 
         if 'base' in self.conf:
             base_grid_name = self.conf['base']
@@ -637,7 +637,7 @@ class SourceConfiguration(ConfigurationBase):
 
 
 def resolution_range(conf):
-    from mapproxy.grid import resolution_range as _resolution_range
+    from mapproxy.grid.resolutions import resolution_range as _resolution_range
     if 'min_res' in conf or 'max_res' in conf:
         return _resolution_range(min_res=conf.get('min_res'),
                                  max_res=conf.get('max_res'))
@@ -1355,9 +1355,16 @@ class CacheConfiguration(ConfigurationBase):
                                                       global_key='cache.s3.use_http_get'
                                                       )
 
+        include_grid_name = self.context.globals.get_value('cache.include_grid_name', self.conf,
+                                                      global_key='cache.s3.include_grid_name')
+
         directory_layout = self.conf['cache'].get('directory_layout', 'tms')
 
         base_path = self.conf['cache'].get('directory', None)
+
+        if include_grid_name and base_path:
+            base_path = os.path.join(base_path, grid_conf.tile_grid().name)
+
         if base_path is None:
             base_path = os.path.join(self.conf['name'], grid_conf.tile_grid().name)
 
@@ -2180,7 +2187,7 @@ class ServiceConfiguration(ConfigurationBase):
         return services
 
     def tile_layers(self, conf, use_grid_names=False):
-        layers = odict()
+        layers = OrderedDict()
         for layer_name, layer_conf in self.context.layers.items():
             for tile_layer in layer_conf.tile_layers(grid_name_as_path=use_grid_names):
                 if not tile_layer:
@@ -2230,7 +2237,7 @@ class ServiceConfiguration(ConfigurationBase):
         max_tile_age *= 60 * 60  # seconds
 
         info_formats = conf.get('featureinfo_formats', [])
-        info_formats = odict((f['suffix'], f['mimetype']) for f in info_formats)
+        info_formats = OrderedDict((f['suffix'], f['mimetype']) for f in info_formats)
 
         if kvp is None and restful is None:
             kvp = restful = True
@@ -2283,7 +2290,7 @@ class ServiceConfiguration(ConfigurationBase):
             global_key='wms.concurrent_layer_renderer')
         image_formats_names = self.context.globals.get_value('image_formats', conf,
                                                              global_key='wms.image_formats')
-        image_formats = odict()
+        image_formats = OrderedDict()
         for format in image_formats_names:
             opts = self.context.globals.image_options.image_opts({}, format)
             if opts.format in image_formats:
@@ -2325,7 +2332,7 @@ class ServiceConfiguration(ConfigurationBase):
         services = list(self.context.services.conf.keys())
         md = self.context.services.conf.get('wms', {}).get('md', {}).copy()
         md.update(conf.get('md', {}))
-        layers = odict()
+        layers = OrderedDict()
         for layer_name, layer_conf in self.context.layers.items():
             lyr = layer_conf.wms_layer()
             if lyr:
@@ -2359,7 +2366,7 @@ class ServiceConfiguration(ConfigurationBase):
                 # demo service only supports 1.1.1, use wms_111 as an indicator
                 services.append('wms_111')
 
-        layers = odict(sorted(layers.items(), key=lambda x: x[1].name))
+        layers = OrderedDict(sorted(layers.items(), key=lambda x: x[1].name))
         background = self.context.globals.get_value('background', conf)
 
         return DemoServer(

{mapproxy-4.0.2 → mapproxy-4.1.0}/mapproxy/config/spec.py

@@ -170,6 +170,7 @@ cache_types = {
         'access_control_list': str(),
         'tile_lock_dir': str(),
         'use_http_get': bool(),
+        'include_grid_name': bool(),
     }),
     'redis': combined(cache_commons, {
         'host': str(),