add types and limit aiostream update

someengineering · Oct 5, 2023 · bc354c9 · bc354c9
1 parent 26ee147
commit bc354c9
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 35 deletions.
diff --git a/requirements-all.txt b/requirements-all.txt
@@ -4,7 +4,7 @@ aiohttp[speedups]==3.8.5
 aiohttp-jinja2==1.5.1
 aiohttp-swagger3==0.7.4
 aiosignal==1.3.1
-aiostream==0.5.1
+aiostream==0.4.5
 annotated-types==0.5.0
 apscheduler==3.10.4
 asn1crypto==1.5.1
@@ -20,8 +20,8 @@ azure-mgmt-resource==23.0.1
 backoff==2.2.1
 bcrypt==4.0.1
 black==23.9.1
-boto3==1.28.59
-botocore==1.31.59
+boto3==1.28.60
+botocore==1.31.60
 brotli==1.1.0
 build==1.0.3
 cachetools==5.3.1
@@ -37,7 +37,7 @@ click==8.1.7
 colorama==0.4.6
 coverage[toml]==7.3.2
 cryptography==41.0.4
-deepdiff==6.5.0
+deepdiff==6.6.0
 defusedxml==0.7.1
 deprecated==1.2.14
 dill==0.3.7
@@ -107,7 +107,7 @@ portend==3.2.0
 posthog==3.0.2
 prometheus-client==0.17.1
 prompt-toolkit==3.0.39
-protobuf==4.24.3
+protobuf==4.24.4
 psutil==5.9.5
 psycopg2-binary==2.9.9
 pyarrow==13.0.0
@@ -166,10 +166,18 @@ toolz==0.12.0
 tox==4.11.3
 transitions==0.9.0
 typeguard==4.1.5
+types-aiofiles==23.2.0.0
+types-python-dateutil==2.8.19.14
+types-pytz==2023.3.1.1
+types-pyyaml==6.0.12.12
+types-requests==2.31.0.6
+types-setuptools==68.2.0.0
+types-tzlocal==5.1.0.0
+types-urllib3==1.26.25.14
 typing-extensions==4.8.0
 typish==1.9.3
 tzdata==2023.3
-tzlocal==5.0.1
+tzlocal==5.1
 uritemplate==4.1.1
 urllib3==1.26.17
 ustache==0.1.5
@@ -181,6 +189,3 @@ wrapt==1.15.0
 yarl==1.9.2
 zc-lockfile==3.0.post1
 zipp==3.17.0
-
-# FIX: 2.31.0.7 depends on urllib3>=2 which is wrong
-types-requests==2.31.0.6
diff --git a/requirements-extra.txt b/requirements-extra.txt
@@ -4,7 +4,7 @@ aiohttp[speedups]==3.8.5
 aiohttp-jinja2==1.5.1
 aiohttp-swagger3==0.7.4
 aiosignal==1.3.1
-aiostream==0.5.1
+aiostream==0.4.5
 annotated-types==0.5.0
 apscheduler==3.10.4
 asn1crypto==1.5.1
@@ -18,8 +18,8 @@ azure-mgmt-core==1.4.0
 azure-mgmt-resource==23.0.1
 backoff==2.2.1
 bcrypt==4.0.1
-boto3==1.28.59
-botocore==1.31.59
+boto3==1.28.60
+botocore==1.31.60
 brotli==1.1.0
 cachetools==5.3.1
 cattrs==23.1.2
@@ -30,7 +30,7 @@ charset-normalizer==3.3.0
 cheroot==10.0.0
 cherrypy==18.8.0
 cryptography==41.0.4
-deepdiff==6.5.0
+deepdiff==6.6.0
 defusedxml==0.7.1
 deprecated==1.2.14
 fastjsonschema==2.16.3
@@ -86,7 +86,7 @@ portend==3.2.0
 posthog==3.0.2
 prometheus-client==0.17.1
 prompt-toolkit==3.0.39
-protobuf==4.24.3
+protobuf==4.24.4
 psutil==5.9.5
 psycopg2-binary==2.9.9
 pyarrow==13.0.0
@@ -137,7 +137,7 @@ typeguard==4.1.5
 typing-extensions==4.8.0
 typish==1.9.3
 tzdata==2023.3
-tzlocal==5.0.1
+tzlocal==5.1
 uritemplate==4.1.1
 urllib3==1.26.17
 ustache==0.1.5

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -4,7 +4,7 @@ aiohttp[speedups]==3.8.5
 aiohttp-jinja2==1.5.1
 aiohttp-swagger3==0.7.4
 aiosignal==1.3.1
-aiostream==0.5.1
+aiostream==0.4.5
 annotated-types==0.5.0
 apscheduler==3.10.4
 astroid==3.0.0
@@ -19,8 +19,8 @@ azure-mgmt-resource==23.0.1
 backoff==2.2.1
 bcrypt==4.0.1
 black==23.9.1
-boto3==1.28.59
-botocore==1.31.59
+boto3==1.28.60
+botocore==1.31.60
 brotli==1.1.0
 build==1.0.3
 cachetools==5.3.1
@@ -36,11 +36,12 @@ click==8.1.7
 colorama==0.4.6
 coverage[toml]==7.3.2
 cryptography==41.0.4
-deepdiff==6.5.0
+deepdiff==6.6.0
 defusedxml==0.7.1
 deprecated==1.2.14
 dill==0.3.7
 distlib==0.3.7
+docutils==0.20.1
 fastjsonschema==2.16.3
 filelock==3.12.4
 flake8==6.1.0
@@ -100,7 +101,7 @@ portend==3.2.0
 posthog==3.0.2
 prometheus-client==0.17.1
 prompt-toolkit==3.0.39
-protobuf==4.24.3
+protobuf==4.24.4
 psutil==5.9.5
 pyasn1==0.5.0
 pyasn1-modules==0.3.0
@@ -152,10 +153,17 @@ toolz==0.12.0
 tox==4.11.3
 transitions==0.9.0
 typeguard==4.1.5
+types-aiofiles==23.2.0.0
+types-python-dateutil==2.8.19.14
+types-pytz==2023.3.1.1
+types-pyyaml==6.0.12.12
+types-requests==2.31.0.6
+types-setuptools==68.2.0.0
+types-tzlocal==5.1.0.0
 typing-extensions==4.8.0
 typish==1.9.3
 tzdata==2023.3
-tzlocal==5.0.1
+tzlocal==5.1
 uritemplate==4.1.1
 urllib3==1.26.17
 ustache==0.1.5
@@ -167,6 +175,3 @@ wrapt==1.15.0
 yarl==1.9.2
 zc-lockfile==3.0.post1
 zipp==3.17.0
-
-# FIX: 2.31.0.7 depends on urllib3>=2 which is wrong
-types-requests==2.31.0.6
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ aiohttp[speedups]==3.8.5
 aiohttp-jinja2==1.5.1
 aiohttp-swagger3==0.7.4
 aiosignal==1.3.1
-aiostream==0.5.1
+aiostream==0.4.5
 annotated-types==0.5.0
 apscheduler==3.10.4
 async-timeout==4.0.3
@@ -17,8 +17,8 @@ azure-mgmt-core==1.4.0
 azure-mgmt-resource==23.0.1
 backoff==2.2.1
 bcrypt==4.0.1
-boto3==1.28.59
-botocore==1.31.59
+boto3==1.28.60
+botocore==1.31.60
 brotli==1.1.0
 cachetools==5.3.1
 cattrs==23.1.2
@@ -29,7 +29,7 @@ charset-normalizer==3.3.0
 cheroot==10.0.0
 cherrypy==18.8.0
 cryptography==41.0.4
-deepdiff==6.5.0
+deepdiff==6.6.0
 defusedxml==0.7.1
 deprecated==1.2.14
 fastjsonschema==2.16.3
@@ -77,7 +77,7 @@ portend==3.2.0
 posthog==3.0.2
 prometheus-client==0.17.1
 prompt-toolkit==3.0.39
-protobuf==4.24.3
+protobuf==4.24.4
 psutil==5.9.5
 pyasn1==0.5.0
 pyasn1-modules==0.3.0
@@ -119,7 +119,7 @@ typeguard==4.1.5
 typing-extensions==4.8.0
 typish==1.9.3
 tzdata==2023.3
-tzlocal==5.0.1
+tzlocal==5.1
 uritemplate==4.1.1
 urllib3==1.26.17
 ustache==0.1.5

diff --git a/resotocore/.pylintrc b/resotocore/.pylintrc
@@ -80,7 +80,9 @@ disable=
     too-many-nested-blocks,
     not-an-iterable,
     too-many-instance-attributes,
-    too-many-ancestors
+    too-many-ancestors,
+    duplicate-code,
+    cyclic-import
 
 
 [REPORTS]

diff --git a/resotocore/pyproject.toml b/resotocore/pyproject.toml
@@ -35,7 +35,7 @@ dependencies = [
     "aiohttp-jinja2",
     "aiohttp-swagger3",
     "aiohttp[speedups]",
-    "aiostream",
+    "aiostream < 0.5", # TODO: aiostream 0.5 introduces type parameters - need to be supported by mypy
     "cryptography",
     "deepdiff",
     "frozendict",
@@ -76,6 +76,7 @@ test = [
     "resotoclient>=1.5.0",
     "toml",
     "tox",
+    "types-aiofiles",
 ]
 
 

diff --git a/resotolib/pyproject.toml b/resotolib/pyproject.toml
@@ -1,9 +1,9 @@
 [project]
 name = "resotolib"
 version = "3.8.1"
-authors = [{name="Some Engineering Inc."}]
+authors = [{ name = "Some Engineering Inc." }]
 description = "Resoto common library."
-license = { text="AGPLv3" }
+license = { text = "AGPLv3" }
 requires-python = ">=3.9"
 classifiers = [
     # Current project status
@@ -24,7 +24,7 @@ classifiers = [
     "Topic :: Security",
     "Topic :: Utilities",
 ]
-readme = {file="README.md", content-type="text/markdown"}
+readme = { file = "README.md", content-type = "text/markdown" }
 keywords = ["cloud security"]
 
 dependencies = [
@@ -64,6 +64,12 @@ test = [
     "pytest-cov",
     "pytest-runner",
     "tox",
+    "types-PyYAML",
+    "types-python-dateutil",
+    "types-pytz",
+    "types-requests",
+    "types-setuptools",
+    "types-tzlocal",
     "wheel",
 ]