Skip to content
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

Jump to bottom

fix: revert restriction on psutil and wrapt versions #7158

Merged
merged 9 commits into from
Oct 4, 2023
Merged

fix: revert restriction on psutil and wrapt versions #7158

merged 9 commits into from
Oct 4, 2023

Conversation

emmettbutler
Copy link
Collaborator

@emmettbutler emmettbutler commented Oct 4, 2023 •
edited
Loading

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

  • Change(s) are motivated and described in the PR description.
  • Testing strategy is described if automated tests are not included in the PR.
  • Risk is outlined (performance impact, potential for breakage, maintainability, etc).
  • Change is maintainable (easy to change, telemetry, documentation).
  • Library release note guidelines are followed. If no release note is required, add label changelog/no-changelog.
  • Documentation is included (in-code, generated user docs, public corp docs).
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Title is accurate.
  • No unnecessary changes are introduced.
  • Description motivates each change.
  • Avoids breaking API changes unless absolutely necessary.
  • Testing strategy adequately addresses listed risk(s).
  • Change is maintainable (easy to change, telemetry, documentation).
  • Release note makes sense to a user of the library.
  • Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment.
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy
  • 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.
  • This PR doesn't touch any of that.

@emmettbutler emmettbutler requested a review from a team as a code owner October 4, 2023 12:41
@emmettbutler emmettbutler requested a review from juanjux October 4, 2023 12:41
@emmettbutler emmettbutler marked this pull request as draft October 4, 2023 12:41
sileht
sileht reviewed Oct 4, 2023
View reviewed changes
setup.py Outdated Show resolved Hide resolved
@emmettbutler emmettbutler mentioned this pull request Oct 4, 2023
Closed
@sileht
Copy link
Contributor

sileht commented Oct 4, 2023

I was also working on it: #7159
Feel free to close mine.

@emmettbutler emmettbutler mentioned this pull request Oct 4, 2023
Closed
18 tasks
@emmettbutler emmettbutler requested a review from sileht October 4, 2023 12:49
@emmettbutler emmettbutler marked this pull request as ready for review October 4, 2023 13:13
@emmettbutler emmettbutler requested review from a team as code owners October 4, 2023 13:13
@emmettbutler emmettbutler requested review from majorgreys, mabdinur and sileht and removed request for sileht October 4, 2023 13:13
@emmettbutler emmettbutler enabled auto-merge (squash) October 4, 2023 13:14
mabdinur
mabdinur previously approved these changes Oct 4, 2023
View reviewed changes
@mabdinur mabdinur changed the title fix: revert restriction on psutil version fix: revert restriction on psutil and wrapt versions Oct 4, 2023
P403n1x87
P403n1x87 previously approved these changes Oct 4, 2023
View reviewed changes
majorgreys
majorgreys reviewed Oct 4, 2023
View reviewed changes
Copy link
Contributor

@majorgreys majorgreys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use compatible release operators?

Also, I might have missed it, but why the bump for psutil?

pyproject.toml Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
@emmettbutler @majorgreys
Update pyproject.toml
1243670 
Co-authored-by: Tahir H. Butt <[email protected]>
@emmettbutler emmettbutler dismissed stale reviews from mabdinur and P403n1x87 via 1243670 October 4, 2023 14:30
@emmettbutler
Copy link
Collaborator Author

@majorgreys 5.8.0 is the first version where wheels for Linux, Mac and Windows are all available.

@emmettbutler emmettbutler merged commit 762e52d into 2.x Oct 4, 2023
@emmettbutler emmettbutler deleted the emmett.butler/relax-psutil-pin branch October 4, 2023 15:24
github-actions bot pushed a commit that referenced this pull request Oct 4, 2023
@emmettbutler @github-actions
fix: revert restriction on psutil version (#7158)
0deaac7 
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.

## 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

- [ ] Title is accurate.
- [ ] No unnecessary changes are introduced.
- [ ] Description motivates each change.
- [ ] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [ ] Testing strategy adequately addresses listed risk(s).
- [ ] Change is maintainable (easy to change, telemetry, documentation).
- [ ] Release note makes sense to a user of the library.
- [ ] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [ ] 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)
- [ ] 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`.
- [ ] This PR doesn't touch any of that.

(cherry picked from commit 762e52d)
This was referenced Oct 4, 2023
Merged
Merged
github-actions bot pushed a commit that referenced this pull request Oct 4, 2023
@emmettbutler @github-actions
fix: revert restriction on psutil version (#7158)
133506a 
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.

## 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

- [ ] Title is accurate.
- [ ] No unnecessary changes are introduced.
- [ ] Description motivates each change.
- [ ] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [ ] Testing strategy adequately addresses listed risk(s).
- [ ] Change is maintainable (easy to change, telemetry, documentation).
- [ ] Release note makes sense to a user of the library.
- [ ] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [ ] 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)
- [ ] 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`.
- [ ] This PR doesn't touch any of that.

(cherry picked from commit 762e52d)
emmettbutler added a commit that referenced this pull request Oct 4, 2023
@github-actions @emmettbutler
fix: revert restriction on psutil and wrapt versions [backport 2.0] (#…
14b7349 
…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]>
emmettbutler added a commit that referenced this pull request Oct 5, 2023
@github-actions @emmettbutler
fix: revert restriction on psutil and wrapt versions [backport 2.1] (#…
c90d915 
…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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mabdinur mabdinur mabdinur approved these changes

@sileht sileht sileht approved these changes

@majorgreys majorgreys majorgreys approved these changes

@juanjux juanjux Awaiting requested review from juanjux juanjux is a code owner automatically assigned from DataDog/python-guild

@P403n1x87 P403n1x87 Awaiting requested review from P403n1x87

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Is it possible to relax the psutil dependency in 2.0.0 to prevent dependency version conflicts?
5 participants
@emmettbutler @sileht @majorgreys @P403n1x87 @mabdinur