mirror of
https://github.com/certbot/certbot.git
synced 2026-07-31 18:34:41 +02:00
Update to latest poetry-plugin-export to fix urllib3 multiple versions issue and unpin urllib3 (#10169)
We can use modern urllib3 now! They [fixed](https://github.com/python-poetry/poetry-plugin-export/pull/286) the poetry [issue](https://github.com/python-poetry/poetry-plugin-export/issues/183) and shipped it! Since this PR updates the requirements file, it pulls in the new `josepy` release, so I've silenced those warnings here. If I should do that in a separate PR lmk.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
"""Module configuring Certbot in a snap environment"""
|
||||
from __future__ import annotations
|
||||
import logging
|
||||
import socket
|
||||
from typing import Iterable
|
||||
@@ -134,12 +135,12 @@ class _SnapdAdapter(HTTPAdapter):
|
||||
# help out those packagers while ensuring this code works reliably, we offer custom versions of
|
||||
# both functions for now. when certbot does declare a dependency on requests>=2.32.2 in its
|
||||
# setup.py files, get_connection can be deleted
|
||||
def get_connection(self, url: str,
|
||||
def get_connection(self, url: str | bytes,
|
||||
proxies: Optional[Iterable[str]] = None) -> _SnapdConnectionPool:
|
||||
return _SnapdConnectionPool()
|
||||
|
||||
def get_connection_with_tls_context(self, request: PreparedRequest,
|
||||
verify: bool,
|
||||
verify: bool | str | None,
|
||||
proxies: Optional[Iterable[str]] = None,
|
||||
cert: Optional[Union[str, Tuple[str,str]]] = None
|
||||
) -> _SnapdConnectionPool:
|
||||
|
||||
+2
-4
@@ -50,10 +50,8 @@ dev_extras = [
|
||||
# poetry 1.2.0+ is required for it to pin pip, setuptools, and wheel. See
|
||||
# https://github.com/python-poetry/poetry/issues/1584.
|
||||
'poetry>=1.2.0',
|
||||
# poetry-plugin-export>=1.1.0 is required to use the constraints.txt export
|
||||
# format. See
|
||||
# https://github.com/python-poetry/poetry-plugin-export/blob/efcfd34859e72f6a79a80398f197ce6eb2bbd7cd/CHANGELOG.md#added.
|
||||
'poetry-plugin-export>=1.1.0',
|
||||
# allows us to use newer urllib3 https://github.com/python-poetry/poetry-plugin-export/issues/183
|
||||
'poetry-plugin-export>=1.9.0',
|
||||
'twine',
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user