Skip to content

Sy/update license #17768

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

Closed
wants to merge 7 commits into from
Closed

Sy/update license #17768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4750e05
Upgrade `requests` to `2.32.3`
L3n41c Jun 1, 2024
a591214
Add changelog entry
L3n41c Jun 1, 2024
c854d42
Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0
L3n41c Jun 3, 2024
3d44f21
update license
steveny91 Jun 7, 2024
f55c790
Merge branch 'master' into sy/update-license
steveny91 Jun 7, 2024
27b6cc2
Update agent_requirements.in
steveny91 Jun 7, 2024
7955812
Update pyproject.toml
steveny91 Jun 7, 2024
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: 2 additions & 0 deletions .ddev/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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 @@ -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 (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
Expand Down
5 changes: 3 additions & 2 deletions agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ 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-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.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'
Expand Down
1 change: 1 addition & 0 deletions datadog_checks_base/changelog.d/17702.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump the `requests` version to 2.32.3 on Python 3

Check failure on line 1 in datadog_checks_base/changelog.d/17702.fixed

View workflow job for this annotation

GitHub Actions / run / Check PR 

Your changelog entry has the wrong PR number. To fix this please run:
mv datadog_checks_base/changelog.d/17702.fixed datadog_checks_base/changelog.d/17768.fixed
5 changes: 3 additions & 2 deletions datadog_checks_base/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ 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-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.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'",
Expand Down
2 changes: 2 additions & 0 deletions datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading