| Message ID | 20230725142120.318785-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/python-urllib3: bump to version 2.0.4 | expand |
Hello James, On Tue, 25 Jul 2023 08:21:20 -0600 James Hilliard <james.hilliard1@gmail.com> wrote: > Migrate from setuptools to hatchling pep517 build backend. > > License hash changed due contributors change: > https://github.com/urllib3/urllib3/commit/8e94754f85c59d826ac0604d0dd2a0b41874bb36 > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> This commit breaks two test cases: TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561481 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561482 | ORPH Could you please have a look? Thanks a lot! Thomas
Hello Thomas, James, all, Le 01/08/2023 à 10:22, Thomas Petazzoni via buildroot a écrit : > Hello James, > > On Tue, 25 Jul 2023 08:21:20 -0600 > James Hilliard <james.hilliard1@gmail.com> wrote: > >> Migrate from setuptools to hatchling pep517 build backend. >> >> License hash changed due contributors change: >> https://github.com/urllib3/urllib3/commit/8e94754f85c59d826ac0604d0dd2a0b41874bb36 >> >> Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > This commit breaks two test cases: > > TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561481 | ORPH > TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561482 | ORPH > > Could you please have a look? From [1] ImportError: cannot import name 'DEFAULT_CIPHERS' from 'urllib3.util.ssl_' is due to botocore which does not support urllib3 2.0 yet [2]. It seems many projects are annoyed by urllib3 1.x to 2.0 migration. See https://github.com/urllib3/urllib3/blob/main/docs/v2-migration-guide.rst [1] https://github.com/urllib3/urllib3/blob/main/docs/v2-migration-guide.rst#importerror-cannot-import-name-default_ciphers-from-urllib3utilssl_ [2] https://github.com/boto/botocore/issues/2921 Best regards, Romain > > Thanks a lot! > > Thomas
On Sun, Aug 6, 2023 at 3:25 PM Romain Naour <romain.naour@smile.fr> wrote: > > Hello Thomas, James, all, > > Le 01/08/2023 à 10:22, Thomas Petazzoni via buildroot a écrit : > > Hello James, > > > > On Tue, 25 Jul 2023 08:21:20 -0600 > > James Hilliard <james.hilliard1@gmail.com> wrote: > > > >> Migrate from setuptools to hatchling pep517 build backend. > >> > >> License hash changed due contributors change: > >> https://github.com/urllib3/urllib3/commit/8e94754f85c59d826ac0604d0dd2a0b41874bb36 > >> > >> Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > > > This commit breaks two test cases: > > > > TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561481 | ORPH > > TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561482 | ORPH > > > > Could you please have a look? > > From [1] > ImportError: cannot import name 'DEFAULT_CIPHERS' from 'urllib3.util.ssl_' is > due to botocore which does not support urllib3 2.0 yet [2]. > > It seems many projects are annoyed by urllib3 1.x to 2.0 migration. > > See https://github.com/urllib3/urllib3/blob/main/docs/v2-migration-guide.rst > > [1] > https://github.com/urllib3/urllib3/blob/main/docs/v2-migration-guide.rst#importerror-cannot-import-name-default_ciphers-from-urllib3utilssl_ > [2] https://github.com/boto/botocore/issues/2921 Looks like an update should be sufficient: https://patchwork.ozlabs.org/project/buildroot/patch/20230806213742.4097588-1-james.hilliard1@gmail.com/ https://github.com/boto/botocore/issues/2926#issuecomment-1657613474 > > Best regards, > Romain > > > > > Thanks a lot! > > > > Thomas >
diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 963967332e..2da7abdf29 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 38f7d1589aa9720101316d07fcbd05c8 urllib3-1.26.13.tar.gz -sha256 c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8 urllib3-1.26.13.tar.gz +md5 5d541b944febe50221e24c31cd6e887d urllib3-2.0.4.tar.gz +sha256 8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11 urllib3-2.0.4.tar.gz # Locally computed sha256 checksums -sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt +sha256 130e3a64d5fdd5d096a752694634a7d9df284469de86e5732100268041e3d686 LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 5868927440..7ff58d9a4a 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,14 +4,16 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.13 +PYTHON_URLLIB3_VERSION = 2.0.4 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/c2/51/32da03cf19d17d46cce5c731967bf58de9bd71db3a379932f53b094deda4 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/31/ab/46bec149bbd71a4467a3063ac22f4486ecd2ceb70ae8c70d5d8e4c2a7946 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3 -PYTHON_URLLIB3_SETUP_TYPE = setuptools +PYTHON_URLLIB3_SETUP_TYPE = pep517 +PYTHON_URLLIB3_DEPENDENCIES = host-python-hatchling +HOST_PYTHON_URLLIB3_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) $(eval $(host-python-package))
Migrate from setuptools to hatchling pep517 build backend. License hash changed due contributors change: https://github.com/urllib3/urllib3/commit/8e94754f85c59d826ac0604d0dd2a0b41874bb36 Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/python-urllib3/python-urllib3.hash | 6 +++--- package/python-urllib3/python-urllib3.mk | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)