Work around requests version conflict #3469
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PBENCH-1190 The Pbench Agent depends on a version of the `requests` package of at least 2.27 for the `requests.exceptions.JSONDecodeError` exception. We'd like to require 2.31 as that resolves a CVE, however Pbench Agent supports Python 3.6 which won't work with 2.31. Adding to this mix, the `pquisby` package requires exactly 2.25. For now, in order to move forward with Quisby, we remove the version constraints from `requests` for Pbench and remove the reference to the `JSONDecodeError` exception. (Note that a secondary level of mess here is that the Pbench CI installs *all* our `requirements*.txt` files in the same environment, even though Pbench Agent and Pbench Server don't really operate in the same environment and should be completely separate. This currently prevents us from having incompatible requirements between the two and we ought to change that going forward.
dbutenhof
added
Agent
Server
Code Infrastructure
packaging
dbutenhof
requested review from
ndokos,
riya-17,
siddardh-ra,
vishalvvr and
webbnh
siddardh-ra
approved these changes
Jun 21, 2023
ndokos
added a commit
to ndokos/pbench
that referenced
this pull request
Jul 10, 2023
…) to b0.72 Replace `requests.exceptions.JSONDecodeError' by generic `Exception'. See distributed-system-analysis#3469 for some details. The upstream issue is psf/requests#5794 and the PR is psf/requests#5856 but we are running older versions of `requests' in various places.
ndokos
added a commit
that referenced
this pull request
Jul 11, 2023
Replace `requests.exceptions.JSONDecodeError' by generic `Exception'. See #3469 for some details. The upstream issue is psf/requests#5794 and the PR is psf/requests#5856 but we are running older versions of `requests' in various places.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PBENCH-1190
The Pbench Agent depends on a version of the
requestspackage of at least 2.27 for therequests.exceptions.JSONDecodeErrorexception. We'd like to require 2.31 as that resolves a CVE, however Pbench Agent supports Python 3.6 which won't work with 2.31. Adding to this mix, thepquisbypackage requires exactly 2.25.For now, in order to move forward with Quisby, we remove the version constraints from
requestsfor Pbench and remove the reference to theJSONDecodeErrorexception.(Note that a secondary level of mess here is that the Pbench CI installs all our
requirements*.txtfiles in the same environment, even though Pbench Agent and Pbench Server don't really operate in the same environment and should be completely separate. This currently prevents us from having incompatible requirements between the two and we ought to change that going forward.