MapProxy 4.1.2__tar.gz → 5.0.0__tar.gz

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

@@ -1,3 +1,21 @@
+5.0.0 2025-06-18
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - The dependencies lxml, shapely, pyproj, gdal and PyYAML are no longer optional
+
+Maintenance:
+
+  - By default lxml, shapely, pyproj, Pillow and PyYAML are now installed via pip and are not recommended to be installed
+    as apt packages anymore
+
+Fixes:
+
+  - The alpine image uses the python3 plugin for uwsgi correctly
+  - An lxml encoding error is fixed
+
+
 4.1.2 2025-05-27
 ~~~~~~~~~~~~~~~~
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.1.2
+Version: 5.0.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,8 @@ 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"
+Requires-Dist: lxml>=4
+Requires-Dist: shapely>=2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -59,6 +61,24 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+5.0.0 2025-06-18
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - The dependencies lxml, shapely, pyproj, gdal and PyYAML are no longer optional
+
+Maintenance:
+
+  - By default lxml, shapely, pyproj, Pillow and PyYAML are now installed via pip and are not recommended to be installed
+    as apt packages anymore
+
+Fixes:
+
+  - The alpine image uses the python3 plugin for uwsgi correctly
+  - An lxml encoding error is fixed
+
+
 4.1.2 2025-05-27
 ~~~~~~~~~~~~~~~~
 
@@ -159,20 +179,6 @@ Fixes:
   - Fixed missing dimension parameters in the `remove_tile` functions of various caches.
 
 
-3.1.3 2024-11-26
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Several dependencies for the tests and GitHub actions have been updated
-  - Spelling and grammar mistakes in the documentation corrected
-
-Fixes:
-
-  - The chmod to update file permissions is now only called if the file was freshly created
-  - A bug with clipping polygons that become multi polygons due to the clipping is now fixed
-
-
 
 Older changes
 -------------

{mapproxy-4.1.2 → mapproxy-5.0.0}/MapProxy.egg-info/requires.txt

@@ -3,6 +3,8 @@ future
 pyproj>=2
 jsonschema>=4
 werkzeug<4
+lxml>=4
+shapely>=2
 
 [:python_version == "3.10"]
 Pillow>=9

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.1.2
+Version: 5.0.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,8 @@ 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"
+Requires-Dist: lxml>=4
+Requires-Dist: shapely>=2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -59,6 +61,24 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+5.0.0 2025-06-18
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - The dependencies lxml, shapely, pyproj, gdal and PyYAML are no longer optional
+
+Maintenance:
+
+  - By default lxml, shapely, pyproj, Pillow and PyYAML are now installed via pip and are not recommended to be installed
+    as apt packages anymore
+
+Fixes:
+
+  - The alpine image uses the python3 plugin for uwsgi correctly
+  - An lxml encoding error is fixed
+
+
 4.1.2 2025-05-27
 ~~~~~~~~~~~~~~~~
 
@@ -159,20 +179,6 @@ Fixes:
   - Fixed missing dimension parameters in the `remove_tile` functions of various caches.
 
 
-3.1.3 2024-11-26
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Several dependencies for the tests and GitHub actions have been updated
-  - Spelling and grammar mistakes in the documentation corrected
-
-Fixes:
-
-  - The chmod to update file permissions is now only called if the file was freshly created
-  - A bug with clipping polygons that become multi polygons due to the clipping is now fixed
-
-
 
 Older changes
 -------------

{mapproxy-4.1.2 → mapproxy-5.0.0}/doc/install.rst

@@ -41,64 +41,22 @@ Install Dependencies
 
 MapProxy is written in Python, thus you will need a working Python installation. MapProxy works with Python 3.9 or higher, which should already be installed with most Linux distributions.
 
-MapProxy requires a few third-party libraries that are required to run. There are different ways to install each dependency. Read :ref:`dependency_details` for a list of all required and optional dependencies.
+MapProxy requires a few third-party libraries that are required to run.
 
 Installation
 ^^^^^^^^^^^^
 
 On a Debian or Ubuntu system, you need to install the following packages::
 
-  sudo apt-get install python3-pil python3-yaml python3-pyproj
+  sudo apt-get install libgeos-dev libgdal-dev libxml2-dev libxslt-dev
 
-To get all optional packages::
+Additional dependencies are installed automatically via pip when running `pip install MapProxy`. It is possible to use
+apt packages for some dependencies instead, pip will detect them if they are already installed and can be used. The apt
+packages will only work if the python version you are using is the same as the system wide installed python. The system
+packages can be quite old, so this is **not recommended**::
 
-  sudo apt-get install libgeos-dev python3-lxml libgdal-dev python3-dev python3-shapely
+  sudo apt-get install python3-dev python3-pil python3-yaml python3-pyproj python3-lxml python3-shapely
 
-.. _dependency_details:
-
-Dependency details
-^^^^^^^^^^^^^^^^^^
-
-pyproj or libproj
-~~~~~~~~~~~~~~~~~
-
-MapProxy uses the PROJ C library for all coordinate transformation tasks. MapProxy can directly use the C library or via the pyproj Python package.
-The internal API of PROJ was updated with PROJ >=5. The old PROJ 4 API is now deprecated and will be removed from future PROJ releases. MapProxy only supports the new API via pyproj and it is therefore recommended to use a recent pyproj version.
-
-
-.. versionchanged:: 1.13
-  Support for new PROJ API via pyproj.
-
-
-.. _dependencies_pil:
-
-Pillow
-~~~~~~
-Pillow, the successor of the Python Image Library (PIL), is used for the image processing and it is included in most distributions as ``python-pil`` or ``python-imaging``. Please make sure that you have Pillow installed as MapProxy is no longer compatible with the original PIL. The version of ``python-imaging`` should be >=3.1.
-
-You can install a new version of Pillow from source with::
-
-  sudo apt-get install build-essential python-dev libjpeg-dev \
-    zlib1g-dev libfreetype6-dev
-  pip install Pillow
-
-
-Shapely and GEOS *(optional)*
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-You will need Shapely to use the :doc:`coverage feature <coverages>` of MapProxy. Shapely offers Python bindings for the GEOS library. You need Shapely (``python-shapely``) and GEOS (``libgeos-dev``). You can install Shapely as a Python package with ``pip install Shapely`` if you system does not provide a recent (>= 1.8) version of Shapely.
-
-GDAL *(optional)*
-~~~~~~~~~~~~~~~~~
-The :doc:`coverage feature <coverages>` allows you to read geometries from OGR datasources (Shapefiles, PostGIS, etc.). This package is optional and only required for OGR datasource support (BBOX, WKT and GeoJSON coverages are supported natively). OGR is part of GDAL (``libgdal-dev``).
-
-.. _lxml_install:
-
-lxml *(optional)*
-~~~~~~~~~~~~~~~~~
-
-`lxml`_ is used for more advanced WMS FeatureInformation operations like XSL transformation or the concatenation of multiple XML/HTML documents. It is available as ``python-lxml``.
-
-.. _`lxml`: http://lxml.de
 
 Install MapProxy
 ----------------

{mapproxy-4.1.2 → mapproxy-5.0.0}/mapproxy/config/loader.py

@@ -749,12 +749,10 @@ class WMSSourceConfiguration(SourceConfiguration):
         return WMSLegendSource([lg_client], legend_cache, static=True)
 
     def fi_xslt_transformer(self, conf, context):
-        from mapproxy.featureinfo import XSLTransformer, has_xslt_support
+        from mapproxy.featureinfo import XSLTransformer
         fi_transformer = None
         fi_xslt = conf.get('featureinfo_xslt')
         if fi_xslt:
-            if not has_xslt_support:
-                raise ValueError('featureinfo_xslt requires lxml. Please install.')
             fi_xslt = context.globals.abspath(fi_xslt)
             fi_format = conf.get('featureinfo_out_format')
             if not fi_format:
@@ -2098,12 +2096,10 @@ class LayerConfiguration(ConfigurationBase):
 
 
 def fi_xslt_transformers(conf, context):
-    from mapproxy.featureinfo import XSLTransformer, has_xslt_support
+    from mapproxy.featureinfo import XSLTransformer
     fi_transformers = {}
     fi_xslt = conf.get('featureinfo_xslt')
     if fi_xslt:
-        if not has_xslt_support:
-            raise ValueError('featureinfo_xslt requires lxml. Please install.')
         for info_type, fi_xslt in fi_xslt.items():
             fi_xslt = context.globals.abspath(fi_xslt)
             fi_transformers[info_type] = XSLTransformer(fi_xslt)

{mapproxy-4.1.2 → mapproxy-5.0.0}/mapproxy/featureinfo.py

@@ -18,21 +18,15 @@ import copy
 import json
 
 from functools import reduce
-from io import StringIO
+from io import StringIO, BytesIO
 from typing import List, Union
 
-try:
-    from lxml import etree, html
-
-    has_xslt_support = True
-except ImportError:
-    has_xslt_support = False
-    etree = html = None
+from lxml import etree, html
 
 
 class FeatureInfoDoc(object):
     content_type = None
-    content: str = None
+    content: Union[str, bytes] = None
 
     def as_etree(self):
         raise NotImplementedError()
@@ -45,10 +39,10 @@ class TextFeatureInfoDoc(FeatureInfoDoc):
     info_type = "text"
 
     def __init__(self, content: Union[str, bytes]):
-        self.content = content if isinstance(content, str) else decode(content)
+        self.content = content
 
     def as_string(self) -> str:
-        return self.content
+        return self.content if isinstance(self.content, str) else decode(self.content)
 
     @classmethod
     def combine(cls, docs: List[FeatureInfoDoc]):
@@ -63,7 +57,7 @@ class XMLFeatureInfoDoc(FeatureInfoDoc):
 
     def __init__(self, content: Union[str, bytes]):
         if isinstance(content, (str, bytes)):
-            self.content = content if isinstance(content, str) else decode(content)
+            self.content = content
         else:
             if hasattr(content, "getroottree"):
                 content = content.getroottree()
@@ -73,7 +67,7 @@ class XMLFeatureInfoDoc(FeatureInfoDoc):
     def as_string(self):
         if self.content is None:
             self.content = self._serialize_etree()
-        return self.content
+        return self.content if isinstance(self.content, str) else decode(self.content)
 
     def as_etree(self):
         if self._etree is None:
@@ -86,7 +80,7 @@ class XMLFeatureInfoDoc(FeatureInfoDoc):
         return decode(etree.tostring(self._etree, encoding=encoding, xml_declaration=False), encoding)
 
     def _parse_content(self):
-        return etree.parse(StringIO(self.content))
+        return etree.parse(StringIO(self.content) if isinstance(self.content, str) else BytesIO(self.content))
 
     @classmethod
     def combine(cls, docs):
@@ -137,10 +131,10 @@ class JSONFeatureInfoDoc(FeatureInfoDoc):
     info_type = "json"
 
     def __init__(self, content):
-        self.content = content if isinstance(content, str) else decode(content)
+        self.content = content
 
     def as_string(self):
-        return self.content
+        return self.content if isinstance(self.content, str) else decode(self.content)
 
     @classmethod
     def combine(cls, docs):

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

@@ -11,7 +11,9 @@ install_requires = [
     '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"'
+    'Pillow>=11;python_version=="3.13"',
+    'lxml>=4',
+    'shapely>=2'
 ]
 
 
@@ -39,7 +41,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="4.1.2",
+    version="5.0.0",
     description='An accelerating proxy for tile and web map services',
     long_description=long_description(7),
     long_description_content_type='text/x-rst',