Skip to content

Commit 2ab7985

Browse files
committed
[DOP-23620] Update dependencies
1 parent 361140b commit 2ab7985

File tree

8 files changed

+319
-486
lines changed

8 files changed

+319
-486
lines changed

docs/reference/database/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Relation Database
55

66
SyncMaster requires relational database for storing internal data.
77

8-
Currently, SyncMaster supports only `PostgreSQL <https://www.postgresql.org/>`_ as storage for lineage entities and relations.
8+
Currently, SyncMaster supports only `PostgreSQL <https://www.postgresql.org/>`_.
99

1010
Migrations
1111
------------

docs/reference/scheduler/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Without docker
5353

5454
.. code-block:: console
5555
56-
$ pip install syncmaster[scheduler,postgres]
56+
$ pip install syncmaster[scheduler]
5757
5858
* Run scheduler process:
5959

docs/reference/scheduler/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Without docker
4949

5050
.. code-block:: console
5151
52-
$ pip install syncmaster[scheduler,postgres]
52+
$ pip install syncmaster[scheduler]
5353
5454
* Run scheduler process
5555

docs/reference/server/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Without docker
5454

5555
.. code-block:: console
5656
57-
$ pip install syncmaster[server,postgres]
57+
$ pip install syncmaster[server]
5858
5959
* Run server process
6060

docs/reference/worker/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Without docker
6868

6969
.. code-block:: console
7070
71-
$ pip install syncmaster[server,worker,postgres]
71+
$ pip install syncmaster[server,worker]
7272
7373
* Start :ref:`server` and :ref:`frontend`, create Group and Queue, get slug (e.g. ``test_queue``)
7474
* Run worker process:

poetry.lock

Lines changed: 268 additions & 429 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 44 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,29 @@ exclude = [
4848

4949
[tool.poetry.dependencies]
5050
python = "^3.11"
51-
pydantic = "^2.9.2"
52-
pydantic-settings = { version = "^2.7.1", optional = true }
53-
sqlalchemy = { version = "^2.0.35", optional = true }
51+
pydantic = "^2.11.1"
52+
pydantic-settings = { version = "^2.8.1", optional = true }
53+
sqlalchemy = { version = "^2.0.40", optional = true }
5454
sqlalchemy-utils = { version = "^0.41.2", optional = true }
55-
fastapi = { version = "^0.115", optional = true}
55+
fastapi = { version = "^0.115.12", optional = true}
5656
asgi-correlation-id = {version = "^4.3.4", optional = true}
57-
uvicorn = { version = ">=0.30.6,<0.35.0", optional = true }
58-
alembic = { version = "^1.13.2", optional = true }
57+
uvicorn = { version = "^0.34.0", optional = true }
58+
alembic = { version = "^1.15.2", optional = true }
5959
pyjwt = { version = "^2.10.1", optional = true }
60-
jinja2 = { version = "^3.1.4", optional = true }
61-
python-multipart = { version = ">=0.0.9,<0.0.21", optional = true }
62-
celery = { version = "^5.4.0", optional = true }
63-
onetl = { version = "^0.13.3", extras = ["all"], optional = true }
60+
jinja2 = { version = "^3.1.6", optional = true }
61+
python-multipart = { version = "^0.0.20", optional = true }
62+
celery = { version = "^5.5.0", optional = true }
63+
onetl = { version = "^0.13.4", extras = ["all"], optional = true }
6464
pyyaml = { version = "*", optional = true }
65-
# due to not supporting MacOS 14.x https://www.psycopg.org/psycopg3/docs/news.html#psycopg-3-1-20
66-
psycopg = { version = ">=3.1.0,<3.2.7", extras = ["binary"], optional = true }
65+
psycopg2 = { version = "^2.9.10", extras = ["binary"], optional = true }
6766
uuid6 = {version = "^2024.7.10", optional = true}
6867
coloredlogs = {version = "*", optional = true}
6968
python-json-logger = {version = "*", optional = true}
70-
asyncpg = { version = ">=0.29,<0.31", optional = true }
71-
apscheduler = { version = "^3.10.4", optional = true }
72-
starlette-exporter = {version = "^0.23.0", optional = true}
73-
itsdangerous = {version = "*", optional = true}
74-
python-keycloak = {version = ">=4.7,<6.0", optional = true}
75-
horizon-hwm-store = {version = ">=1.1.2", optional = true }
69+
asyncpg = { version = "^0.30.0", optional = true }
70+
apscheduler = { version = "^3.11.0", optional = true }
71+
starlette-exporter = { version = "^0.23.0", optional = true }
72+
python-keycloak = { version = "^5.3.1", optional = true }
73+
horizon-hwm-store = { version = "^1.1.2", optional = true }
7674

7775
[tool.poetry.extras]
7876
server = [
@@ -87,12 +85,11 @@ server = [
8785
"pyjwt",
8886
"asgi-correlation-id",
8987
"jinja2",
90-
"psycopg",
88+
"psycopg2",
9189
"uuid6",
9290
"coloredlogs",
9391
"python-json-logger",
9492
"asyncpg",
95-
"itsdangerous",
9693
"python-keycloak",
9794
"pyyaml",
9895
"celery",
@@ -106,7 +103,7 @@ worker = [
106103
"onetl",
107104
"asgi-correlation-id",
108105
"jinja2",
109-
"psycopg",
106+
"psycopg2",
110107
"uuid6",
111108
"coloredlogs",
112109
"python-json-logger",
@@ -127,47 +124,44 @@ scheduler = [
127124
]
128125

129126
[tool.poetry.group.test.dependencies]
130-
pandas-stubs = "^2.2.2.240909"
131-
pytest = "^8.3.3"
132-
httpx = "^0.27.2"
133-
pytest-asyncio = ">=0.25.1,<0.27.0"
127+
pytest = "^8.3.5"
128+
httpx = "^0.28.1"
129+
pytest-asyncio = "^0.26.0"
134130
pytest-randomly = "^3.15.0"
135131
pytest-rerunfailures = "^15.0"
136132
pytest-deadfixtures = "^2.2.1"
137133
pytest-mock = "^3.14.0"
138134
pytest-lazy-fixtures = "^1.1.1"
139-
faker = ">=33.3,<38.0"
140-
coverage = "^7.6.1"
141-
gevent = "^24.2.1"
142-
responses = "^0.25.3"
135+
faker = "^37.1.0"
136+
coverage = "^7.8.0"
137+
gevent = "^24.11.1"
138+
responses = "^0.25.7"
139+
itsdangerous = "^2.2.0"
143140

144141
[tool.poetry.group.dev.dependencies]
145-
mypy = "^1.14.1"
146-
pre-commit = ">=3.8,<5.0"
147-
black = ">=24.8,<26.0"
148-
flake8 = "^7.0.0"
142+
mypy = "^1.15.0"
143+
pre-commit = "^4.2.0"
144+
black = "^25.1.0"
145+
flake8 = "^7.2.0"
149146
flake8-pyproject = "^1.2.3"
150-
sqlalchemy = {extras = ["mypy"], version = "^2.0.35"}
147+
sqlalchemy = {extras = ["mypy"], version = "^2.0.40"}
151148

152149
[tool.poetry.group.docs.dependencies]
153-
autodoc-pydantic = {version = "^2.2.0", python = ">=3.8"}
154-
numpydoc = {version = "^1.8.0", python = ">=3.8"}
155-
sphinx = [
156-
{version = "^7.1.2", python = ">=3.8"},
157-
{version = "^7.2.6", python = ">=3.9"},
158-
]
159-
furo = {version = "^2024.8.6", python = ">=3.8"}
160-
sphinx-copybutton = {version = "^0.5.2", python = ">=3.8"}
161-
sphinxcontrib-towncrier = {version = "^0.5.0a0", python = ">=3.8"}
162-
towncrier = {version = ">=24.7", python = ">=3.8"}
163-
sphinx-issues = {version = ">=4.1,<6.0", python = ">=3.8"}
164-
sphinx-design = {version = "^0.6.1", python = ">=3.8"}
165-
sphinx-favicon = {version = "^1.0.1", python = ">=3.8"}
166-
sphinx-argparse = {version = "^0.5.2", python = ">=3.8"}
150+
autodoc-pydantic = "^2.2.0"
151+
numpydoc = "^1.8.0"
152+
sphinx = "^8.2.3"
153+
furo = "^2024.8.6"
154+
sphinx-copybutton = "^0.5.2"
155+
sphinxcontrib-towncrier = "^0.5.0a0"
156+
towncrier = "^24.8.0"
157+
sphinx-issues = "^5.0.0"
158+
sphinx-design = "^0.6.1"
159+
sphinx-favicon = "^1.0.1"
160+
sphinx-argparse = "^0.5.2"
167161
# https://github.com/mgeier/sphinx-last-updated-by-git/pull/77
168-
sphinx-last-updated-by-git = {version = "^0.3.8", python = ">=3.8"}
162+
sphinx-last-updated-by-git = "^0.3.8"
169163
# uncomment after https://github.com/zqmillet/sphinx-plantuml/pull/4
170-
# sphinx-plantuml = {version = "^1.0.0", python = ">=3.8"}
164+
# sphinx-plantuml = "^1.0.0"
171165

172166
[tool.black]
173167
line-length = 120

syncmaster/settings/database.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class DatabaseSettings(BaseModel):
4242
@property
4343
def sync_url(self) -> str:
4444
parsed_url = urlparse(self.url)
45-
# replace '+asyncpg' with '+psycopg2' in the scheme - needed for celery
46-
scheme = parsed_url.scheme.replace("+asyncpg", "+psycopg")
45+
# replace '+asyncpg' with '+psycopg2' in the scheme - used by celery
46+
scheme = parsed_url.scheme.replace("+asyncpg", "+psycopg2")
4747
sync_parsed_url = parsed_url._replace(scheme=scheme)
4848
return urlunparse(sync_parsed_url)
4949

0 commit comments

Comments
 (0)