Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all patch versions (prod-2-9-advance) (patch) #1501

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11
3.13
2 changes: 2 additions & 0 deletions ci/cleanup
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ rm "$1/package-lock.json"
rm "$1/custom/requirements.txt"
rm "$1/custom/pyproject.toml"
rm "$1/custom/poetry.lock"
rm "$1/ui/package.json"
rm "$1/ui/package-lock.json"
# Upgrade files
rm "$1/.UPGRADE_INSTRUCTIONS" || true
rm "$1/.upgrade.yaml" || true
Expand Down
248 changes: 125 additions & 123 deletions custom/poetry.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions custom/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ waitress = "3.0.1"
alembic = "1.13.3"
pyramid-retry = "2.1.1"
pyramid-tm = "2.5"
sqlalchemy = "2.0.35"
sqlalchemy = "2.0.36"
transaction = "5.0"
"zope.sqlalchemy" = "3.1"
cornice = "6.1.0"
requests = "2.32.3"
psycopg2 = "2.9.9"
psycopg2 = "2.9.10"
c2cwsgiutils = { version = "6.1.1", extras = ["webserver"] }
cee-syslog-handler = "0.6.0"
PyJWT = "2.9.0"
Expand All @@ -36,12 +36,12 @@ geojson = "3.1.0"
# To fix CVE
urllib3 = { version = "2.2.3", optional = true }
certifi = { version = "2024.8.30", optional = true }
webob = { version = "1.8.8", optional = true }
cryptography = { version = "43.0.1", optional = true }
webob = { version = "1.8.9", optional = true }
cryptography = { version = "43.0.3", optional = true }

[tool.poetry.group.dev.dependencies]
prospector = { version = "1.12.0", extras = ["with_bandit", "with_mypy", "with_pyroma"] }
prospector = { version = "1.12.1", extras = ["with_bandit", "with_mypy", "with_pyroma"] }
prospector-profile-utils = "1.9.1"
prospector-profile-duplicated = "1.6.0"
types-requests = "2.32.0.20240914"
types-requests = "2.32.0.20241016"
types-oauthlib = "3.2.0.20240806"
2 changes: 1 addition & 1 deletion custom/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
poetry==1.8.3
poetry==1.8.4
cryptography>=43.0.1 # not directly required, pinned by Snyk to avoid a vulnerability
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ msgstr "Alternative Mobile Applikation"
msgid "Area"
msgstr "Fläche"

msgid "Aster copier"
msgstr ""

msgid "BS Offizieller Stadtplan farbig 1:12'500"
msgstr ""

Expand Down Expand Up @@ -334,6 +337,12 @@ msgstr "Abfrage"
msgid "SRTM"
msgstr ""

msgid "SRTM copier"
msgstr ""

msgid "SRTM shadow"
msgstr ""

msgid "Selection"
msgstr "Selektion"

Expand Down Expand Up @@ -1149,6 +1158,10 @@ msgstr "Eisenbahn"
msgid "railways_ingrp"
msgstr "Eisenbahn (in einer Gruppe)"

#, fuzzy
msgid "raster"
msgstr "ASTER"

msgid "recycling"
msgstr "Sammelstelle"

Expand All @@ -1164,6 +1177,9 @@ msgstr "Restaurant"
msgid "restricted"
msgstr "Bezirk"

msgid "restricted_group"
msgstr "Begrenzte Gruppe"

msgid "roads10"
msgstr "Straßen"

Expand Down Expand Up @@ -1422,9 +1438,6 @@ msgstr ""
#~ msgid "last_update_user"
#~ msgstr "zuletzt aktualisierter Nutzer"

#~ msgid "restricted_group"
#~ msgstr "Begrenzte Gruppe"

#, fuzzy
#~ msgid "standard application"
#~ msgstr "Desktop-Applikation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ msgstr "Alternative Mobile Application"
msgid "Area"
msgstr "Area"

msgid "Aster copier"
msgstr "Aster copy"

msgid "BS Offizieller Stadtplan farbig 1:12'500"
msgstr ""

Expand Down Expand Up @@ -335,10 +338,16 @@ msgid "Query"
msgstr "Query"

msgid "SRTM"
msgstr ""
msgstr "SRTM"

msgid "SRTM copier"
msgstr "SRTM copy"

msgid "SRTM shadow"
msgstr "SRTM shadow"

msgid "Selection"
msgstr ""
msgstr "Selection"

msgid "Share this map"
msgstr "Share this map"
Expand Down Expand Up @@ -1140,6 +1149,9 @@ msgstr "Railways"
msgid "railways_ingrp"
msgstr "Railways in group"

msgid "raster"
msgstr "Raster"

msgid "recycling"
msgstr "Recycling"

Expand All @@ -1155,6 +1167,9 @@ msgstr "Restaurant"
msgid "restricted"
msgstr "Restricted"

msgid "restricted_group"
msgstr "Restricted group"

msgid "roads10"
msgstr "Roads"

Expand Down Expand Up @@ -1459,9 +1474,6 @@ msgstr ""
#~ msgid "last_update_user"
#~ msgstr "User"

#~ msgid "restricted_group"
#~ msgstr "Restricted group"

#~ msgid "standard application"
#~ msgstr "Standard version"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ msgstr "Application mobile alternative"
msgid "Area"
msgstr "Aire"

msgid "Aster copier"
msgstr "Aster copie"

msgid "BS Offizieller Stadtplan farbig 1:12'500"
msgstr ""

Expand Down Expand Up @@ -335,6 +338,12 @@ msgstr "Interrogation"
msgid "SRTM"
msgstr "SRTM"

msgid "SRTM copier"
msgstr "SRTM copie"

msgid "SRTM shadow"
msgstr "SRTM ombre"

msgid "Selection"
msgstr "Sélection"

Expand Down Expand Up @@ -1140,6 +1149,9 @@ msgstr "Voies ferrées"
msgid "railways_ingrp"
msgstr "Voies ferrées dans groupe"

msgid "raster"
msgstr "matriciel"

msgid "recycling"
msgstr "Recyclage"

Expand All @@ -1155,6 +1167,9 @@ msgstr "Restaurants"
msgid "restricted"
msgstr "Restrain"

msgid "restricted_group"
msgstr "Restrain dans groupe"

msgid "roads10"
msgstr "Routes"

Expand Down Expand Up @@ -1469,9 +1484,6 @@ msgstr ""
#~ msgid "last_update_user"
#~ msgstr "User"

#~ msgid "restricted_group"
#~ msgstr "Restrain dans groupe"

#~ msgid "standard application"
#~ msgstr "Application bureau"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ msgstr ""
msgid "Area"
msgstr ""

msgid "Aster copier"
msgstr ""

msgid "BS Offizieller Stadtplan farbig 1:12'500"
msgstr ""

Expand Down Expand Up @@ -337,6 +340,12 @@ msgstr ""
msgid "SRTM"
msgstr ""

msgid "SRTM copier"
msgstr ""

msgid "SRTM shadow"
msgstr ""

msgid "Selection"
msgstr ""

Expand Down Expand Up @@ -1140,6 +1149,9 @@ msgstr ""
msgid "railways_ingrp"
msgstr ""

msgid "raster"
msgstr ""

msgid "recycling"
msgstr ""

Expand All @@ -1155,6 +1167,9 @@ msgstr ""
msgid "restricted"
msgstr ""

msgid "restricted_group"
msgstr ""

msgid "roads10"
msgstr ""

Expand Down
6 changes: 3 additions & 3 deletions geoportal/geomapfish_geoportal/static/story-map.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

<script
crossorigin="anonymous"
integrity="sha384-vP/z9aans6YI3BbsSTDsd8QAz2AZgddRu3zU/QGw/ojfZD6wMQdwgD8A0g81Cl5B"
integrity="sha384-Tst5eZUUqKjNJxc1yyYT4riv8EBy46MR+9CC1y/hg09jlJiNTdqWVPb3ojWK09g4"
referrerpolicy="no-referrer"
src="https://cdn.jsdelivr.net/npm/[email protected].23/dist/ol-ext.min.js"
src="https://cdn.jsdelivr.net/npm/[email protected].24/dist/ol-ext.min.js"
></script>
<link
crossorigin="anonymous"
href="https://cdn.jsdelivr.net/npm/[email protected].23/dist/ol-ext.min.css"
href="https://cdn.jsdelivr.net/npm/[email protected].24/dist/ol-ext.min.css"
integrity="sha384-Whi7nF+7F+e1FpzL960zlMNB4nMpn7JRdxDRJuedzooO5XZbg+cN+Rp1kTq6nexh"
referrerpolicy="no-referrer"
rel="stylesheet"
Expand Down
48 changes: 24 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"dependencies": {},
"devDependencies": {
"@geoblocks/proj": "0.4.10",
"@types/arcgis-rest-api": "10.4.4",
"@types/geojson": "7946.0.7",
"@types/topojson-specification": "1.0.1",
"lit": "3.2.0",
"@types/arcgis-rest-api": "10.4.8",
"@types/geojson": "7946.0.14",
"@types/topojson-specification": "1.0.5",
"lit": "3.2.1",
"moment": "2.30.1",
"ol": "7.5.2",
"rbush": "^4.0.0",
"rxjs": "7.8.1",
"typescript": "5.6.2",
"vite": "5.4.8"
"typescript": "5.6.3",
"vite": "5.4.10"
}
}
Loading