Skip to content

Commit e1e61e5

Browse files
L3n41csteveny91
andauthored
Upgrade requests to 2.32.3 and adds a license validation override to ddev (#17702)
* Upgrade `requests` to `2.32.3` * Add changelog entry * Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0 in order to get the following fix: msabramo/requests-unixsocket#72 * update license * changelog * Apply suggestions from code review Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> * Regenerate LICENSE-3rdparty.csv * conflicts * sync license * changelog --------- Co-authored-by: steveny91 <steven.yuen@datadoghq.com>
1 parent 633fc17 commit e1e61e5

File tree

7 files changed

+17
-4
lines changed

7 files changed

+17
-4
lines changed

.ddev/config.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ pymongo = ['Apache-2.0']
9797
requests-kerberos = ['ISC']
9898
# https://github.com/requests/requests-ntlm/blob/master/LICENSE
9999
requests-ntlm = ['ISC']
100+
# https://gitlab.com/thelabnyc/requests-unixsocket2/-/blob/master/LICENSE
101+
# For of the original. The license on PyPI is incorrect. Issue filed here:
102+
# https://gitlab.com/thelabnyc/requests-unixsocket2/-/issues/4
103+
requests-unixsocket2 = ['ISC']
100104
# https://github.com/rethinkdb/rethinkdb-python/blob/master/LICENSE
101105
rethinkdb = ['Apache-2.0']
102106
# https://github.com/simplejson/simplejson/blob/master/LICENSE.txt

LICENSE-3rdparty.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz.
9292
requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz.
9393
requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield"
9494
requests-unixsocket,PyPI,Apache-2.0,Copyright 2014 Marc Abramowitz
95+
requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2024 thelab
9596
rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB.
9697
scandir,PyPI,BSD-3-Clause,"Copyright (c) 2012, Ben Hoyt"
9798
securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres

agent_requirements.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ requests-ntlm==1.2.0; python_version > '3.0'
9393
requests-oauthlib==1.3.1; python_version < '3.0'
9494
requests-oauthlib==2.0.0; python_version > '3.0'
9595
requests-toolbelt==1.0.0
96-
requests-unixsocket==0.3.0
96+
requests-unixsocket==0.3.0; python_version < '3.0'
97+
requests-unixsocket2==0.4.0; python_version > '3.0'
9798
requests==2.27.1; python_version < '3.0'
98-
requests==2.31.0; python_version > '3.0'
99+
requests==2.32.3; python_version > '3.0'
99100
rethinkdb==2.4.9
100101
scandir==1.10.0; python_version < '3.5'
101102
securesystemslib[crypto,pynacl]==0.28.0; python_version > '3.0'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump the `requests` version to 2.32.3 on Python 3

datadog_checks_base/pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ deps = [
6262
"pyyaml==5.4.1; python_version < '3.0'",
6363
"pyyaml==6.0.1; python_version > '3.0'",
6464
"requests-toolbelt==1.0.0",
65-
"requests-unixsocket==0.3.0",
65+
"requests-unixsocket==0.3.0; python_version < '3.0'",
66+
"requests-unixsocket2==0.4.0; python_version > '3.0'",
6667
"requests==2.27.1; python_version < '3.0'",
67-
"requests==2.31.0; python_version > '3.0'",
68+
"requests==2.32.3; python_version > '3.0'",
6869
"simplejson==3.19.2",
6970
"six==1.16.0",
7071
"typing==3.10.0.0; python_version < '3.0'",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add license override for requests-unixsocket2

datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
'requests-kerberos': ['ISC'],
6363
# https://github.com/requests/requests-ntlm/blob/master/LICENSE
6464
'requests-ntlm': ['ISC'],
65+
# https://gitlab.com/thelabnyc/requests-unixsocket2/-/blob/master/LICENSE
66+
# For of the original. The license on PyPI is incorrect. Issue filed here:
67+
# https://gitlab.com/thelabnyc/requests-unixsocket2/-/issues/4
68+
'requests-unixsocket2': ['ISC'],
6569
# https://github.com/rethinkdb/rethinkdb-python/blob/master/LICENSE
6670
'rethinkdb': ['Apache-2.0'],
6771
# https://github.com/simplejson/simplejson/blob/master/LICENSE.txt

0 commit comments

Comments
 (0)