[Git][debian-gis-team/mapproxy][upstream] New upstream version 3.1.2+dfsg

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Wed Nov 20 17:13:46 GMT 2024



Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapproxy


Commits:
6bbe9e61 by Bas Couwenberg at 2024-11-20T18:03:02+01:00
New upstream version 3.1.2+dfsg
- - - - -


9 changed files:

- .github/workflows/dockerbuild.yml
- .github/workflows/ghpages.yml
- CHANGES.txt
- mapproxy/cache/file.py
- mapproxy/config/config-schema.json
- mapproxy/config/validator.py
- mapproxy/seed/config.py
- requirements-tests.txt
- setup.py


Changes:

=====================================
.github/workflows/dockerbuild.yml
=====================================
@@ -128,7 +128,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run trivy
-        uses: aquasecurity/trivy-action at v0.24.0
+        uses: aquasecurity/trivy-action at 0.28.0
         with:
           format: 'sarif'
           ignore-unfixed: true


=====================================
.github/workflows/ghpages.yml
=====================================
@@ -23,13 +23,13 @@ jobs:
       run: sphinx-build doc/ docs -D html_context.current_version=${{ github.ref_name }}
 
     - name: Deploy docs to folder `latest` to GitHub Pages
-      uses: JamesIves/github-pages-deploy-action at v4.6.4
+      uses: JamesIves/github-pages-deploy-action at v4.6.9
       with:
         folder: docs
         target-folder: docs/latest
 
     - name: Deploy docs to a folder named after the new tag to GitHub Pages
-      uses: JamesIves/github-pages-deploy-action at v4.6.4
+      uses: JamesIves/github-pages-deploy-action at v4.6.9
       with:
         folder: docs
         target-folder: docs/${{ github.ref_name }}
@@ -46,7 +46,7 @@ jobs:
         > config/versions.json
 
     - name: Deploy config folder to GitHub Pages
-      uses: JamesIves/github-pages-deploy-action at v4.6.4
+      uses: JamesIves/github-pages-deploy-action at v4.6.9
       with:
         folder: config
         target-folder: docs/config


=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,18 @@
+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
 ~~~~~~~~~~~~~~~~
 


=====================================
mapproxy/cache/file.py
=====================================
@@ -165,6 +165,9 @@ class FileCache(TileCacheBase):
         with tile_buffer(tile) as buf:
             log.debug('writing %r to %s' % (tile.coord, location))
             write_atomic(location, buf.read())
+            if self.file_permissions:
+                permission = int(self.file_permissions, base=8)
+                os.chmod(location, permission)
 
     def _store_single_color_tile(self, tile, tile_loc, color):
         real_tile_loc = self._single_color_tile_location(color, create_dir=True)


=====================================
mapproxy/config/config-schema.json
=====================================
@@ -769,6 +769,26 @@
               }
             }
           }
+        },
+        "metadata": {
+          "type": "array",
+          "minItems": 1,
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "url": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string"
+              },
+              "format": {
+                "type": "string"
+              }
+            },
+            "required": ["url", "type", "format"]
+          }
         }
       }
     },


=====================================
mapproxy/config/validator.py
=====================================
@@ -172,7 +172,7 @@ def _validate_tagged_layer_source(
         name: str, supported_layers: Union[str, List[str]], requested_layers: List[str]) -> List[str]:
     errors = []
     if isinstance(supported_layers, str):
-        supported_layers = [supported_layers]
+        supported_layers = supported_layers.split(',')
     if not set(requested_layers).issubset(set(supported_layers)):
         return [
             f"Supported layers for source '{name}' are '{', '.join(supported_layers)}' but tagged source requested"


=====================================
mapproxy/seed/config.py
=====================================
@@ -264,7 +264,7 @@ class ConfigurationBase(object):
         else:
             # check that all caches have the same grids configured
             last = []
-            for cache_grids in {cache.keys() for cache in caches.values()}:
+            for cache_grids in [cache.keys() for cache in caches.values()]:
                 if not last:
                     last = cache_grids
                 else:


=====================================
requirements-tests.txt
=====================================
@@ -20,7 +20,8 @@ chardet==5.2.0
 cryptography==43.0.1
 decorator==5.1.1
 docker==7.0.0
-docutils==0.20.1
+docutils==0.20.1;python_version<"3.9"
+docutils==0.21.2;python_version>="3.9"
 ecdsa==0.18.0
 flake8==7.0.0
 idna==2.9
@@ -37,10 +38,11 @@ lxml==5.3.0
 mock==5.1.0
 more-itertools==10.1.0
 moto==5.0.13
-networkx==3.1
+networkx==3.1;python_version<"3.10"
+networkx==3.4.2;python_version>="3.10"
 numpy==1.26.0;python_version>="3.9"
 numpy==1.24.0;python_version=="3.8"
-packaging==23.2
+packaging==24.2
 pluggy==1.5.0
 py==1.11.0
 pyasn1==0.5.1
@@ -55,8 +57,8 @@ python-dateutil==2.8.2
 python-jose==3.3.0
 pytz==2023.3.post1
 redis==5.0.1
-requests==2.32.2
-responses==0.24.1
+requests==2.32.3
+responses==0.25.3
 riak==2.7.0
 rsa==4.9
 s3transfer==0.10.2
@@ -65,7 +67,8 @@ soupsieve==2.6
 sshpubkeys==3.3.1
 toml==0.10.2
 urllib3==1.26.19
-waitress==2.1.2
+waitress==2.1.2;python_version<"3.10"
+waitress==3.0.1;python_version>="3.10"
 websocket-client==1.8.0
 wrapt==1.16.0
 xmltodict==0.13.0


=====================================
setup.py
=====================================
@@ -63,7 +63,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="3.1.1",
+    version="3.1.2",
     description='An accelerating proxy for tile and web map services',
     long_description=long_description(7),
     long_description_content_type='text/x-rst',



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/6bbe9e6172dc25d15342fdca08fa2bebc25bf55c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/6bbe9e6172dc25d15342fdca08fa2bebc25bf55c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20241120/431c7ffd/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list