Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates #12653

Merged
merged 38 commits into from
Aug 5, 2022
Merged

Dependency updates #12653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
571fe94
Run 'ddev dep updates'
jose-manuel-almaza Aug 2, 2022
6cd9266
Run 'ddev validate licenses --sync'
jose-manuel-almaza Aug 2, 2022
c9868c3
Added protobuf to IGNORED_DEPS because updated dependency version fot…
jose-manuel-almaza Aug 2, 2022
1cabf87
protobuf version 3.17.3 when python_version < '3.0'
jose-manuel-almaza Aug 2, 2022
0414fc5
Updated pyyaml dependency
jose-manuel-almaza Aug 2, 2022
2f530c9
Rollback to 3.20.1 protobuf version for py3
jose-manuel-almaza Aug 2, 2022
96fb4ae
Rollback foundationdb dependency to previous version
jose-manuel-almaza Aug 2, 2022
b82d470
Added foundationdb to IGNORED_DEPS
jose-manuel-almaza Aug 2, 2022
ea42960
Merge branch 'master' into jose/update-dependencies-for-release
jose-manuel-almaza Aug 2, 2022
9e4bd33
Rollback openstacksdk dependency to previous version
jose-manuel-almaza Aug 2, 2022
96280bb
Added openstacksdk to IGNORED_DEPS
jose-manuel-almaza Aug 2, 2022
f6d35b0
Rollback snmp dependency to previous version and added to IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
94e4c02
Fixed error in IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
9bc4050
Run 'ddev dep updates --sync'
jose-manuel-almaza Aug 3, 2022
6a9a646
Rollback pysnmp dependency to previous version and added to IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
cbf4ec2
Rollback pycryptodomex dependency to previous version and added to IG…
jose-manuel-almaza Aug 3, 2022
91494e2
Rollback pyasn1 dependency to previous version and added to IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
cde5313
Rollback lz4 dependency to previous version and added to IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
6dfc246
Rollback clickhouse-driver dependency to previous version and added t…
jose-manuel-almaza Aug 3, 2022
15a3965
Merge branch 'master' into jose/update-dependencies-for-release
jose-manuel-almaza Aug 3, 2022
90a69ee
Rollback pyodbc dependency to previous version and added to IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
d82a9cc
Rollback psutil dependency to previous version and added to IGNORED_DEPS
jose-manuel-almaza Aug 3, 2022
b4fb1bd
Update style dependencies to the latest versions
jose-manuel-almaza Aug 3, 2022
d957cf3
Rollback python2 style dependencies
jose-manuel-almaza Aug 3, 2022
c1b9b77
Fixed 'B020 Found for loop that reassigns the iterable it is iteratin…
jose-manuel-almaza Aug 4, 2022
5d3ecfe
Fixed 'B020 Found for loop that reassigns the iterable it is iteratin…
jose-manuel-almaza Aug 4, 2022
f2e2e89
Fixed 'B023 Function definition does not bind loop variable 'line'' e…
jose-manuel-almaza Aug 4, 2022
1028129
Fixed 'B023 Function definition does not bind loop variable 'line'' e…
jose-manuel-almaza Aug 4, 2022
f13c5a6
Fixed 'E501 line too long (121 > 120 characters)' error
jose-manuel-almaza Aug 4, 2022
03aeb96
Fixed 'B020 Found for loop that reassigns the iterable it is iteratin…
jose-manuel-almaza Aug 4, 2022
d1a6347
Fixed 'B023 Function definition does not bind loop variable' error
jose-manuel-almaza Aug 4, 2022
8f3d150
Fixed 'E501 line too long (158 > 120 characters)' error
jose-manuel-almaza Aug 4, 2022
b876d20
Fixed 'B023 Function definition does not bind loop variable' error
jose-manuel-almaza Aug 4, 2022
aac4978
Fixed datadog_checks_dev style error
jose-manuel-almaza Aug 4, 2022
8f12536
Merge branch 'master' into jose/update-dependencies-for-release
jose-manuel-almaza Aug 4, 2022
f104792
Improved comments about ignored deps
jose-manuel-almaza Aug 4, 2022
9d63c0f
Merge branch 'master' into jose/update-dependencies-for-release
jose-manuel-almaza Aug 4, 2022
0e920a3
Merge branch 'master' into jose/update-dependencies-for-release
jose-manuel-almaza Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pycryptodomex,PyPI,BSD-2-Clause,Helder Eijs
pycryptodomex,PyPI,Unlicense,Helder Eijs
pydantic,PyPI,MIT,Samuel Colvin
pymongo,PyPI,Apache-2.0,The MongoDB Python Team
pymqi,PyPI,PSF,Dariusz Suchojad
pymqi,PyPI,PSF,Zato Source s.r.o.
pyodbc,PyPI,MIT,Michael Kleehammer
pysmi,PyPI,BSD-3-Clause,Ilya Etingof
pysnmp,PyPI,BSD-3-Clause,Ilya Etingof
Expand Down
6 changes: 4 additions & 2 deletions aerospike/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-aerospike"
description = "The Aerospike check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
sarah-witt marked this conversation as resolved.
Show resolved Hide resolved
keywords = [
"datadog",
"datadog agent",
Expand All @@ -35,10 +34,13 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'",
"aerospike==6.1.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'",
"aerospike==7.0.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'",
]

[project.urls]
Expand Down
6 changes: 4 additions & 2 deletions amazon_msk/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-amazon-msk"
description = "The Amazon Kafka check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -35,10 +34,13 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"boto3==1.17.112; python_version < '3.0'",
"boto3==1.22.8; python_version > '3.0'",
"boto3==1.24.44; python_version > '3.0'",
]

[project.urls]
Expand Down
4 changes: 3 additions & 1 deletion btrfs/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-btrfs"
description = "The Btrfs check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -35,6 +34,9 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"psutil==5.9.0",
Expand Down
4 changes: 3 additions & 1 deletion clickhouse/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-clickhouse"
description = "The ClickHouse check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -35,6 +34,9 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"clickhouse-cityhash==1.0.2.3",
Expand Down
6 changes: 3 additions & 3 deletions couch/datadog_checks/couch/couch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ def _build_metrics(self, data, tags, prefix='couchdb'):
for key, value in iteritems(data):
if "type" in value:
if value["type"] == "histogram":
for metric, value in iteritems(value["value"]):
for metric, histo_value in iteritems(value["value"]):
if metric == "histogram":
continue
elif metric == "percentile":
for pair in value:
for pair in histo_value:
self.gauge("{0}.{1}.percentile.{2}".format(prefix, key, pair[0]), pair[1], tags=tags)
else:
self.gauge("{0}.{1}.{2}".format(prefix, key, metric), value, tags=tags)
self.gauge("{0}.{1}.{2}".format(prefix, key, metric), histo_value, tags=tags)
else:
self.gauge("{0}.{1}".format(prefix, key), value["value"], tags=tags)
elif isinstance(value, dict):
Expand Down
4 changes: 3 additions & 1 deletion datadog_checks_base/datadog_checks/base/checks/windows/perf_counters/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ def _query_counters(self):
# Counters are lazily configured and any errors should prevent check execution
exception_class = type(e)
message = str(e)
self.check_initializations.append(lambda: raise_exception(exception_class, message))
self.check_initializations.append(
lambda exception_class=exception_class, message=message: raise_exception(exception_class, message)
)
return
except Exception as e:
self.log.error('Error refreshing counters for performance object `%s`: %s', perf_object.name, e)
Expand Down
39 changes: 20 additions & 19 deletions datadog_checks_base/datadog_checks/base/data/agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
adodbapi==2.6.2.0; sys_platform == 'win32'
aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'
aerospike==6.1.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'
aerospike==7.0.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'
aws-requests-auth==0.4.3
beautifulsoup4==4.11.1; python_version > '3.0'
beautifulsoup4==4.9.3; python_version < '3.0'
binary==1.0.0
boto3==1.17.112; python_version < '3.0'
boto3==1.22.8; python_version > '3.0'
boto3==1.24.44; python_version > '3.0'
boto==2.49.0
botocore==1.20.112; python_version < '3.0'
botocore==1.25.8; python_version > '3.0'
botocore==1.27.44; python_version > '3.0'
cachetools==3.1.1; python_version < '3.0'
cachetools==5.0.0; python_version > '3.0'
cachetools==5.2.0; python_version > '3.0'
clickhouse-cityhash==1.0.2.3
clickhouse-driver==0.2.0; python_version < '3.0'
clickhouse-driver==0.2.3; python_version > '3.0'
Expand All @@ -29,17 +29,17 @@ futures==3.3.0; python_version < '3.0'
gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'
gssapi==1.6.1; python_version < '3.0'
gssapi==1.7.3; python_version > '3.0'
immutables==0.17; python_version > '3.0'
immutables==0.18; python_version > '3.0'
in-toto==1.0.1
ipaddress==1.0.23; python_version < '3.0'
jaydebeapi==1.2.3
jellyfish==0.9.0; python_version > '3.0'
jpype1==0.7.0; python_version < '3.0'
jpype1==1.3.0; python_version > '3.0'
jpype1==1.4.0; python_version > '3.0'
kafka-python==2.0.2
kazoo==2.8.0
kubernetes==18.20.0; python_version < '3.0'
kubernetes==22.6.0; python_version > '3.0'
kubernetes==24.2.0; python_version > '3.0'
ldap3==2.9.1
lxml==4.9.1
lz4==2.2.1; python_version < '3.0'
Expand All @@ -48,8 +48,8 @@ mmh3==2.5.1; python_version < '3.0'
mmh3==3.0.0; python_version > '3.0'
openstacksdk==0.39.0; python_version < '3.0'
openstacksdk==0.61.0; python_version > '3.0'
orjson==3.6.8; python_version > '3.0'
paramiko==2.10.4
orjson==3.7.11; python_version > '3.0'
paramiko==2.11.0
ply==3.11
prometheus-client==0.12.0; python_version < '3.0'
prometheus-client==0.14.1; python_version > '3.0'
Expand All @@ -59,11 +59,11 @@ psutil==5.9.0
psycopg2-binary==2.8.6
pyasn1==0.4.6
pycryptodomex==3.10.1
pydantic==1.9.0; python_version > '3.0'
pydantic==1.9.1; python_version > '3.0'
pyjwt==1.7.1; python_version < '3.0'
pyjwt==2.4.0; python_version > '3.0'
pymongo[srv]==4.2; python_version >= '3.8'
pymqi==1.12.0
pymongo[srv]==4.2.0; python_version >= '3.8'
pymqi==1.12.8
pymysql==0.10.1
pyodbc==4.0.32
pyro4==4.82; sys_platform == 'win32'
Expand All @@ -78,32 +78,33 @@ python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0'
pyvmomi==7.0.3
pywin32==228; sys_platform == 'win32' and python_version < '3.0'
pywin32==304; sys_platform == 'win32' and python_version > '3.0'
pyyaml==5.4.1
pyyaml==5.4.1; python_version < '3.0'
pyyaml==6.0; python_version > '3.0'
redis==3.5.3; python_version < '3.0'
redis==4.2.2; python_version > '3.0'
redis==4.3.4; python_version > '3.0'
requests-kerberos==0.12.0; python_version < '3.0'
requests-kerberos==0.14.0; python_version > '3.0'
requests-ntlm==1.1.0
requests-toolbelt==0.9.1
requests-unixsocket==0.3.0
requests==2.27.1; python_version < '3.0'
requests==2.28.1; python_version > '3.0'
rethinkdb==2.4.8
rethinkdb==2.4.9
scandir==1.10.0
securesystemslib[crypto,pynacl]==0.20.1
selectors34==1.2; sys_platform == 'win32' and python_version < '3.0'
semver==2.13.0
serpent==1.28; sys_platform == 'win32' and python_version < '3.0'
serpent==1.40; sys_platform == 'win32' and python_version > '3.0'
serpent==1.41; sys_platform == 'win32' and python_version > '3.0'
service-identity[idna]==21.1.0
simplejson==3.17.6
six==1.16.0
snowflake-connector-python==2.7.6; python_version > '3.0'
snowflake-connector-python==2.7.11; python_version > '3.0'
supervisor==4.2.4
tuf==0.17.0; python_version < '3.0'
tuf==0.19.0; python_version > '3.0'
typing==3.10.0.0; python_version < '3.0'
uptime==3.0.1
vertica-python==1.0.5
vertica-python==1.1.1
win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'
wrapt==1.14.0
wrapt==1.14.1
17 changes: 9 additions & 8 deletions datadog_checks_base/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,26 @@ db = [
deps = [
"binary==1.0.0",
"cachetools==3.1.1; python_version < '3.0'",
"cachetools==5.0.0; python_version > '3.0'",
"cachetools==5.2.0; python_version > '3.0'",
"contextlib2==0.6.0.post1; python_version < '3.0'",
"cryptography==3.3.2; python_version < '3.0'",
"cryptography==3.4.8; python_version > '3.0'",
"ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0'",
"ddtrace==0.53.2; sys_platform != 'win32' or python_version > '3.0'",
"enum34==1.1.10; python_version < '3.0'",
"immutables==0.17; python_version > '3.0'",
"immutables==0.18; python_version > '3.0'",
"ipaddress==1.0.23; python_version < '3.0'",
"jellyfish==0.9.0; python_version > '3.0'",
"prometheus-client==0.12.0; python_version < '3.0'",
"prometheus-client==0.14.1; python_version > '3.0'",
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.1; python_version > '3.0'",
"pydantic==1.9.0; python_version > '3.0'",
"pydantic==1.9.1; python_version > '3.0'",
"python-dateutil==2.8.2",
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pyyaml==5.4.1",
"pyyaml==5.4.1; python_version < '3.0'",
"pyyaml==6.0; python_version > '3.0'",
"requests-toolbelt==0.9.1",
"requests-unixsocket==0.3.0",
"requests==2.27.1; python_version < '3.0'",
Expand All @@ -68,12 +69,12 @@ deps = [
"six==1.16.0",
"typing==3.10.0.0; python_version < '3.0'",
"uptime==3.0.1",
"wrapt==1.14.0",
"wrapt==1.14.1",
]
http = [
"aws-requests-auth==0.4.3",
"botocore==1.20.112; python_version < '3.0'",
"botocore==1.25.8; python_version > '3.0'",
"botocore==1.27.44; python_version > '3.0'",
"pyjwt==1.7.1; python_version < '3.0'",
"pyjwt==2.4.0; python_version > '3.0'",
"pysocks==1.7.1",
Expand All @@ -83,11 +84,11 @@ http = [
"win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'",
]
json = [
"orjson==3.6.8; python_version > '3.0'",
"orjson==3.7.11; python_version > '3.0'",
]
kube = [
"kubernetes==18.20.0; python_version < '3.0'",
"kubernetes==22.6.0; python_version > '3.0'",
"kubernetes==24.2.0; python_version > '3.0'",
]

[project.urls]
Expand Down
14 changes: 9 additions & 5 deletions datadog_checks_dev/datadog_checks/dev/plugin/tox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@
# Style deps:
# We pin deps in order to make CI more stable/reliable.
ISORT_DEP = 'isort==5.10.1'
BLACK_DEP = 'black==22.3.0'
FLAKE8_DEP = 'flake8==4.0.1'
FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.1.11'
FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format==0.6.0'
BLACK_DEP = 'black==22.6.0'
FLAKE8_DEP = 'flake8==5.0.3'
FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.7.1'
# TODO: update when fix is released https://github.com/globality-corp/flake8-logging-format/pull/33
FLAKE8_LOGGING_FORMAT_DEP = (
'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git'
'@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6 '
)
# TODO: remove extra when we drop Python 2
MYPY_DEP = 'mypy[python2]==0.910'
# TODO: when we drop Python 2 and replace with --install-types --non-interactive
Expand All @@ -34,7 +38,7 @@
'types_six==1.16.2',
'types-simplejson==3.17.5',
]
PYDANTIC_DEP = 'pydantic==1.8.2' # Keep in sync with: /datadog_checks_base/requirements.in
PYDANTIC_DEP = 'pydantic==1.9.1' # Keep in sync with: /datadog_checks_base/requirements.in


@tox.hookimpl
Expand Down
10 changes: 10 additions & 0 deletions datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@
'cryptography',
'dnspython',
'pymysql', # https://github.com/DataDog/integrations-core/pull/12612
'protobuf', # Breaking datadog_checks_base
'foundationdb', # Breaking datadog_checks_base tests
'openstacksdk', # Breaking openstack_controller tests
'pyasn1', # Breaking snmp tests
'pycryptodomex', # Breaking snmp tests
'pysnmp', # Breaking snmp tests
'clickhouse-driver', # Breaking clickhouse tests
'lz4', # Breaking clickhouse tests
'pyodbc', # Breaking sqlserver tests
'psutil', # Breaking disk tests
}

# Dependencies for the downloader that are security-related and should be updated separately from the others
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_dev/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies = [
"pytest-benchmark[histogram]>=3.2.1",
"pytest-cov>=2.6.1",
"pytest-mock",
"pyyaml==5.4.1",
"pyyaml>=5.4.1",
"requests>=2.22.0",
"shutilwhich==1.1.0; python_version < '3.0'",
"six",
Expand Down
4 changes: 3 additions & 1 deletion disk/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-disk"
description = "The Disk check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -35,6 +34,9 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"psutil==5.9.0",
Expand Down
4 changes: 2 additions & 2 deletions envoy/datadog_checks/envoy/envoy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ def check(self, _):

# If the value isn't an integer assume it's pre-computed histogram data.
except (ValueError, TypeError):
for metric, value in parse_histogram(metric, value):
self.gauge(metric, value, tags=tags)
for histo_metric, histo_value in parse_histogram(metric, value):
jose-manuel-almaza marked this conversation as resolved.
Show resolved Hide resolved
self.gauge(histo_metric, histo_value, tags=tags)

self.service_check(self.SERVICE_CHECK_NAME, AgentCheck.OK, tags=self.custom_tags)

Expand Down
4 changes: 3 additions & 1 deletion foundationdb/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-foundationdb"
description = "The FoundationDB check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -35,6 +34,9 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"foundationdb==6.3.24; python_version > '3.0'",
Expand Down
Loading