MapProxy 3.0.0__tar.gz → 3.0.1__tar.gz

{MapProxy-3.0.0 → MapProxy-3.0.1}/CHANGES.txt

@@ -1,3 +1,12 @@
+3.0.1 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+  - Fix capabilities links in demo page and config template
+  - Trivy report format
+
+
 3.0.0 2024-08-27
 ~~~~~~~~~~~~~~~~
 

{MapProxy-3.0.0 → MapProxy-3.0.1}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 3.0.0
+Version: 3.0.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,15 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+3.0.1 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+  - Fix capabilities links in demo page and config template
+  - Trivy report format
+
+
 3.0.0 2024-08-27
 ~~~~~~~~~~~~~~~~
 
@@ -137,28 +146,6 @@ Fixes:
 - Fix mixed image format for file, S3 and azureblob caches
 
 
-2.0.0 2023-12-19
-~~~~~~~~~~~~~~~~~
-Breaking:
-
-- Removal of old unsupported python versions 3.7
-- Tested python version range is now 3.8 to 3.11
-- Lots of dependency updates
-
-Improvements:
-
-- Add S3 performance option to request via urllib2
-- Allow md5 calls to work in FIPS environments
-- Several Redis Cache enhancements
-- Coverage support for caches
-
-Fixes:
-
-- Configure image options for caches (fixes erratically white tiles when requesting multiple cached layers)
-- Fix for Legends in JSON Format
-- Some more minor fixups
-
-
 
 Older changes
 -------------

{MapProxy-3.0.0 → MapProxy-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 3.0.0
+Version: 3.0.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,15 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+3.0.1 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+  - Fix capabilities links in demo page and config template
+  - Trivy report format
+
+
 3.0.0 2024-08-27
 ~~~~~~~~~~~~~~~~
 
@@ -137,28 +146,6 @@ Fixes:
 - Fix mixed image format for file, S3 and azureblob caches
 
 
-2.0.0 2023-12-19
-~~~~~~~~~~~~~~~~~
-Breaking:
-
-- Removal of old unsupported python versions 3.7
-- Tested python version range is now 3.8 to 3.11
-- Lots of dependency updates
-
-Improvements:
-
-- Add S3 performance option to request via urllib2
-- Allow md5 calls to work in FIPS environments
-- Several Redis Cache enhancements
-- Coverage support for caches
-
-Fixes:
-
-- Configure image options for caches (fixes erratically white tiles when requesting multiple cached layers)
-- Fix for Legends in JSON Format
-- Some more minor fixups
-
-
 
 Older changes
 -------------

{MapProxy-3.0.0 → MapProxy-3.0.1}/mapproxy/config_template/base_config/mapproxy.yaml

@@ -10,7 +10,7 @@
 # Demo:
 #     http://localhost:8080/demo
 # WMS:
-#     capabilities: http://localhost:8080/service?REQUEST=GetCapabilities
+#     capabilities: http://localhost:8080/service?REQUEST=GetCapabilities&SERVICE=WMS
 # WMTS:
 #     capabilities: http://localhost:8080/wmts/1.0.0/WMTSCapabilities.xml
 #     first tile: http://localhost:8080/wmts/osm/webmercator/0/0/0.png

{MapProxy-3.0.0 → MapProxy-3.0.1}/mapproxy/service/demo.py

@@ -138,7 +138,7 @@ class DemoServer(Server):
         elif 'wmts_layer' in req.args:
             demo = self._render_wmts_template('demo/wmts_demo.html', req)
         elif 'wms_capabilities' in req.args:
-            internal_url = '%s/service?REQUEST=GetCapabilities' % (req.server_script_url)
+            internal_url = '%s/service?REQUEST=GetCapabilities&SERVICE=WMS' % (req.server_script_url)
             if 'type' in req.args and req.args['type'] == 'external':
                 url = internal_url.replace(req.server_script_url, req.script_url)
             else:
@@ -146,7 +146,7 @@ class DemoServer(Server):
             capabilities = urllib2.urlopen(url)
             demo = self._render_capabilities_template('demo/capabilities_demo.html', capabilities, 'WMS', url)
         elif 'wmsc_capabilities' in req.args:
-            internal_url = '%s/service?REQUEST=GetCapabilities&tiled=true' % (req.server_script_url)
+            internal_url = '%s/service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true' % (req.server_script_url)
             if 'type' in req.args and req.args['type'] == 'external':
                 url = internal_url.replace(req.server_script_url, req.script_url)
             else:

{MapProxy-3.0.0 → MapProxy-3.0.1}/mapproxy/service/templates/demo/demo.html

@@ -35,7 +35,7 @@ jscript_openlayers=None
             {{if 'wms' in services}}
             <div class="capabilities">
                 <span>Capabilities document</span>
-                <span><a href="../service?REQUEST=GetCapabilities">(download as xml)</a></span>
+                <span><a href="../service?REQUEST=GetCapabilities&SERVICE=WMS">(download as xml)</a></span>
                 <span><a href="../demo/?wms_capabilities">(view as html, internal)</a></span>
                 <span><a href="../demo/?wms_capabilities&type=external">(view as html, external)</a></span>
             </div>
@@ -83,7 +83,7 @@ jscript_openlayers=None
             {{if 'wms' in services}}
             <div class="capabilities">
                 <span>Capabilities document</span>
-                <span><a href="../service?REQUEST=GetCapabilities&tiled=true">(download as xml)</a></span>
+                <span><a href="../service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true">(download as xml)</a></span>
                 <span><a href="../demo/?wmsc_capabilities">(view as html, internal)</a></span>
                 <span><a href="../demo/?wmsc_capabilities&type=external">(view as html, external)</a></span>
             </div>

{MapProxy-3.0.0 → MapProxy-3.0.1}/mapproxy/test/system/test_demo.py

@@ -29,8 +29,8 @@ class TestDemo(SysTest):
     def test_basic(self, app):
         resp = app.get("/demo/", status=200)
         assert resp.content_type == "text/html"
-        assert 'href="../service?REQUEST=GetCapabilities"' in resp
-        assert 'href="../service?REQUEST=GetCapabilities&tiled=true"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true"' in resp
         assert 'href="../demo/?wmts_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
         assert 'href="../demo/?tms_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
 

{MapProxy-3.0.0 → MapProxy-3.0.1}/mapproxy/test/system/test_demo_with_extra_service.py

@@ -45,8 +45,8 @@ class TestDemoWithExtraService(SysTest):
     def test_basic(self, app):
         resp = app.get("/demo/", status=200)
         assert resp.content_type == "text/html"
-        assert 'href="../service?REQUEST=GetCapabilities"' in resp
-        assert 'href="../service?REQUEST=GetCapabilities&tiled=true"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true"' in resp
         assert 'href="../demo/?wmts_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
         assert 'href="../demo/?tms_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
         assert '<h2>My extra service</h2>' in resp

{MapProxy-3.0.0 → MapProxy-3.0.1}/setup.py

@@ -63,7 +63,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="3.0.0",
+    version="3.0.1",
     description='An accelerating proxy for tile and web map services',
     long_description=long_description(7),
     author='Oliver Tonnhofer',