[24.1] Revert some requests import changes #18199
Conversation
| @@ -9,6 +9,8 @@ | |||
| urlparse, | |||
| ) | |||
|
|
|||
| import requests | |||
There was a problem hiding this comment.
I think we should add the header here.
There was a problem hiding this comment.
I think it's only used to connect to Galaxy's /api/ga4gh/drs/v1/* and /api/drs_download/{object_id} URLs.
| @@ -7,9 +7,9 @@ | |||
| from unittest import SkipTest | |||
|
|
|||
| import pytest | |||
| import requests | |||
There was a problem hiding this comment.
Same, I think it's good to add the header here
There was a problem hiding this comment.
It's only used to make a PUT requests to Galaxy's /api/histories/{history_id}/contents/{item_id} .
nsoranzo
force-pushed
the
followup_on_18003
branch
from
3188d25 to
0ec261b
Compare
This comment was marked as resolved.
This comment was marked as resolved.
|
Selenium test failure unrelated. Maintenance bot failure will be fixed by this PR once merged. |
|
This should probably go to 24.1 |
OK, then I'll split this PR in 2 since the GitHub actions changes apply only to dev. Unless we want to backport #18197 to 24.1? |
|
We can also backport just what's needed. |
|
Basically all of #18197 is needed to avoid issues with the end of Node 16 support: "On June 30th 2024, we will change the default from Node16 to Node20. To opt out of this and continue using Node16 while it is still available in the runner, you can choose to set |
|
Then let's even target 24.0, since we'll have to support this until next year. |
introduced in galaxyproject#18003 . In particular, when using requests in the tests to connect to Galaxy or the ToolShed it's not needed to use the modified headers. Also: - Move some imports after conditional imports. - Fix type annotations in `lib/tool_shed/test/base/populators.py` - Fix typo bug in `test/unit/util/test_get_url.py`
nsoranzo
force-pushed
the
followup_on_18003
branch
from
cf84b85 to
8cdca0f
Compare
nsoranzo
changed the title
|
OK, thanks for the feedback! I've removed the GH actions-related commits (will open a new PR against 24.0) and targeted this against 24.1 . |
|
Failing integration test unrelated, ready to merge I think. |
introduced in #18003 . In particular, when using requests in the tests to connect to Galaxy or the ToolShed it's not needed to use the modified headers.
Also:
lib/tool_shed/test/base/populators.pytest/unit/util/test_get_url.pyHow to test the changes?
(Select all options that apply)
License