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

Dependency version updates #140

Merged
merged 7 commits into from
Jun 10, 2023
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
12 changes: 6 additions & 6 deletions dff/context_storages/ydb.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ async def callee(session):
)
prepared_query = await session.prepare(query)

await (session.transaction(ydb.SerializableReadWrite())).execute(
await session.transaction(ydb.SerializableReadWrite()).execute(
prepared_query,
{"$queryId": str(key), "$queryContext": value.json()},
commit_tx=True,
Expand All @@ -95,7 +95,7 @@ async def callee(session):
)
prepared_query = await session.prepare(query)

result_sets = await (session.transaction(ydb.SerializableReadWrite())).execute(
result_sets = await session.transaction(ydb.SerializableReadWrite()).execute(
prepared_query,
{
"$queryId": str(key),
Expand Down Expand Up @@ -124,7 +124,7 @@ async def callee(session):
)
prepared_query = await session.prepare(query)

await (session.transaction(ydb.SerializableReadWrite())).execute(
await session.transaction(ydb.SerializableReadWrite()).execute(
prepared_query,
{"$queryId": str(key)},
commit_tx=True,
Expand All @@ -150,7 +150,7 @@ async def callee(session):
)
prepared_query = await session.prepare(query)

result_sets = await (session.transaction(ydb.SerializableReadWrite())).execute(
result_sets = await session.transaction(ydb.SerializableReadWrite()).execute(
prepared_query,
{
"$queryId": str(key),
Expand All @@ -173,7 +173,7 @@ async def callee(session):
)
prepared_query = await session.prepare(query)

result_sets = await (session.transaction(ydb.SerializableReadWrite())).execute(
result_sets = await session.transaction(ydb.SerializableReadWrite()).execute(
prepared_query,
commit_tx=True,
)
Expand All @@ -194,7 +194,7 @@ async def callee(session):
)
prepared_query = await session.prepare(query)

await (session.transaction(ydb.SerializableReadWrite())).execute(
await session.transaction(ydb.SerializableReadWrite()).execute(
prepared_query,
{},
commit_tx=True,
Expand Down
1 change: 0 additions & 1 deletion dff/pipeline/pipeline/actor.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ def __init__(
def __call__(
self, pipeline: Pipeline, ctx: Optional[Union[Context, dict, str]] = None, *args, **kwargs
) -> Union[Context, dict, str]:

# context init
ctx = self._context_init(ctx, *args, **kwargs)
self._run_handlers(ctx, pipeline, ActorStage.CONTEXT_INIT, *args, **kwargs)
Expand Down
99 changes: 49 additions & 50 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,56 +27,56 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]:


core = [
"pydantic~=1.10.7",
"nest-asyncio~=1.5.6",
"typing-extensions~=4.5.0",
"pydantic",
"nest-asyncio",
"typing-extensions",
]

async_files_dependencies = [
"aiofiles~=23.1.0",
"aiofiles",
]

redis_dependencies = [
"redis~=4.5.4",
"redis",
]

mongodb_dependencies = [
"motor~=3.1.2",
"motor",
]

_sql_dependencies = [
"sqlalchemy[asyncio]~=2.0.10",
"sqlalchemy[asyncio]",
]

sqlite_dependencies = merge_req_lists(
_sql_dependencies,
[
"aiosqlite~=0.19.0",
"aiosqlite",
],
)

mysql_dependencies = merge_req_lists(
_sql_dependencies,
[
"asyncmy~=0.2.7",
"cryptography~=40.0.2",
"asyncmy",
"cryptography",
],
)

postgresql_dependencies = merge_req_lists(
_sql_dependencies,
[
"asyncpg~=0.27.0",
"asyncpg",
],
)

ydb_dependencies = [
"ydb~=2.5.0",
"six~=1.16.0",
"ydb",
"six",
]

telegram_dependencies = [
"pytelegrambotapi~=4.5.1",
"pytelegrambotapi",
]

full = merge_req_lists(
Expand All @@ -92,30 +92,28 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]:
)

requests_requirements = [
"requests~=2.28.2",
"requests==2.31.0",
]

test_requirements = merge_req_lists(
[
"pytest~=7.3.1",
"pytest-cov~=4.0.0",
"pytest-asyncio~=0.14.0",
"flake8~=3.9.2",
"click~=8.0.4",
"black~=20.8b1",
"isort~=5.11.5",
"flask[async]~=2.2.3",
"psutil~=5.9.5",
"telethon~=1.28.5",
"anyio~=3.6.2",
"fastapi~=0.95.1",
"idna~=3.4.0",
"sniffio~=1.3.0",
"starlette~=0.26.1",
"h11~=0.14.0",
"uvicorn~=0.21.1",
"websockets~=11.0.2",
"locust~=2.15",
"pytest==7.3.1",
"pytest-cov==4.1.0",
"pytest-asyncio==0.21.0",
"flake8==6.0.0; python_version>'3.8'",
"flake8==3.9.2; python_version=='3.7'",
"click==8.1.3",
"black==23.3.0",
"isort==5.12.0; python_version>'3.8'",
"isort==5.11.5; python_version=='3.7'",
"flask[async]==2.3.2; python_version>'3.8'",
"flask[async]==2.2.3; python_version=='3.7'",
"psutil==5.9.5",
"telethon==1.28.5",
"fastapi==0.96.0",
"uvicorn==0.22.0",
"websockets==11.0.2",
"locust==2.15",
],
requests_requirements,
)
Expand All @@ -127,30 +125,31 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]:

doc = merge_req_lists(
[
"sphinx~=5.3.0",
"pydata-sphinx-theme~=0.13.3",
"sphinxcontrib-apidoc~=0.3.0",
"sphinxcontrib-httpdomain~=1.8.0",
"sphinxcontrib-katex~=0.9.0",
"sphinx-favicon~=1.0.1",
"sphinx-copybutton~=0.5.2",
"sphinx-gallery~=0.7.0",
"sphinx-autodoc-typehints~=1.23.0",
"nbsphinx~=0.9.1",
"jupytext~=1.14.5",
"jupyter~=1.0.0",
"sphinx==7.0.1; python_version>'3.8'",
"sphinx==5.3.0; python_version=='3.7'",
"pydata-sphinx-theme==0.13.3",
"sphinxcontrib-apidoc==0.3.0",
"sphinxcontrib-httpdomain==1.8.0",
"sphinxcontrib-katex==0.9.0",
"sphinx-favicon==1.0.1",
"sphinx-copybutton==0.5.2",
"sphinx-gallery==0.13.0",
"sphinx-autodoc-typehints==1.23.0",
"nbsphinx==0.9.1",
"jupytext==1.14.5",
"jupyter==1.0.0",
],
requests_requirements,
)

devel = [
"bump2version~=1.0.1",
"build~=0.7.0",
"twine~=4.0.0",
"bump2version==1.0.1",
"build==0.10.0",
"twine==4.0.0",
]

mypy_dependencies = [
"mypy~=0.950",
"mypy==1.3.0",
]

devel_full = merge_req_lists(
Expand Down
1 change: 0 additions & 1 deletion tests/script/core/test_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def test_node_creation():


def node_creation(pre_response_proc):

samples = {
"transition": [std_func, "node", ("flow", "node"), ("node", 2.0), ("flow", "node", 2.0)],
"condition": [std_func],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ def check_happy_path(self, happy_path):
data=request.json(),
catch_response=True,
) as candidate_response:

text_response = Message.parse_obj(candidate_response.json().get("response"))

if response is not None:
Expand Down