From cd592bd26cc5d8434291a06c65506483a39169d6 Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Wed, 12 Jun 2024 09:08:31 +0200 Subject: [PATCH 1/2] [fixinventory][chore] Bump libs --- requirements-all.txt | 59 ++++++++++++++++++++++-------------------- requirements-extra.txt | 49 +++++++++++++++++++---------------- requirements.txt | 45 +++++++++++++++++--------------- 3 files changed, 81 insertions(+), 72 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index 3540ad8c80..018ea9855f 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -5,28 +5,29 @@ aiohttp-jinja2==1.6 aiohttp-swagger3==0.8.0 aiosignal==1.3.1 aiostream==0.6.1 +appdirs==1.4.4 apscheduler==3.10.4 asn1crypto==1.5.1 astroid==3.2.2 attrs==23.2.0 autocommand==2.2.2 azure-common==1.1.28 -azure-core==1.30.1 -azure-identity==1.16.0 +azure-core==1.30.2 +azure-identity==1.16.1 azure-mgmt-core==1.4.0 azure-mgmt-resource==23.1.1 backoff==2.2.1 -backports-tarfile==1.1.1 +backports-tarfile==1.2.0 bcrypt==4.1.3 black==24.4.2 -boto3==1.34.113 -botocore==1.34.113 +boto3==1.34.124 +botocore==1.34.124 brotli==1.1.0 build==1.2.1 cachetools==5.3.3 cattrs==23.2.3 cerberus==1.3.5 -certifi==2024.2.2 +certifi==2024.6.2 cffi==1.16.0 chardet==5.2.0 charset-normalizer==3.3.2 @@ -34,8 +35,8 @@ cheroot==10.0.1 cherrypy==18.9.0 click==8.1.7 colorama==0.4.6 -coverage[toml]==7.5.2 -cryptography==42.0.7 +coverage[toml]==7.5.3 +cryptography==42.0.8 deepdiff==7.0.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -49,19 +50,21 @@ fixdatalink[extra]==2.0.2 fixinventoryclient==2.0.1 fixinventorydata==0.2.6 flake8==7.0.0 +flexcache==0.3 +flexparser==0.3.1 frozendict==2.4.4 frozenlist==1.4.1 google-api-core==2.19.0 -google-api-python-client==2.130.0 -google-auth==2.29.0 +google-api-python-client==2.133.0 +google-auth==2.30.0 google-auth-httplib2==0.2.0 google-cloud-core==2.4.1 -google-cloud-storage==2.16.0 +google-cloud-storage==2.17.0 google-crc32c==1.5.0 -google-resumable-media==2.7.0 -googleapis-common-protos==1.63.0 +google-resumable-media==2.7.1 +googleapis-common-protos==1.63.1 httplib2==0.22.0 -hypothesis==6.102.6 +hypothesis==6.103.1 idna==3.7 importlib-metadata==7.1.0 inflect==7.2.1 @@ -76,14 +79,14 @@ jinja2==3.1.4 jmespath==1.0.1 jq==1.7.0 jsons==1.6.3 -kubernetes==29.0.0 +kubernetes==30.1.0 markdown-it-py==3.0.0 markupsafe==2.1.5 mccabe==0.7.0 mdurl==0.1.2 monotonic==1.6 -more-itertools==10.2.0 -msal==1.28.0 +more-itertools==10.3.0 +msal==1.28.1 msal-extensions==1.1.0 multidict==6.0.5 mypy==1.10.0 @@ -94,12 +97,12 @@ oauth2client==4.1.3 oauthlib==3.2.2 onelogin==2.0.4 ordered-set==4.1.0 -packaging==24.0 +packaging==24.1 paramiko==3.4.0 parsy==2.1 pathspec==0.12.1 pep8-naming==0.14.1 -pint==0.23 +pint==0.24 pip==24.0 pip-tools==7.4.1 plantuml==0.3.0 @@ -109,7 +112,7 @@ portalocker==2.8.2 portend==3.2.0 posthog==3.5.0 prometheus-client==0.20.0 -prompt-toolkit==3.0.44 +prompt-toolkit==3.0.47 proto-plus==1.23.0 protobuf==4.25.3 psutil==5.9.8 @@ -124,23 +127,23 @@ pyflakes==3.2.0 pygithub==2.3.0 pygments==2.18.0 pyjwt[crypto]==2.8.0 -pylint==3.2.2 +pylint==3.2.3 pymysql==1.1.1 pynacl==1.5.0 pyopenssl==24.1.0 pyparsing==3.1.2 pyproject-api==1.6.1 pyproject-hooks==1.1.0 -pytest==8.2.1 +pytest==8.2.2 pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-runner==6.0.1 -python-arango==7.9.1 +python-arango==8.0.0 python-dateutil==2.9.0.post0 pytz==2024.1 pyvmomi==8.0.2.0.1 pyyaml==6.0.1 -requests==2.32.2 +requests==2.32.3 requests-oauthlib==2.0.0 requests-toolbelt==1.0.0 retrying==1.3.4 @@ -150,7 +153,7 @@ rsa==4.9 s3transfer==0.10.1 setuptools==70.0.0 six==1.16.0 -slack-sdk==3.27.2 +slack-sdk==3.28.0 snowflake-connector-python==3.10.1 snowflake-sqlalchemy==1.5.3 sortedcontainers==2.4.0 @@ -160,7 +163,7 @@ tenacity==8.3.0 toml==0.10.2 tomlkit==0.12.5 toolz==0.12.1 -tox==4.15.0 +tox==4.15.1 transitions==0.9.1 typeguard==4.3.0 types-aiofiles==23.2.0.20240403 @@ -172,7 +175,7 @@ types-setuptools==70.0.0.20240524 types-six==1.16.21.20240513 types-tzlocal==5.1.0.1 types-urllib3==1.26.25.14 -typing-extensions==4.12.0 +typing-extensions==4.12.2 typish==1.9.3 tzdata==2024.1 tzlocal==5.2 @@ -186,4 +189,4 @@ wheel==0.43.0 wrapt==1.16.0 yarl==1.9.4 zc-lockfile==3.0.post1 -zipp==3.19.0 +zipp==3.19.2 diff --git a/requirements-extra.txt b/requirements-extra.txt index 85183fb1bb..ff7ed903ee 100644 --- a/requirements-extra.txt +++ b/requirements-extra.txt @@ -5,30 +5,31 @@ aiohttp-jinja2==1.6 aiohttp-swagger3==0.8.0 aiosignal==1.3.1 aiostream==0.6.1 +appdirs==1.4.4 apscheduler==3.10.4 asn1crypto==1.5.1 attrs==23.2.0 autocommand==2.2.2 azure-common==1.1.28 -azure-core==1.30.1 -azure-identity==1.16.0 +azure-core==1.30.2 +azure-identity==1.16.1 azure-mgmt-core==1.4.0 azure-mgmt-resource==23.1.1 backoff==2.2.1 -backports-tarfile==1.1.1 +backports-tarfile==1.2.0 bcrypt==4.1.3 -boto3==1.34.113 -botocore==1.34.113 +boto3==1.34.124 +botocore==1.34.124 brotli==1.1.0 cachetools==5.3.3 cattrs==23.2.3 cerberus==1.3.5 -certifi==2024.2.2 +certifi==2024.6.2 cffi==1.16.0 charset-normalizer==3.3.2 cheroot==10.0.1 cherrypy==18.9.0 -cryptography==42.0.7 +cryptography==42.0.8 deepdiff==7.0.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -39,17 +40,19 @@ fixcompliance==0.4.18 fixdatalink[extra]==2.0.2 fixinventoryclient==2.0.1 fixinventorydata==0.2.6 +flexcache==0.3 +flexparser==0.3.1 frozendict==2.4.4 frozenlist==1.4.1 google-api-core==2.19.0 -google-api-python-client==2.130.0 -google-auth==2.29.0 +google-api-python-client==2.133.0 +google-auth==2.30.0 google-auth-httplib2==0.2.0 google-cloud-core==2.4.1 -google-cloud-storage==2.16.0 +google-cloud-storage==2.17.0 google-crc32c==1.5.0 -google-resumable-media==2.7.0 -googleapis-common-protos==1.63.0 +google-resumable-media==2.7.1 +googleapis-common-protos==1.63.1 httplib2==0.22.0 idna==3.7 importlib-metadata==7.1.0 @@ -63,13 +66,13 @@ jinja2==3.1.4 jmespath==1.0.1 jq==1.7.0 jsons==1.6.3 -kubernetes==29.0.0 +kubernetes==30.1.0 markdown-it-py==3.0.0 markupsafe==2.1.5 mdurl==0.1.2 monotonic==1.6 -more-itertools==10.2.0 -msal==1.28.0 +more-itertools==10.3.0 +msal==1.28.1 msal-extensions==1.1.0 multidict==6.0.5 networkx==3.3 @@ -78,17 +81,17 @@ oauth2client==4.1.3 oauthlib==3.2.2 onelogin==2.0.4 ordered-set==4.1.0 -packaging==24.0 +packaging==24.1 paramiko==3.4.0 parsy==2.1 -pint==0.23 +pint==0.24 plantuml==0.3.0 platformdirs==4.2.2 portalocker==2.8.2 portend==3.2.0 posthog==3.5.0 prometheus-client==0.20.0 -prompt-toolkit==3.0.44 +prompt-toolkit==3.0.47 proto-plus==1.23.0 protobuf==4.25.3 psutil==5.9.8 @@ -105,12 +108,12 @@ pymysql==1.1.1 pynacl==1.5.0 pyopenssl==24.1.0 pyparsing==3.1.2 -python-arango==7.9.1 +python-arango==8.0.0 python-dateutil==2.9.0.post0 pytz==2024.1 pyvmomi==8.0.2.0.1 pyyaml==6.0.1 -requests==2.32.2 +requests==2.32.3 requests-oauthlib==2.0.0 requests-toolbelt==1.0.0 retrying==1.3.4 @@ -120,7 +123,7 @@ rsa==4.9 s3transfer==0.10.1 setuptools==70.0.0 six==1.16.0 -slack-sdk==3.27.2 +slack-sdk==3.28.0 snowflake-connector-python==3.10.1 snowflake-sqlalchemy==1.5.3 sortedcontainers==2.4.0 @@ -131,7 +134,7 @@ tomlkit==0.12.5 toolz==0.12.1 transitions==0.9.1 typeguard==4.3.0 -typing-extensions==4.12.0 +typing-extensions==4.12.2 typish==1.9.3 tzdata==2024.1 tzlocal==5.2 @@ -143,4 +146,4 @@ websocket-client==1.8.0 wrapt==1.16.0 yarl==1.9.4 zc-lockfile==3.0.post1 -zipp==3.19.0 +zipp==3.19.2 diff --git a/requirements.txt b/requirements.txt index 4626f53bb1..1d301b4683 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,29 +5,30 @@ aiohttp-jinja2==1.6 aiohttp-swagger3==0.8.0 aiosignal==1.3.1 aiostream==0.6.1 +appdirs==1.4.4 apscheduler==3.10.4 attrs==23.2.0 autocommand==2.2.2 azure-common==1.1.28 -azure-core==1.30.1 -azure-identity==1.16.0 +azure-core==1.30.2 +azure-identity==1.16.1 azure-mgmt-core==1.4.0 azure-mgmt-resource==23.1.1 backoff==2.2.1 -backports-tarfile==1.1.1 +backports-tarfile==1.2.0 bcrypt==4.1.3 -boto3==1.34.113 -botocore==1.34.113 +boto3==1.34.124 +botocore==1.34.124 brotli==1.1.0 cachetools==5.3.3 cattrs==23.2.3 cerberus==1.3.5 -certifi==2024.2.2 +certifi==2024.6.2 cffi==1.16.0 charset-normalizer==3.3.2 cheroot==10.0.1 cherrypy==18.9.0 -cryptography==42.0.7 +cryptography==42.0.8 deepdiff==7.0.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -37,13 +38,15 @@ fixcompliance==0.4.18 fixdatalink==2.0.2 fixinventoryclient==2.0.1 fixinventorydata==0.2.6 +flexcache==0.3 +flexparser==0.3.1 frozendict==2.4.4 frozenlist==1.4.1 google-api-core==2.19.0 -google-api-python-client==2.130.0 -google-auth==2.29.0 +google-api-python-client==2.133.0 +google-auth==2.30.0 google-auth-httplib2==0.2.0 -googleapis-common-protos==1.63.0 +googleapis-common-protos==1.63.1 httplib2==0.22.0 idna==3.7 importlib-metadata==7.1.0 @@ -57,13 +60,13 @@ jinja2==3.1.4 jmespath==1.0.1 jq==1.7.0 jsons==1.6.3 -kubernetes==29.0.0 +kubernetes==30.1.0 markdown-it-py==3.0.0 markupsafe==2.1.5 mdurl==0.1.2 monotonic==1.6 -more-itertools==10.2.0 -msal==1.28.0 +more-itertools==10.3.0 +msal==1.28.1 msal-extensions==1.1.0 multidict==6.0.5 networkx==3.3 @@ -71,16 +74,16 @@ oauth2client==4.1.3 oauthlib==3.2.2 onelogin==2.0.4 ordered-set==4.1.0 -packaging==24.0 +packaging==24.1 paramiko==3.4.0 parsy==2.1 -pint==0.23 +pint==0.24 plantuml==0.3.0 portalocker==2.8.2 portend==3.2.0 posthog==3.5.0 prometheus-client==0.20.0 -prompt-toolkit==3.0.44 +prompt-toolkit==3.0.47 proto-plus==1.23.0 protobuf==4.25.3 psutil==5.9.8 @@ -93,12 +96,12 @@ pygments==2.18.0 pyjwt[crypto]==2.8.0 pynacl==1.5.0 pyparsing==3.1.2 -python-arango==7.9.1 +python-arango==8.0.0 python-dateutil==2.9.0.post0 pytz==2024.1 pyvmomi==8.0.2.0.1 pyyaml==6.0.1 -requests==2.32.2 +requests==2.32.3 requests-oauthlib==2.0.0 requests-toolbelt==1.0.0 retrying==1.3.4 @@ -108,14 +111,14 @@ rsa==4.9 s3transfer==0.10.1 setuptools==70.0.0 six==1.16.0 -slack-sdk==3.27.2 +slack-sdk==3.28.0 sqlalchemy==1.4.52 tempora==5.5.1 tenacity==8.3.0 toolz==0.12.1 transitions==0.9.1 typeguard==4.3.0 -typing-extensions==4.12.0 +typing-extensions==4.12.2 typish==1.9.3 tzdata==2024.1 tzlocal==5.2 @@ -127,4 +130,4 @@ websocket-client==1.8.0 wrapt==1.16.0 yarl==1.9.4 zc-lockfile==3.0.post1 -zipp==3.19.0 +zipp==3.19.2 From fd5f77f531a46420b4d1495f7adf8d62daa51022 Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Wed, 12 Jun 2024 10:22:45 +0200 Subject: [PATCH 2/2] make mypy happy --- plugins/gcp/test/conftest.py | 5 ++--- plugins/gcp/test/random_client.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/gcp/test/conftest.py b/plugins/gcp/test/conftest.py index ffc95c6a54..15a0d333cc 100644 --- a/plugins/gcp/test/conftest.py +++ b/plugins/gcp/test/conftest.py @@ -29,9 +29,8 @@ def random_builder() -> Iterator[GraphBuilder]: feedback = CoreFeedback("test", "test", "test", Queue()) project = GcpProject(id="test") project_global_region = GcpRegion.fallback_global_region(project) - builder = GraphBuilder( - Graph(), Cloud(id="gcp"), project, AnonymousCredentials(), queue, feedback, project_global_region - ) + credentials = AnonymousCredentials() # type: ignore + builder = GraphBuilder(Graph(), Cloud(id="gcp"), project, credentials, queue, feedback, project_global_region) builder.add_node(project_global_region, {}) # add predefined regions and zones for predefined in random_predefined: diff --git a/plugins/gcp/test/random_client.py b/plugins/gcp/test/random_client.py index 625d329a1c..a05d2936d3 100644 --- a/plugins/gcp/test/random_client.py +++ b/plugins/gcp/test/random_client.py @@ -193,7 +193,7 @@ def build_random_data_client(service: str, version: str, *args: Any, **kwargs: A """ This is the random data client discovery function (replaces discovery.build in tests). """ - real_client = discovery.build(service, version, credentials=AnonymousCredentials()) + real_client = discovery.build(service, version, credentials=AnonymousCredentials()) # type: ignore root = real_client._rootDesc return RandomDataClient(service, version, root) @@ -237,7 +237,7 @@ def roundtrip( def create_node_for( clazz: Type[GcpResourceType], spec: GcpApiSpec, adapt: Callable[[Json], Json] ) -> Tuple[Json, GcpResourceType]: - client = GcpClient(AnonymousCredentials()) + client = GcpClient(AnonymousCredentials()) # type: ignore result = client.list(api_spec=spec) assert len(result) > 0 raw = adapt(result[0])