Skip to content

Commit

Permalink
Update all patch versions (2.9) (patch) (#11668)
Browse files Browse the repository at this point in the history
* Update all patch versions

* Remove no more needed type: ignore

* Fix StreamHandler stream for c2cwsgiutils

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Stéphane Brunner <[email protected]>
  • Loading branch information
renovate[bot] and sbrunner authored Jan 30, 2025
1 parent 1ff0bc3 commit cd3856d
Show file tree
Hide file tree
Showing 15 changed files with 167 additions and 168 deletions.
2 changes: 1 addition & 1 deletion admin/development.ini
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ qualname = sqlalchemy.engine

[handler_console]
class = StreamHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = DEBUG
formatter = generic

Expand Down
2 changes: 1 addition & 1 deletion commons/alembic.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = NOTSET
formatter = generic

Expand Down
4 changes: 2 additions & 2 deletions commons/c2cgeoportal_commons/models/static.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2011-2024, Camptocamp SA
# Copyright (c) 2011-2025, Camptocamp SA
# All rights reserved.

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -162,7 +162,7 @@ class User(Base): # type: ignore
temp_password: Mapped[str | None] = mapped_column(
"temp_password", Unicode, nullable=True, info={"colanderalchemy": {"exclude": True}}
)
tech_data = mapped_column(MutableDict.as_mutable(HSTORE), info={"colanderalchemy": {"exclude": True}}) # type: ignore[arg-type]
tech_data = mapped_column(MutableDict.as_mutable(HSTORE), info={"colanderalchemy": {"exclude": True}})
email: Mapped[str] = mapped_column(
Unicode,
nullable=False,
Expand Down
2 changes: 1 addition & 1 deletion commons/tests/tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ qualname = sqlalchemy.engine

[handler_console]
class = StreamHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = DEBUG
formatter = generic

Expand Down
10 changes: 5 additions & 5 deletions doc/poetry.lock

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

2 changes: 1 addition & 1 deletion doc/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Sphinx-Substitution-Extensions = { extras = ["prompt"], version = "2024.10.17" }
sphinxcontrib-mermaid = "1.0.0"
c2cwsgiutils = ">=6.0.0.dev148"
tilecloud-chain = "1.21.0"
boto3 = { version = "1.35.87", optional = true }
boto3 = { version = "1.35.99", optional = true }
jinja2 = "3.1.5"
4 changes: 2 additions & 2 deletions docker/qgisserver/acceptance-tests/alembic.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = NOTSET
formatter = generic

[handler_json]
class = c2cwsgiutils.pyramid_logging.JsonLogHandler
args = (sys.stdout,)
kwargs = {'stream': 'ext://sys.stdout'}
level = NOTSET

[formatter_generic]
Expand Down
3 changes: 1 addition & 2 deletions docker/qgisserver/logging.ini
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,12 @@ qualname = sqlalchemy.engine

[handler_console]
class = geomapfish_qgisserver.gmf_logging.LogHandler
args = ()
level = NOTSET
formatter = generic

[handler_json]
class = geomapfish_qgisserver.gmf_logging.JsonLogHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = NOTSET
formatter = generic

Expand Down
132 changes: 66 additions & 66 deletions docker/qgisserver/poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docker/qgisserver/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ authors = []

[tool.poetry.dependencies]
python = ">=3.10,<3.13"
c2cwsgiutils = { extras = ["broadcast"], version = "6.1.5" }
c2cwsgiutils = { extras = ["broadcast"], version = "6.1.7" }
papyrus = "2.6.2" # commons
transaction = "5.0" # commons
"c2c.template" = "2.4.2"
GeoAlchemy2 = "0.15.2"
SQLAlchemy = "2.0.36" # commons
SQLAlchemy = "2.0.37" # commons
"zope.event" = "5.0" # commons
"zope.sqlalchemy" = "3.1" # commons
shapely = "2.0.6"
Expand All @@ -41,5 +41,5 @@ pytz = "2024.2"
prospector = { extras = ["with_mypy", "with_bandit"], version = "1.12.1" }
prospector-profile-duplicated = "1.6.0"
prospector-profile-utils = "1.9.1"
types-pyyaml = "6.0.12.20241221"
types-pyyaml = "6.0.12.20241230"
pytest = "8.3.4"
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = NOTSET
formatter = generic

[handler_json]
class = c2cwsgiutils.pyramid_logging.JsonLogHandler
args = (sys.stdout,)
kwargs = {'stream': 'ext://sys.stdout'}
level = NOTSET

[formatter_generic]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ qualname = dogpile.cache

[handler_console]
class = StreamHandler
args = (sys.stderr,)
kwargs = {'stream': 'ext://sys.stderr'}
level = NOTSET
formatter = generic

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ services:
- '30'

redis_master:
image: bitnami/redis:7.4.1
image: bitnami/redis:7.4.2
environment:
- REDIS_REPLICATION_MODE=master
- ALLOW_EMPTY_PASSWORD=yes

redis_slave:
image: bitnami/redis:7.4.1
image: bitnami/redis:7.4.2
environment:
- REDIS_REPLICATION_MODE=slave
- REDIS_MASTER_HOST=redis_master
Expand All @@ -182,7 +182,7 @@ services:
- redis_master

redis_sentinel:
image: bitnami/redis-sentinel:7.4.1
image: bitnami/redis-sentinel:7.4.2
environment:
- REDIS_MASTER_HOST=redis_master
- REDIS_MASTER_SET=mymaster
Expand Down
Loading

0 comments on commit cd3856d

Please sign in to comment.