From ca3c13b124c748847d7136a03080dd2802add8a2 Mon Sep 17 00:00:00 2001 From: Timofey Koolin Date: Tue, 28 Feb 2023 17:09:11 +0300 Subject: [PATCH 1/2] add six to requirements --- requirements.txt | 1 + setup.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dddc1b23..3b109a29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ packaging protobuf>3.13.0,<5.0.0 pytest==6.2.4 aiohttp==3.7.4 +six<2 \ No newline at end of file diff --git a/setup.py b/setup.py index c22f79e3..66bbf8e0 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,8 @@ "protobuf>=3.13.0", "grpcio>=1.5.0", "enum-compat>=0.0.1", - "packaging" + "packaging", + "six<2", ), options={"bdist_wheel": {"universal": True}}, extras_require={ From 5700b166af45260a192b5b7220d81a49498882b3 Mon Sep 17 00:00:00 2001 From: Timofey Koolin Date: Tue, 28 Feb 2023 17:15:47 +0300 Subject: [PATCH 2/2] add six package to requirements --- CHANGELOG.md | 1 + requirements.txt | 7 ++++--- setup.py | 15 ++++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c6c7bda..1220adc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +* Add six package to requirements * Fixed error while passing date parameter in execute ## 2.12.2 ## diff --git a/requirements.txt b/requirements.txt index 3b109a29..8ee59727 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ -grpcio==1.39.0 +aiohttp==3.7.4 +enum-compat>=0.0.1 +grpcio>=1.5.0 packaging protobuf>3.13.0,<5.0.0 pytest==6.2.4 -aiohttp==3.7.4 -six<2 \ No newline at end of file +six<2 diff --git a/setup.py b/setup.py index 66bbf8e0..574f5a1a 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,13 @@ with open("README.md", "r") as r: long_description = r.read() +with open("requirements.txt") as r: + requirements = [] + for line in r.readlines(): + line = line.strip() + if line != "": + requirements.append(line) + setuptools.setup( name="ydb", version="2.12.2", # AUTOVERSION @@ -23,13 +30,7 @@ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", ], - install_requires=( - "protobuf>=3.13.0", - "grpcio>=1.5.0", - "enum-compat>=0.0.1", - "packaging", - "six<2", - ), + install_requires=requirements, # requirements.txt options={"bdist_wheel": {"universal": True}}, extras_require={ "yc": ["yandexcloud", ],