Skip to content

Commit 14b7349

Browse files
fix: revert restriction on psutil and wrapt versions [backport 2.0] (#7168)
Backport 762e52d from #7158 to 2.0. This pull request fixes #7142 by relaxing the version restriction for the `psutil` and `wrapt` dependencies, which had been pinned to specific versions. Pinning specific versions is problematic in library code. The `psutil` dependency is upgraded slightly to depend on the first version where wheels for Linux, Mac and Windows are all available. ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment. - [x] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) - [x] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [x] This PR doesn't touch any of that. Co-authored-by: Emmett Butler <[email protected]>
1 parent 6557768 commit 14b7349

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

docs/spelling_wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ prepended
171171
profiler
172172
protobuf
173173
proxying
174+
psutil
174175
psycopg
175176
py
176177
pyenv

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ dependencies = [
3030
"envier",
3131
"importlib_metadata; python_version<'3.8'",
3232
"opentelemetry-api>=1",
33-
"psutil==5.6.7",
33+
"psutil~=5.8",
3434
"protobuf>=3",
3535
"setuptools; python_version>='3.12'",
3636
"six>=1.12.0",
3737
"typing_extensions",
38-
"wrapt==1.15.0",
38+
"wrapt~=1.15",
3939
"xmltodict>=0.12",
4040
]
4141

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
This fix resolves an issue where the library failed to install due to dependency conflicts caused by restrictive
5+
version specifiers on the psutil and Wrapt libraries.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,9 @@ def get_ddup_ext():
544544
"xmltodict>=0.12",
545545
"envier",
546546
"opentelemetry-api>=1",
547-
"psutil==5.6.7",
547+
"psutil>=5.8.0",
548548
"setuptools; python_version>='3.12'",
549-
"wrapt==1.15.0",
549+
"wrapt>=1.15.0",
550550
]
551551
+ bytecode,
552552
extras_require={

0 commit comments

Comments
 (0)