From 4750e0530cca1a324148204b2c5623da1a396ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Sat, 1 Jun 2024 20:08:25 +0200 Subject: [PATCH 1/6] Upgrade `requests` to `2.32.3` --- agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent_requirements.in b/agent_requirements.in index 60043b16b7f4c..c17a5db78ea34 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -95,7 +95,7 @@ requests-oauthlib==2.0.0; python_version > '3.0' requests-toolbelt==1.0.0 requests-unixsocket==0.3.0 requests==2.27.1; python_version < '3.0' -requests==2.31.0; python_version > '3.0' +requests==2.32.3; python_version > '3.0' rethinkdb==2.4.9 scandir==1.10.0; python_version < '3.5' securesystemslib[crypto,pynacl]==0.28.0; python_version > '3.0' diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 9fa9c4e29b499..7c4f4601641cd 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -64,7 +64,7 @@ deps = [ "requests-toolbelt==1.0.0", "requests-unixsocket==0.3.0", "requests==2.27.1; python_version < '3.0'", - "requests==2.31.0; python_version > '3.0'", + "requests==2.32.3; python_version > '3.0'", "simplejson==3.19.2", "six==1.16.0", "typing==3.10.0.0; python_version < '3.0'", From a591214fe2e32845866b2d371f248f59fa7c7946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Sat, 1 Jun 2024 20:18:03 +0200 Subject: [PATCH 2/6] Add changelog entry --- datadog_checks_base/changelog.d/17702.fixed | 1 + 1 file changed, 1 insertion(+) create mode 100644 datadog_checks_base/changelog.d/17702.fixed diff --git a/datadog_checks_base/changelog.d/17702.fixed b/datadog_checks_base/changelog.d/17702.fixed new file mode 100644 index 0000000000000..0aa5a09ae7cde --- /dev/null +++ b/datadog_checks_base/changelog.d/17702.fixed @@ -0,0 +1 @@ +Bump the `requests` version to 2.32.3 on Python 3 From c854d42e52b1b3314736c62a1070baea61786093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Mon, 3 Jun 2024 17:17:14 +0200 Subject: [PATCH 3/6] Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0 in order to get the following fix: https://github.com/msabramo/requests-unixsocket/pull/72 --- LICENSE-3rdparty.csv | 2 +- agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 1b156b231b6ca..d0b680f1b3cd5 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -91,7 +91,7 @@ requests-ntlm,PyPI,ISC,Copyright (c) 2013 Ben Toews requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz. requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz. requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield" -requests-unixsocket,PyPI,Apache-2.0,Copyright 2014 Marc Abramowitz +requests-unixsocket2,PyPI,Apache-2.0,Copyright 2014 Marc Abramowitz rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB. scandir,PyPI,BSD-3-Clause,"Copyright (c) 2012, Ben Hoyt" securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres diff --git a/agent_requirements.in b/agent_requirements.in index c17a5db78ea34..61e9133edefab 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -93,7 +93,7 @@ requests-ntlm==1.2.0; python_version > '3.0' requests-oauthlib==1.3.1; python_version < '3.0' requests-oauthlib==2.0.0; python_version > '3.0' requests-toolbelt==1.0.0 -requests-unixsocket==0.3.0 +requests-unixsocket2==0.4.0 requests==2.27.1; python_version < '3.0' requests==2.32.3; python_version > '3.0' rethinkdb==2.4.9 diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 7c4f4601641cd..b80e3b9f709b3 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -62,7 +62,7 @@ deps = [ "pyyaml==5.4.1; python_version < '3.0'", "pyyaml==6.0.1; python_version > '3.0'", "requests-toolbelt==1.0.0", - "requests-unixsocket==0.3.0", + "requests-unixsocket2==0.4.0", "requests==2.27.1; python_version < '3.0'", "requests==2.32.3; python_version > '3.0'", "simplejson==3.19.2", From 3d44f211d058794610ac4e45b138c967781859f2 Mon Sep 17 00:00:00 2001 From: steveny91 Date: Thu, 6 Jun 2024 22:51:20 -0400 Subject: [PATCH 4/6] update license --- .ddev/config.toml | 2 ++ LICENSE-3rdparty.csv | 2 +- .../datadog_checks/dev/tooling/commands/validate/licenses.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.ddev/config.toml b/.ddev/config.toml index 3fd388414d027..67bd83a8cc688 100644 --- a/.ddev/config.toml +++ b/.ddev/config.toml @@ -97,6 +97,8 @@ pymongo = ['Apache-2.0'] requests-kerberos = ['ISC'] # https://github.com/requests/requests-ntlm/blob/master/LICENSE requests-ntlm = ['ISC'] +# https://gitlab.com/thelabnyc/requests-unixsocket2/-/blob/master/LICENSE +requests-unixsocket2 = ['Apache-2.0'] # https://github.com/rethinkdb/rethinkdb-python/blob/master/LICENSE rethinkdb = ['Apache-2.0'] # https://github.com/simplejson/simplejson/blob/master/LICENSE.txt diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index d0b680f1b3cd5..b817ccc4a071a 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -91,7 +91,7 @@ requests-ntlm,PyPI,ISC,Copyright (c) 2013 Ben Toews requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz. requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz. requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield" -requests-unixsocket2,PyPI,Apache-2.0,Copyright 2014 Marc Abramowitz +requests-unixsocket2,PyPI,Apache-2.0,Copyright (c) 2024 - 2024 thelab rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB. scandir,PyPI,BSD-3-Clause,"Copyright (c) 2012, Ben Hoyt" securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py index 4a26eac91472a..4d8ce5dded891 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py @@ -62,6 +62,8 @@ 'requests-kerberos': ['ISC'], # https://github.com/requests/requests-ntlm/blob/master/LICENSE 'requests-ntlm': ['ISC'], + # https://gitlab.com/thelabnyc/requests-unixsocket2/-/blob/master/LICENSE + 'requests-unixsocket2': ['Apache-2.0'], # https://github.com/rethinkdb/rethinkdb-python/blob/master/LICENSE 'rethinkdb': ['Apache-2.0'], # https://github.com/simplejson/simplejson/blob/master/LICENSE.txt From 27b6cc21104b7c2be0926d8b78a2c00bd9c3d96f Mon Sep 17 00:00:00 2001 From: Steven Yuen Date: Fri, 7 Jun 2024 01:25:09 -0400 Subject: [PATCH 5/6] Update agent_requirements.in --- agent_requirements.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent_requirements.in b/agent_requirements.in index 92d99668645fb..3a0a78c1dba29 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -93,7 +93,8 @@ requests-ntlm==1.2.0; python_version > '3.0' requests-oauthlib==1.3.1; python_version < '3.0' requests-oauthlib==2.0.0; python_version > '3.0' requests-toolbelt==1.0.0 -requests-unixsocket2==0.4.0 +requests-unixsocket==0.3.0; python_version < '3.0' +requests-unixsocket2==0.4.0; python_version > '3.0' requests==2.27.1; python_version < '3.0' requests==2.32.3; python_version > '3.0' rethinkdb==2.4.9 From 795581243ccea2cca7903480155984fd59e46715 Mon Sep 17 00:00:00 2001 From: Steven Yuen Date: Fri, 7 Jun 2024 01:26:44 -0400 Subject: [PATCH 6/6] Update pyproject.toml --- datadog_checks_base/pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index b80e3b9f709b3..153fb6e284425 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -62,7 +62,8 @@ deps = [ "pyyaml==5.4.1; python_version < '3.0'", "pyyaml==6.0.1; python_version > '3.0'", "requests-toolbelt==1.0.0", - "requests-unixsocket2==0.4.0", + "requests-unixsocket==0.3.0; python_version < '3.0'", + "requests-unixsocket2==0.4.0; python_version > '3.0'", "requests==2.27.1; python_version < '3.0'", "requests==2.32.3; python_version > '3.0'", "simplejson==3.19.2",