From 6281956ab025309efeec4349ff334cc34c1a7cb6 Mon Sep 17 00:00:00 2001 From: Alexander Sergeev Date: Fri, 12 May 2023 11:03:30 +0200 Subject: [PATCH] Versions freeze (#111) * versions frozen * some more versions frozeb * redis dependency update * isort dependency updated * isort minor updated * dependabot configuration action added --- .github/dependabot.yml | 29 +++++++++ dff/context_storages/redis.py | 2 +- setup.py | 108 ++++++++++++++++------------------ 3 files changed, 82 insertions(+), 57 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..e9e7c7b27 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,29 @@ +version: 2 +updates: + + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 99 + labels: + - "dependencies" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 99 + labels: + - "dependencies" + + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + open-pull-requests-limit: 99 + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-patch"] + labels: + - "dependencies" diff --git a/dff/context_storages/redis.py b/dff/context_storages/redis.py index da336def6..d2014eb89 100644 --- a/dff/context_storages/redis.py +++ b/dff/context_storages/redis.py @@ -16,7 +16,7 @@ from typing import Hashable try: - from aioredis import Redis + from redis.asyncio import Redis redis_available = True except ImportError: diff --git a/setup.py b/setup.py index 162c8046b..ee2a8ec00 100644 --- a/setup.py +++ b/setup.py @@ -27,57 +27,56 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]: core = [ - "pydantic>=1.8.2", - "nest_asyncio>=1.5.5", - "typing_extensions>=4.0.0", + "pydantic~=1.10.7", + "nest-asyncio~=1.5.6", + "typing-extensions~=4.5.0", ] async_files_dependencies = [ - "aiofiles>=22.1.0", + "aiofiles~=23.1.0", ] redis_dependencies = [ - "aioredis>=2.0.1", + "redis~=4.5.4", ] mongodb_dependencies = [ - "motor>=3.1.1", + "motor~=3.1.2", ] _sql_dependencies = [ - "sqlalchemy[asyncio]>=2.0.2", + "sqlalchemy[asyncio]~=2.0.10", ] sqlite_dependencies = merge_req_lists( _sql_dependencies, [ - "aiosqlite>=0.18.0", - "sqlalchemy[asyncio]>=1.4.27", + "aiosqlite~=0.19.0", ], ) mysql_dependencies = merge_req_lists( _sql_dependencies, [ - "asyncmy>=0.2.5", - "cryptography>=36.0.2", + "asyncmy~=0.2.7", + "cryptography~=40.0.2", ], ) postgresql_dependencies = merge_req_lists( _sql_dependencies, [ - "asyncpg>=0.27.0", + "asyncpg~=0.27.0", ], ) ydb_dependencies = [ "ydb~=2.5.0", - "six>=1.16.0", + "six~=1.16.0", ] telegram_dependencies = [ - "pytelegrambotapi==4.5.1", + "pytelegrambotapi~=4.5.1", ] full = merge_req_lists( @@ -93,29 +92,29 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]: ) requests_requirements = [ - "requests>=2.28.1", + "requests~=2.28.2", ] test_requirements = merge_req_lists( [ - "pytest >=7.2.1,<8.0.0", - "pytest-cov >=4.0.0,<5.0.0", - "pytest-asyncio >=0.14.0,<0.15.0", - "flake8 >=3.8.3,<4.0.0", - "click<=8.0.4", - "black ==20.8b1", - "isort >=5.0.6,<6.0.0", - "flask[async]>=2.1.2", - "psutil>=5.9.1", - "telethon>=1.27.0,<2.0", - "anyio>=3.6.2", - "fastapi>=0.95.1", - "idna>=3.4", - "sniffio>=1.3.0", - "starlette>=0.26.1", - "h11>=0.14.0", - "uvicorn>=0.21.1", - "websockets>=11.0", + "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", ], requests_requirements, ) @@ -127,30 +126,30 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]: doc = merge_req_lists( [ - "sphinx<6", - "pydata_sphinx_theme>=0.12.0", - "sphinxcontrib-apidoc==0.3.0", - "sphinxcontrib-httpdomain>=1.8.0", - "sphinxcontrib-katex==0.9.0", - "sphinx-favicon>=1.0.1", - "sphinx_copybutton>=0.5", - "sphinx_gallery==0.7.0", - "sphinx-autodoc-typehints>=1.19.4", - "nbsphinx>=0.8.9", - "jupytext>=1.14.1", - "jupyter>=1.0.0", + "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", ], requests_requirements, ) devel = [ - "bump2version>=1.0.1", - "build==0.7.0", - "twine==4.0.0", + "bump2version~=1.0.1", + "build~=0.7.0", + "twine~=4.0.0", ] mypy_dependencies = [ - "mypy==0.950", + "mypy~=0.950", ] devel_full = merge_req_lists( @@ -189,10 +188,7 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]: url="https://github.com/deeppavlov/dialog_flow_framework", author="Denis Kuznetsov", author_email="kuznetsov.den.p@gmail.com", - classifiers=[ # Optional - # 3 - Alpha - # 4 - Beta - # 5 - Production/Stable + classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Topic :: Software Development :: Build Tools", @@ -204,11 +200,11 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]: "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3 :: Only", ], - keywords="chatbots", # Optional - packages=find_packages(where="."), # Required + keywords="chatbots", + packages=find_packages(where="."), include_package_data=True, python_requires=">=3.7, <4", - install_requires=core, # Optional + install_requires=core, test_suite="tests", extras_require=EXTRA_DEPENDENCIES, )