Skip to content

Commit 9410e98

Browse files
jose-manuel-almazajose-manuel-almaza
authored
Dependency updates (#12653)
* Run 'ddev dep updates' * Run 'ddev validate licenses --sync' * Added protobuf to IGNORED_DEPS because updated dependency version fot py2 was yanked. Keeping previous version. * protobuf version 3.17.3 when python_version < '3.0' * Updated pyyaml dependency * Rollback to 3.20.1 protobuf version for py3 * Rollback foundationdb dependency to previous version * Added foundationdb to IGNORED_DEPS * Rollback openstacksdk dependency to previous version * Added openstacksdk to IGNORED_DEPS * Rollback snmp dependency to previous version and added to IGNORED_DEPS * Fixed error in IGNORED_DEPS * Run 'ddev dep updates --sync' * Rollback pysnmp dependency to previous version and added to IGNORED_DEPS * Rollback pycryptodomex dependency to previous version and added to IGNORED_DEPS * Rollback pyasn1 dependency to previous version and added to IGNORED_DEPS * Rollback lz4 dependency to previous version and added to IGNORED_DEPS * Rollback clickhouse-driver dependency to previous version and added to IGNORED_DEPS * Rollback pyodbc dependency to previous version and added to IGNORED_DEPS * Rollback psutil dependency to previous version and added to IGNORED_DEPS * Update style dependencies to the latest versions * Rollback python2 style dependencies * Fixed 'B020 Found for loop that reassigns the iterable it is iterating with each iterable value' errors * Fixed 'B020 Found for loop that reassigns the iterable it is iterating with each iterable value' error * Fixed 'B023 Function definition does not bind loop variable 'line'' error * Fixed 'B023 Function definition does not bind loop variable 'line'' error * Fixed 'E501 line too long (121 > 120 characters)' error * Fixed 'B020 Found for loop that reassigns the iterable it is iterating with each iterable value.' error * Fixed 'B023 Function definition does not bind loop variable' error * Fixed 'E501 line too long (158 > 120 characters)' error * Fixed 'B023 Function definition does not bind loop variable' error * Fixed datadog_checks_dev style error * Improved comments about ignored deps
1 parent 052c358 commit 9410e98

44 files changed

Lines changed: 176 additions & 95 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE-3rdparty.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pycryptodomex,PyPI,BSD-2-Clause,Helder Eijs
5858
pycryptodomex,PyPI,Unlicense,Helder Eijs
5959
pydantic,PyPI,MIT,Samuel Colvin
6060
pymongo,PyPI,Apache-2.0,The MongoDB Python Team
61-
pymqi,PyPI,PSF,Dariusz Suchojad
61+
pymqi,PyPI,PSF,Zato Source s.r.o.
6262
pyodbc,PyPI,MIT,Michael Kleehammer
6363
pysmi,PyPI,BSD-3-Clause,Ilya Etingof
6464
pysnmp,PyPI,BSD-3-Clause,Ilya Etingof

‎aerospike/pyproject.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ build-backend = "hatchling.build"
99
name = "datadog-aerospike"
1010
description = "The Aerospike check"
1111
readme = "README.md"
12-
license = {text = "BSD-3-Clause"}
1312
keywords = [
1413
"datadog",
1514
"datadog agent",
@@ -35,10 +34,13 @@ dynamic = [
3534
"version",
3635
]
3736

37+
[project.license]
38+
text = "BSD-3-Clause"
39+
3840
[project.optional-dependencies]
3941
deps = [
4042
"aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'",
41-
"aerospike==6.1.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'",
43+
"aerospike==7.0.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'",
4244
]
4345

4446
[project.urls]

‎amazon_msk/pyproject.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ build-backend = "hatchling.build"
99
name = "datadog-amazon-msk"
1010
description = "The Amazon Kafka check"
1111
readme = "README.md"
12-
license = {text = "BSD-3-Clause"}
1312
keywords = [
1413
"datadog",
1514
"datadog agent",
@@ -35,10 +34,13 @@ dynamic = [
3534
"version",
3635
]
3736

37+
[project.license]
38+
text = "BSD-3-Clause"
39+
3840
[project.optional-dependencies]
3941
deps = [
4042
"boto3==1.17.112; python_version < '3.0'",
41-
"boto3==1.22.8; python_version > '3.0'",
43+
"boto3==1.24.44; python_version > '3.0'",
4244
]
4345

4446
[project.urls]

‎btrfs/pyproject.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ build-backend = "hatchling.build"
99
name = "datadog-btrfs"
1010
description = "The Btrfs check"
1111
readme = "README.md"
12-
license = {text = "BSD-3-Clause"}
1312
keywords = [
1413
"datadog",
1514
"datadog agent",
@@ -35,6 +34,9 @@ dynamic = [
3534
"version",
3635
]
3736

37+
[project.license]
38+
text = "BSD-3-Clause"
39+
3840
[project.optional-dependencies]
3941
deps = [
4042
"psutil==5.9.0",

‎clickhouse/pyproject.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ build-backend = "hatchling.build"
99
name = "datadog-clickhouse"
1010
description = "The ClickHouse check"
1111
readme = "README.md"
12-
license = {text = "BSD-3-Clause"}
1312
keywords = [
1413
"datadog",
1514
"datadog agent",
@@ -35,6 +34,9 @@ dynamic = [
3534
"version",
3635
]
3736

37+
[project.license]
38+
text = "BSD-3-Clause"
39+
3840
[project.optional-dependencies]
3941
deps = [
4042
"clickhouse-cityhash==1.0.2.3",

‎couch/datadog_checks/couch/couch.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ def _build_metrics(self, data, tags, prefix='couchdb'):
206206
for key, value in iteritems(data):
207207
if "type" in value:
208208
if value["type"] == "histogram":
209-
for metric, value in iteritems(value["value"]):
209+
for metric, histo_value in iteritems(value["value"]):
210210
if metric == "histogram":
211211
continue
212212
elif metric == "percentile":
213-
for pair in value:
213+
for pair in histo_value:
214214
self.gauge("{0}.{1}.percentile.{2}".format(prefix, key, pair[0]), pair[1], tags=tags)
215215
else:
216-
self.gauge("{0}.{1}.{2}".format(prefix, key, metric), value, tags=tags)
216+
self.gauge("{0}.{1}.{2}".format(prefix, key, metric), histo_value, tags=tags)
217217
else:
218218
self.gauge("{0}.{1}".format(prefix, key), value["value"], tags=tags)
219219
elif isinstance(value, dict):

‎datadog_checks_base/datadog_checks/base/checks/windows/perf_counters/base.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ def _query_counters(self):
6262
# Counters are lazily configured and any errors should prevent check execution
6363
exception_class = type(e)
6464
message = str(e)
65-
self.check_initializations.append(lambda: raise_exception(exception_class, message))
65+
self.check_initializations.append(
66+
lambda exception_class=exception_class, message=message: raise_exception(exception_class, message)
67+
)
6668
return
6769
except Exception as e:
6870
self.log.error('Error refreshing counters for performance object `%s`: %s', perf_object.name, e)

‎datadog_checks_base/datadog_checks/base/data/agent_requirements.in‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
adodbapi==2.6.2.0; sys_platform == 'win32'
22
aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'
3-
aerospike==6.1.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'
3+
aerospike==7.0.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'
44
aws-requests-auth==0.4.3
55
beautifulsoup4==4.11.1; python_version > '3.0'
66
beautifulsoup4==4.9.3; python_version < '3.0'
77
binary==1.0.0
88
boto3==1.17.112; python_version < '3.0'
9-
boto3==1.22.8; python_version > '3.0'
9+
boto3==1.24.44; python_version > '3.0'
1010
boto==2.49.0
1111
botocore==1.20.112; python_version < '3.0'
12-
botocore==1.25.8; python_version > '3.0'
12+
botocore==1.27.44; python_version > '3.0'
1313
cachetools==3.1.1; python_version < '3.0'
14-
cachetools==5.0.0; python_version > '3.0'
14+
cachetools==5.2.0; python_version > '3.0'
1515
clickhouse-cityhash==1.0.2.3
1616
clickhouse-driver==0.2.0; python_version < '3.0'
1717
clickhouse-driver==0.2.3; python_version > '3.0'
@@ -29,17 +29,17 @@ futures==3.3.0; python_version < '3.0'
2929
gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'
3030
gssapi==1.6.1; python_version < '3.0'
3131
gssapi==1.7.3; python_version > '3.0'
32-
immutables==0.17; python_version > '3.0'
32+
immutables==0.18; python_version > '3.0'
3333
in-toto==1.0.1
3434
ipaddress==1.0.23; python_version < '3.0'
3535
jaydebeapi==1.2.3
3636
jellyfish==0.9.0; python_version > '3.0'
3737
jpype1==0.7.0; python_version < '3.0'
38-
jpype1==1.3.0; python_version > '3.0'
38+
jpype1==1.4.0; python_version > '3.0'
3939
kafka-python==2.0.2
4040
kazoo==2.8.0
4141
kubernetes==18.20.0; python_version < '3.0'
42-
kubernetes==22.6.0; python_version > '3.0'
42+
kubernetes==24.2.0; python_version > '3.0'
4343
ldap3==2.9.1
4444
lxml==4.9.1
4545
lz4==2.2.1; python_version < '3.0'
@@ -48,8 +48,8 @@ mmh3==2.5.1; python_version < '3.0'
4848
mmh3==3.0.0; python_version > '3.0'
4949
openstacksdk==0.39.0; python_version < '3.0'
5050
openstacksdk==0.61.0; python_version > '3.0'
51-
orjson==3.6.8; python_version > '3.0'
52-
paramiko==2.10.4
51+
orjson==3.7.11; python_version > '3.0'
52+
paramiko==2.11.0
5353
ply==3.11
5454
prometheus-client==0.12.0; python_version < '3.0'
5555
prometheus-client==0.14.1; python_version > '3.0'
@@ -59,11 +59,11 @@ psutil==5.9.0
5959
psycopg2-binary==2.8.6
6060
pyasn1==0.4.6
6161
pycryptodomex==3.10.1
62-
pydantic==1.9.0; python_version > '3.0'
62+
pydantic==1.9.1; python_version > '3.0'
6363
pyjwt==1.7.1; python_version < '3.0'
6464
pyjwt==2.4.0; python_version > '3.0'
65-
pymongo[srv]==4.2; python_version >= '3.8'
66-
pymqi==1.12.0
65+
pymongo[srv]==4.2.0; python_version >= '3.8'
66+
pymqi==1.12.8
6767
pymysql==0.10.1
6868
pyodbc==4.0.32
6969
pyro4==4.82; sys_platform == 'win32'
@@ -78,32 +78,33 @@ python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0'
7878
pyvmomi==7.0.3
7979
pywin32==228; sys_platform == 'win32' and python_version < '3.0'
8080
pywin32==304; sys_platform == 'win32' and python_version > '3.0'
81-
pyyaml==5.4.1
81+
pyyaml==5.4.1; python_version < '3.0'
82+
pyyaml==6.0; python_version > '3.0'
8283
redis==3.5.3; python_version < '3.0'
83-
redis==4.2.2; python_version > '3.0'
84+
redis==4.3.4; python_version > '3.0'
8485
requests-kerberos==0.12.0; python_version < '3.0'
8586
requests-kerberos==0.14.0; python_version > '3.0'
8687
requests-ntlm==1.1.0
8788
requests-toolbelt==0.9.1
8889
requests-unixsocket==0.3.0
8990
requests==2.27.1; python_version < '3.0'
9091
requests==2.28.1; python_version > '3.0'
91-
rethinkdb==2.4.8
92+
rethinkdb==2.4.9
9293
scandir==1.10.0
9394
securesystemslib[crypto,pynacl]==0.20.1
9495
selectors34==1.2; sys_platform == 'win32' and python_version < '3.0'
9596
semver==2.13.0
9697
serpent==1.28; sys_platform == 'win32' and python_version < '3.0'
97-
serpent==1.40; sys_platform == 'win32' and python_version > '3.0'
98+
serpent==1.41; sys_platform == 'win32' and python_version > '3.0'
9899
service-identity[idna]==21.1.0
99100
simplejson==3.17.6
100101
six==1.16.0
101-
snowflake-connector-python==2.7.6; python_version > '3.0'
102+
snowflake-connector-python==2.7.11; python_version > '3.0'
102103
supervisor==4.2.4
103104
tuf==0.17.0; python_version < '3.0'
104105
tuf==0.19.0; python_version > '3.0'
105106
typing==3.10.0.0; python_version < '3.0'
106107
uptime==3.0.1
107-
vertica-python==1.0.5
108+
vertica-python==1.1.1
108109
win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'
109-
wrapt==1.14.0
110+
wrapt==1.14.1

‎datadog_checks_base/pyproject.toml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,26 @@ db = [
4141
deps = [
4242
"binary==1.0.0",
4343
"cachetools==3.1.1; python_version < '3.0'",
44-
"cachetools==5.0.0; python_version > '3.0'",
44+
"cachetools==5.2.0; python_version > '3.0'",
4545
"contextlib2==0.6.0.post1; python_version < '3.0'",
4646
"cryptography==3.3.2; python_version < '3.0'",
4747
"cryptography==3.4.8; python_version > '3.0'",
4848
"ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0'",
4949
"ddtrace==0.53.2; sys_platform != 'win32' or python_version > '3.0'",
5050
"enum34==1.1.10; python_version < '3.0'",
51-
"immutables==0.17; python_version > '3.0'",
51+
"immutables==0.18; python_version > '3.0'",
5252
"ipaddress==1.0.23; python_version < '3.0'",
5353
"jellyfish==0.9.0; python_version > '3.0'",
5454
"prometheus-client==0.12.0; python_version < '3.0'",
5555
"prometheus-client==0.14.1; python_version > '3.0'",
5656
"protobuf==3.17.3; python_version < '3.0'",
5757
"protobuf==3.20.1; python_version > '3.0'",
58-
"pydantic==1.9.0; python_version > '3.0'",
58+
"pydantic==1.9.1; python_version > '3.0'",
5959
"python-dateutil==2.8.2",
6060
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
6161
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
62-
"pyyaml==5.4.1",
62+
"pyyaml==5.4.1; python_version < '3.0'",
63+
"pyyaml==6.0; python_version > '3.0'",
6364
"requests-toolbelt==0.9.1",
6465
"requests-unixsocket==0.3.0",
6566
"requests==2.27.1; python_version < '3.0'",
@@ -68,12 +69,12 @@ deps = [
6869
"six==1.16.0",
6970
"typing==3.10.0.0; python_version < '3.0'",
7071
"uptime==3.0.1",
71-
"wrapt==1.14.0",
72+
"wrapt==1.14.1",
7273
]
7374
http = [
7475
"aws-requests-auth==0.4.3",
7576
"botocore==1.20.112; python_version < '3.0'",
76-
"botocore==1.25.8; python_version > '3.0'",
77+
"botocore==1.27.44; python_version > '3.0'",
7778
"pyjwt==1.7.1; python_version < '3.0'",
7879
"pyjwt==2.4.0; python_version > '3.0'",
7980
"pysocks==1.7.1",
@@ -83,11 +84,11 @@ http = [
8384
"win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'",
8485
]
8586
json = [
86-
"orjson==3.6.8; python_version > '3.0'",
87+
"orjson==3.7.11; python_version > '3.0'",
8788
]
8889
kube = [
8990
"kubernetes==18.20.0; python_version < '3.0'",
90-
"kubernetes==22.6.0; python_version > '3.0'",
91+
"kubernetes==24.2.0; python_version > '3.0'",
9192
]
9293

9394
[project.urls]

‎datadog_checks_dev/datadog_checks/dev/plugin/tox.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@
2020
# Style deps:
2121
# We pin deps in order to make CI more stable/reliable.
2222
ISORT_DEP = 'isort==5.10.1'
23-
BLACK_DEP = 'black==22.3.0'
24-
FLAKE8_DEP = 'flake8==4.0.1'
25-
FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.1.11'
26-
FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format==0.6.0'
23+
BLACK_DEP = 'black==22.6.0'
24+
FLAKE8_DEP = 'flake8==5.0.3'
25+
FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.7.1'
26+
# TODO: update when fix is released https://github.com/globality-corp/flake8-logging-format/pull/33
27+
FLAKE8_LOGGING_FORMAT_DEP = (
28+
'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git'
29+
'@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6 '
30+
)
2731
# TODO: remove extra when we drop Python 2
2832
MYPY_DEP = 'mypy[python2]==0.910'
2933
# TODO: when we drop Python 2 and replace with --install-types --non-interactive
@@ -34,7 +38,7 @@
3438
'types_six==1.16.2',
3539
'types-simplejson==3.17.5',
3640
]
37-
PYDANTIC_DEP = 'pydantic==1.8.2' # Keep in sync with: /datadog_checks_base/requirements.in
41+
PYDANTIC_DEP = 'pydantic==1.9.1' # Keep in sync with: /datadog_checks_base/requirements.in
3842

3943

4044
@tox.hookimpl

0 commit comments

Comments
 (0)
⚡