From 5b2c3a109e1339fb7485698393b8dbf475e87557 Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Sun, 21 Jan 2024 20:18:36 +0100 Subject: [PATCH 1/3] [chore] Bump libs --- pyproject.toml | 5 +- requirements-all.txt | 137 ++++++++++++++++++------------------ requirements.txt | 90 +++++++++++------------ resotodatalink/analytics.py | 8 +-- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fc2e8be..6f93229 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "resotodatalink" -version = "1.2.0" +version = "1.2.1" authors = [{name="Some Engineering Inc."}] description = "Data Pipelines for Resoto infrastructure data." license = {file="LICENSE"} @@ -32,7 +32,7 @@ dependencies = [ "resotoclient>=1.5.0", "resotolib", "rich", - "sqlalchemy>=1.4.48,<2", + "sqlalchemy", ] [project.optional-dependencies] @@ -46,7 +46,6 @@ postgres = [ "psycopg2-binary" ] # All extra dependencies extra = [ "boto3", - "urllib3 < 2", # boto3 requires urllib3 < 2 "google-cloud-storage", "pymysql", "psycopg2-binary", diff --git a/requirements-all.txt b/requirements-all.txt index be430a7..f33189f 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -1,134 +1,135 @@ aiodns==3.1.1 -aiohttp[speedups]==3.8.6 +aiohttp[speedups]==3.9.1 aiosignal==1.3.1 annotated-types==0.6.0 asn1crypto==1.5.1 -astroid==3.0.1 +astroid==3.0.2 async-timeout==4.0.3 -attrs==23.1.0 +attrs==23.2.0 autocommand==2.2.2 backoff==2.2.1 -black==23.11.0 -boto3==1.29.0 -botocore==1.32.0 +black==23.12.1 +boto3==1.34.23 +botocore==1.34.23 brotli==1.1.0 build==1.0.3 cachetools==5.3.2 -cattrs==23.1.2 -certifi==2023.7.22 +cattrs==23.2.3 +certifi==2023.11.17 cffi==1.16.0 chardet==5.2.0 -charset-normalizer==3.3.2 +charset-normalizer==2.0.12 cheroot==10.0.0 -cherrypy==18.8.0 +cherrypy==18.9.0 click==8.1.7 colorama==0.4.6 -coverage[toml]==7.3.2 -cryptography==41.0.5 +coverage[toml]==7.4.0 +cryptography==36.0.2 dill==0.3.7 -distlib==0.3.7 -exceptiongroup==1.1.3 +distlib==0.3.8 +exceptiongroup==1.2.0 filelock==3.13.1 -flake8==6.1.0 -frozendict==2.3.8 -frozenlist==1.4.0 -google-api-core==2.14.0 -google-auth==2.23.4 -google-cloud-core==2.3.3 -google-cloud-storage==2.13.0 +flake8==7.0.0 +frozendict==2.4.0 +frozenlist==1.4.1 +google-api-core==2.15.0 +google-auth==2.26.2 +google-cloud-core==2.4.1 +google-cloud-storage==2.14.0 google-crc32c==1.5.0 -google-resumable-media==2.6.0 -googleapis-common-protos==1.61.0 -hypothesis==6.88.4 -idna==3.4 +google-resumable-media==2.7.0 +googleapis-common-protos==1.62.0 +hypothesis==6.96.2 +idna==3.6 inflect==7.0.0 iniconfig==2.0.0 -isort==5.12.0 -jaraco-collections==4.3.0 +isort==5.13.2 +jaraco-collections==5.0.0 jaraco-context==4.3.0 jaraco-functools==4.0.0 -jaraco-text==3.11.1 +jaraco-text==3.12.0 jmespath==1.0.1 jsons==1.6.3 markdown-it-py==3.0.0 mccabe==0.7.0 mdurl==0.1.2 monotonic==1.6 -more-itertools==10.1.0 +more-itertools==10.2.0 multidict==6.0.4 -mypy==1.7.0 +mypy==1.8.0 mypy-extensions==1.0.0 networkx==3.2.1 -numpy==1.26.2 +numpy==1.26.3 +oscrypto==1.3.0 packaging==23.2 parsy==2.1 -pathspec==0.11.2 +pathspec==0.12.1 pep8-naming==0.13.3 -pint==0.22 +pint==0.23 pip-tools==7.3.0 -platformdirs==3.11.0 +platformdirs==4.1.0 pluggy==1.3.0 portend==3.2.0 -posthog==3.0.2 -prometheus-client==0.18.0 -protobuf==4.25.0 -psutil==5.9.6 +posthog==3.3.2 +prometheus-client==0.19.0 +protobuf==4.25.2 +psutil==5.9.8 psycopg2-binary==2.9.9 -pyarrow==14.0.1 -pyasn1==0.5.0 +pyarrow==15.0.0 +pyasn1==0.5.1 pyasn1-modules==0.3.0 pycares==4.4.0 pycodestyle==2.11.1 pycparser==2.21 -pydantic==2.5.0 -pydantic-core==2.14.1 -pyflakes==3.1.0 -pygments==2.16.1 +pycryptodomex==3.20.0 +pydantic==2.5.3 +pydantic-core==2.14.6 +pyflakes==3.2.0 +pygments==2.17.2 pyjwt==2.8.0 -pylint==3.0.2 +pylint==3.0.3 pymysql==1.1.0 -pyopenssl==23.3.0 +pyopenssl==22.0.0 pyproject-api==1.6.1 pyproject-hooks==1.0.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 +pytest==7.4.4 +pytest-asyncio==0.23.3 pytest-cov==4.1.0 -pytest-runner==6.0.0 +pytest-runner==6.0.1 python-dateutil==2.8.2 pytz==2023.3.post1 pyyaml==6.0.1 requests==2.31.0 resoto-plugin-example-collector==3.8.0 -resotoclient==1.5.0 +resotoclient==1.6.2 resotolib==3.8.0 -rich==13.6.0 +rich==13.7.0 rsa==4.9 -s3transfer==0.7.0 +s3transfer==0.10.0 six==1.16.0 -snowflake-connector-python==3.5.0 +snowflake-connector-python==2.7.9 snowflake-sqlalchemy==1.5.1 sortedcontainers==2.4.0 -sqlalchemy==1.4.50 +sqlalchemy==1.4.51 tempora==5.5.0 tomli==2.0.1 tomlkit==0.12.3 -tox==4.11.3 +tox==4.12.1 typeguard==4.1.5 -types-python-dateutil==2.8.19.14 -types-requests==2.31.0.6 -types-setuptools==68.2.0.1 -types-urllib3==1.26.25.14 -typing-extensions==4.8.0 +types-python-dateutil==2.8.19.20240106 +types-requests==2.31.0.20240106 +types-setuptools==69.0.0.20240115 +typing-extensions==4.9.0 typish==1.9.3 -tzdata==2023.3 +tzdata==2023.4 tzlocal==5.2 -urllib3==1.26.18 -virtualenv==20.24.6 -websocket-client==1.6.4 -wheel==0.41.3 -yarl==1.9.2 +urllib3==2.0.7 +virtualenv==20.25.0 +websocket-client==1.7.0 +wheel==0.42.0 +yarl==1.9.4 zc-lockfile==3.0.post1 # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 -setuptools==68.2.2 +pip==23.3.2 +setuptools==69.0.3 diff --git a/requirements.txt b/requirements.txt index ae7ca7c..2e85eb8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,92 +1,92 @@ aiodns==3.1.1 -aiohttp[speedups]==3.8.6 +aiohttp[speedups]==3.9.1 aiosignal==1.3.1 annotated-types==0.6.0 asn1crypto==1.5.1 async-timeout==4.0.3 -attrs==23.1.0 +attrs==23.2.0 autocommand==2.2.2 -boto3==1.29.0 -botocore==1.32.0 +boto3==1.34.23 +botocore==1.34.23 brotli==1.1.0 cachetools==5.3.2 -cattrs==23.1.2 -certifi==2023.7.22 +cattrs==23.2.3 +certifi==2023.11.17 cffi==1.16.0 -charset-normalizer==3.3.2 +charset-normalizer==2.0.12 cheroot==10.0.0 -cherrypy==18.8.0 -cryptography==41.0.5 -exceptiongroup==1.1.3 +cherrypy==18.9.0 +cryptography==36.0.2 +exceptiongroup==1.2.0 filelock==3.13.1 -frozendict==2.3.8 -frozenlist==1.4.0 -google-api-core==2.14.0 -google-auth==2.23.4 -google-cloud-core==2.3.3 -google-cloud-storage==2.13.0 +frozendict==2.4.0 +frozenlist==1.4.1 +google-api-core==2.15.0 +google-auth==2.26.2 +google-cloud-core==2.4.1 +google-cloud-storage==2.14.0 google-crc32c==1.5.0 -google-resumable-media==2.6.0 -googleapis-common-protos==1.61.0 -idna==3.4 +google-resumable-media==2.7.0 +googleapis-common-protos==1.62.0 +idna==3.6 inflect==7.0.0 -jaraco-collections==4.3.0 +jaraco-collections==5.0.0 jaraco-context==4.3.0 jaraco-functools==4.0.0 -jaraco-text==3.11.1 +jaraco-text==3.12.0 jmespath==1.0.1 jsons==1.6.3 markdown-it-py==3.0.0 mdurl==0.1.2 -more-itertools==10.1.0 +more-itertools==10.2.0 multidict==6.0.4 networkx==3.2.1 -numpy==1.26.2 +numpy==1.26.3 packaging==23.2 parsy==2.1 -pint==0.22 -platformdirs==3.11.0 +pint==0.23 +platformdirs==4.1.0 portend==3.2.0 -prometheus-client==0.18.0 -protobuf==4.25.0 -psutil==5.9.6 +prometheus-client==0.19.0 +protobuf==4.25.2 +psutil==5.9.8 psycopg2-binary==2.9.9 -pyarrow==14.0.1 -pyasn1==0.5.0 +pyarrow==15.0.0 +pyasn1==0.5.1 pyasn1-modules==0.3.0 pycares==4.4.0 pycparser==2.21 -pydantic==2.5.0 -pydantic-core==2.14.1 -pygments==2.16.1 +pydantic==2.5.3 +pydantic-core==2.14.6 +pygments==2.17.2 pyjwt==2.8.0 pymysql==1.1.0 -pyopenssl==23.3.0 +pyopenssl==22.0.0 python-dateutil==2.8.2 pytz==2023.3.post1 pyyaml==6.0.1 requests==2.31.0 -resotoclient==1.5.0 +resotoclient==1.6.2 resotolib==3.8.0 -rich==13.6.0 +rich==13.7.0 rsa==4.9 -s3transfer==0.7.0 +s3transfer==0.10.0 six==1.16.0 -snowflake-connector-python==3.5.0 +snowflake-connector-python==2.7.9 snowflake-sqlalchemy==1.5.1 sortedcontainers==2.4.0 -sqlalchemy==1.4.50 +sqlalchemy==1.4.51 tempora==5.5.0 tomlkit==0.12.3 typeguard==4.1.5 -typing-extensions==4.8.0 +typing-extensions==4.9.0 typish==1.9.3 -tzdata==2023.3 +tzdata==2023.4 tzlocal==5.2 -urllib3==1.26.18 -websocket-client==1.6.4 -yarl==1.9.2 +urllib3==2.0.7 +websocket-client==1.7.0 +yarl==1.9.4 zc-lockfile==3.0.post1 # The following packages are considered to be unsafe in a requirements file: -setuptools==68.2.2 +setuptools==69.0.3 diff --git a/resotodatalink/analytics.py b/resotodatalink/analytics.py index e6cd71e..d7fbe47 100644 --- a/resotodatalink/analytics.py +++ b/resotodatalink/analytics.py @@ -5,7 +5,7 @@ from typing import Union from requests import get -from posthog import Client +from posthog.client import Client log = logging.getLogger("resoto.datalink") @@ -38,7 +38,7 @@ class PosthogEventSender(AnalyticsEventSender): """ def __init__(self) -> None: - self.client = Client(host="https://analytics.some.engineering", api_key="") + self.client = Client(host="https://analytics.some.engineering", api_key="") # type: ignore self.uid = uuid.uuid4() def capture(self, kind: str, **context: Union[str, int, float]) -> None: @@ -47,7 +47,7 @@ def capture(self, kind: str, **context: Union[str, int, float]) -> None: self.client.api_key = api_key for consumer in self.client.consumers: consumer.api_key = api_key - self.client.capture( + self.client.capture( # type: ignore distinct_id=self.uid, event="datalink." + kind, properties={ @@ -59,4 +59,4 @@ def capture(self, kind: str, **context: Union[str, int, float]) -> None: ) def flush(self) -> None: - self.client.flush() + self.client.flush() # type: ignore From c37061821a38e10472998a2a3884834b4771f096 Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Sun, 21 Jan 2024 20:21:47 +0100 Subject: [PATCH 2/3] fix urllib issue --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 6f93229..26b4166 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ postgres = [ "psycopg2-binary" ] # All extra dependencies extra = [ "boto3", + "urllib3 < 2", # boto3 requires urllib3 < 2 "google-cloud-storage", "pymysql", "psycopg2-binary", From aef2ecc902a9b83a8f8d384a0a724ad126341056 Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Sun, 21 Jan 2024 20:28:03 +0100 Subject: [PATCH 3/3] fix urllib3 --- requirements-all.txt | 13 +++++++------ requirements.txt | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index f33189f..221e39f 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -18,13 +18,13 @@ cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 chardet==5.2.0 -charset-normalizer==2.0.12 +charset-normalizer==3.3.2 cheroot==10.0.0 cherrypy==18.9.0 click==8.1.7 colorama==0.4.6 coverage[toml]==7.4.0 -cryptography==36.0.2 +cryptography==40.0.2 dill==0.3.7 distlib==0.3.8 exceptiongroup==1.2.0 @@ -89,7 +89,7 @@ pygments==2.17.2 pyjwt==2.8.0 pylint==3.0.3 pymysql==1.1.0 -pyopenssl==22.0.0 +pyopenssl==23.2.0 pyproject-api==1.6.1 pyproject-hooks==1.0.0 pytest==7.4.4 @@ -107,7 +107,7 @@ rich==13.7.0 rsa==4.9 s3transfer==0.10.0 six==1.16.0 -snowflake-connector-python==2.7.9 +snowflake-connector-python==3.0.4 snowflake-sqlalchemy==1.5.1 sortedcontainers==2.4.0 sqlalchemy==1.4.51 @@ -117,13 +117,14 @@ tomlkit==0.12.3 tox==4.12.1 typeguard==4.1.5 types-python-dateutil==2.8.19.20240106 -types-requests==2.31.0.20240106 +types-requests==2.31.0.6 types-setuptools==69.0.0.20240115 +types-urllib3==1.26.25.14 typing-extensions==4.9.0 typish==1.9.3 tzdata==2023.4 tzlocal==5.2 -urllib3==2.0.7 +urllib3==1.26.18 virtualenv==20.25.0 websocket-client==1.7.0 wheel==0.42.0 diff --git a/requirements.txt b/requirements.txt index 2e85eb8..4350599 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,10 +13,10 @@ cachetools==5.3.2 cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 -charset-normalizer==2.0.12 +charset-normalizer==3.3.2 cheroot==10.0.0 cherrypy==18.9.0 -cryptography==36.0.2 +cryptography==40.0.2 exceptiongroup==1.2.0 filelock==3.13.1 frozendict==2.4.0 @@ -61,7 +61,7 @@ pydantic-core==2.14.6 pygments==2.17.2 pyjwt==2.8.0 pymysql==1.1.0 -pyopenssl==22.0.0 +pyopenssl==23.2.0 python-dateutil==2.8.2 pytz==2023.3.post1 pyyaml==6.0.1 @@ -72,7 +72,7 @@ rich==13.7.0 rsa==4.9 s3transfer==0.10.0 six==1.16.0 -snowflake-connector-python==2.7.9 +snowflake-connector-python==3.0.4 snowflake-sqlalchemy==1.5.1 sortedcontainers==2.4.0 sqlalchemy==1.4.51 @@ -83,7 +83,7 @@ typing-extensions==4.9.0 typish==1.9.3 tzdata==2023.4 tzlocal==5.2 -urllib3==2.0.7 +urllib3==1.26.18 websocket-client==1.7.0 yarl==1.9.4 zc-lockfile==3.0.post1