Skip to content

Commit

Permalink
Update CI dependencies (master) (minor) (#9548)
Browse files Browse the repository at this point in the history
* Update CI dependencies

* Apply pre-commit fix

From the artifact of the previous workflow run

* Update the OGC server Name

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: geo-ghci-int[bot] <146321879+geo-ghci-int[bot]@users.noreply.github.com>
Co-authored-by: Stéphane Brunner <[email protected]>
  • Loading branch information
3 people authored Dec 3, 2024
1 parent 64b870b commit 2492f9f
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 71 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ repos:
hooks:
- id: prettier
additional_dependencies:
- prettier@3.3.3 # npm
- prettier@3.4.1 # npm
- [email protected] # npm
- [email protected] # npm
- '@prettier/[email protected]' # npm
Expand Down Expand Up @@ -70,7 +70,7 @@ repos:
hooks:
- id: git-check
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.4
rev: 0.30.0
hooks:
- id: check-github-workflows
- id: check-renovate
Expand Down Expand Up @@ -131,7 +131,7 @@ repos:
- id: copyright
- id: workflows-require-timeout
- repo: https://github.com/sbrunner/jsonschema-validator
rev: 0.1.0
rev: 0.3.2
hooks:
- id: jsonschema-validator
files: ^ci/config\.yaml$
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
c2cciutils[checks]==1.7.0
wheel==0.44.0
wheel==0.45.1
pre-commit==4.0.1
2 changes: 1 addition & 1 deletion contribs/gmf/examples/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const MAPSERVER_WFS_FEATURE_NS = 'http://mapserver.gis.umn.edu/mapserver';
*
* @type {string}
*/
export const MAPSERVER_PROXY = `${GMF_DEMO}mapserv_proxy?ogcserver=Main+PNG`;
export const MAPSERVER_PROXY = `${GMF_DEMO}mapserv_proxy?ogcserver=MapServer`;

/**
* MapServer proxy
Expand Down
10 changes: 5 additions & 5 deletions contribs/gmf/test/spec/classes/legendmapfishprintv3.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
{
'name': 'post_office',
'icons': [
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
],
},
],
Expand Down Expand Up @@ -159,7 +159,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
{
'name': 'post_office',
'icons': [
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
],
},
],
Expand Down Expand Up @@ -222,13 +222,13 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
{
'name': 'sustenance',
'icons': [
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=sustenance&SCALE=25000',
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=sustenance&SCALE=25000',
],
},
{
'name': 'entertainment',
'icons': [
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=entertainment&SCALE=25000',
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=entertainment&SCALE=25000',
],
},
],
Expand All @@ -251,7 +251,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
{
'name': 'fuel',
'icons': [
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=fuel&SCALE=25000',
'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=fuel&SCALE=25000',
],
},
],
Expand Down
Loading

0 comments on commit 2492f9f

Please sign in to comment.