Fix for requests 2.32 #3257
Fix for requests 2.32 #3257
Conversation
felixfontein
force-pushed
the
requests-hotfix
branch
from
f579f6a
to
b80bfbf
Compare
|
The CI failures seem to be unrelated. |
Both docker-py and requests have fixes in flight. We can narrow our pin to only exclude the breaking version. docker/docker-py#3257 psf/requests#6707 (comment)
|
This will need to get updated for psf/requests#6707 (comment). Once that one is finalized I'll update the PR. |
|
I've updated it to be compatible with requests 2.32.2+, which will include psf/requests#6710. |
docker/transport/basehttpadapter.py
Outdated
| # https://github.com/psf/requests/commit/c0813a2d910ea6b4f8438b91d315b8d181302356 | ||
| # changes requests.adapters.HTTPAdapter to no longer call get_connection() from | ||
| # send(), but instead call _get_connection(). | ||
| def _get_connection(self, request, *args, proxies=None, **kwargs): |
There was a problem hiding this comment.
I'll be yanking 2.32.0 and 2.32.1 once we get 2.32.2 out so this can probably be omitted from the patch.
There was a problem hiding this comment.
I've removed these lines. (For everyone else: now 2.32.2 is out, and 2.23.0 and 23.2.1 have been yanked.)
There was a problem hiding this comment.
you mean 2.32.0 and 2.32.1 yanked? I still got it installed as an indirect pip dependency just an hour ago.
There was a problem hiding this comment.
Caching perhaps. You can see here they are yanked: https://pypi.org/project/requests/#history.
|
@felixfontein I'm away from my pc right now, but just to be clear: this would be a fix for requests versions 2.32.2 and up, correct? maybe it's also worth updating the dependency definition in pyproject.yaml to avoid accidentally using 2.32.0-2.32.1, if they would still be problematic versions |
Any prediction to launch this? |
|
hey guys, will you release this hotfix?
|
|
Sorry for the delay, we had some unexpected complications to manage for this release. Version 7.1.0 should now be live on pypi, thx for the patience <3 |
* --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * update docker-py to a version compatible with requests 2.32 * updated requests again to fix Not supported URL scheme error see docker/docker-py#3257 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jörg Stucke <joerg.stucke@fkie.fraunhofer.de>
After yet another breaking package update (docker/docker-py#3257), its high time we permanently pin all development packages *and their dependencies* to a known.-good version. pip-tools lets us do that without losing the simple requirements.txt file that allows easy installation, so lets use that.
After yet another breaking package update (docker/docker-py#3257), its high time we permanently pin all development packages *and their dependencies* to a known.-good version. pip-tools lets us do that without losing the simple requirements.txt file that allows easy installation, so lets use that.
* lock transitive python dependencies with pip-tools After yet another breaking package update (docker/docker-py#3257), its high time we permanently pin all development packages *and their dependencies* to a known.-good version. pip-tools lets us do that without losing the simple requirements.txt file that allows easy installation, so lets use that. * rework testing harness for py12, remove pytest-virtualenv dep a little while ago, we were starting to get "imp" import errors in CI builds, which I initially were assumed to be from pytest. In fact, it was the pytest-virtualenv package that we used to generate a virtualenv with a specific ansible version for tests. As there is no easy replacement for this package, and the package itself is stale (no release in 5 years), the testing harness now just installs the desired version of ansible-core straight into the main devel virtualenv. This is a bit ugly as it could interfere with other user tasks, but it leaves the interface the same and helps simplify the test fixture code. Said code also now reliably isolates tes environments from another and the user-wide collections. Combined with package pinning introduced in the previous commit, we should no longer have CI failures due to packages or their deps updating and breaking things.
|
If you found yourself here because you had an error such as:
You can probably resolve it by upgrading your |
The current requests 2.32.0 release breaks Docker SDK for Python (see #3256) due to psf/requests@c0813a2.
That commit makes
send()call_get_connection()instead ofget_connection(). Now the Docker SDK for Python code overwritesget_connection(), but of course doesn't magically overwrite_get_connection()as well...This PR introduces a
BaseHTTPAdapter._get_connection()method that simply callsget_connection().See for example https://github.com/docker/docker-py/blob/main/docker/transport/unixconn.py#L66.
Fixes #3256.