Skip to content

Commit

Permalink
fix: revert restriction on psutil and wrapt versions [backport 2.1] (#…
Browse files Browse the repository at this point in the history
…7169)

Backport 762e52d from #7158 to 2.1.

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]>
  • Loading branch information
github-actions[bot] and emmettbutler authored Oct 5, 2023
1 parent d9a89e4 commit c90d915
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ prepended
profiler
protobuf
proxying
psutil
psycopg
py
pyenv
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ dependencies = [
"envier",
"importlib_metadata; python_version<'3.8'",
"opentelemetry-api>=1",
"psutil==5.6.7",
"psutil~=5.8",
"protobuf>=3",
"setuptools; python_version>='3.12'",
"six>=1.12.0",
"typing_extensions",
"wrapt==1.15.0",
"wrapt~=1.15",
"xmltodict>=0.12",
]

Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/deps-pin-5d4111479a0cc33b.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
This fix resolves an issue where the library failed to install due to dependency conflicts caused by restrictive
version specifiers on the psutil and Wrapt libraries.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,9 @@ def get_ddup_ext():
"xmltodict>=0.12",
"envier",
"opentelemetry-api>=1",
"psutil==5.6.7",
"psutil>=5.8.0",
"setuptools; python_version>='3.12'",
"wrapt==1.15.0",
"wrapt>=1.15.0",
]
+ bytecode,
extras_require={
Expand Down

0 comments on commit c90d915

Please sign in to comment.