On Fri, May 15 2020, Antoine Jacoutot <ajacou...@bsdfrog.org> wrote: > On Thu, May 14, 2020 at 12:12:36PM -0600, Paco Esteban wrote: >> CVSROOT: /cvs >> Module name: ports >> Changes by: p...@cvs.openbsd.org 2020/05/14 12:12:36 >> >> Modified files: >> www/py-urllib3 : Makefile distinfo >> Removed files: >> www/py-urllib3/patches: patch-setup_cfg >> >> Log message: >> update py-urllib3 to 1.25.9 >> >> ok sthen@ jca@ > > This broke sysutils/py-elasticsearch-curator: > > ===> py3-elasticsearch-curator-5.8.1 depends on: py3-urllib3->=1.24.2,<1.25 - > default py3-urllib3-1.25.9 does not match
+cc maintainer The port Makefile seems to reproduce the upstream requirements. I see no rationale in https://github.com/elastic/curator/commit/0cc508244b667cb933846f80f9c5f4690f8df05b for limiting urllib3 versions to <1.25. I suspect it's just the "these versions are known to work, let's pin them" pattern. The diff below just drops the <1.25 requirement. Build-tested only. ok? Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/py-elasticsearch-curator/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 24 Oct 2019 13:35:04 -0000 1.22 +++ Makefile 15 May 2020 12:46:52 -0000 @@ -3,6 +3,7 @@ COMMENT= manage Elasticsearch indices MODPY_EGG_VERSION=5.8.1 +REVISION= 0 DISTNAME= elasticsearch-curator-${MODPY_EGG_VERSION} PKGNAME= ${MODPY_PY_PREFIX}elasticsearch-curator-${MODPY_EGG_VERSION} @@ -30,7 +31,7 @@ RUN_DEPENDS= devel/py-certifi${MODPY_FLA textproc/py-elasticsearch${MODPY_FLAVOR}>=7.0.4,<8.0.0 \ textproc/py-yaml${MODPY_FLAVOR}>=3.13 \ www/py-requests${MODPY_FLAVOR}>=2.20.0 \ - www/py-urllib3${MODPY_FLAVOR}>=1.24.2,<1.25 + www/py-urllib3${MODPY_FLAVOR}>=1.24.2 BUILD_DEPENDS= ${RUN_DEPENDS} Index: patches/patch-setup_cfg =================================================================== RCS file: /cvs/ports/sysutils/py-elasticsearch-curator/patches/patch-setup_cfg,v retrieving revision 1.1 diff -u -p -r1.1 patch-setup_cfg --- patches/patch-setup_cfg 24 Oct 2019 13:35:04 -0000 1.1 +++ patches/patch-setup_cfg 15 May 2020 12:46:52 -0000 @@ -1,9 +1,17 @@ $OpenBSD: patch-setup_cfg,v 1.1 2019/10/24 13:35:04 pvk Exp $ +Loosen requirements. + Index: setup.cfg --- setup.cfg.orig +++ setup.cfg -@@ -27,7 +27,7 @@ install_requires = +@@ -22,23 +22,23 @@ classifiers = + install_requires = + voluptuous>=0.9.3 + elasticsearch>=7.0.4,<8.0.0 +- urllib3>=1.24.2,<1.25 ++ urllib3>=1.24.2 + requests>=2.20.0 boto3>=1.9.142 requests_aws4auth>=0.9 click>=6.7,<7.0 @@ -12,7 +20,11 @@ Index: setup.cfg certifi>=2019.9.11 six>=1.11.0 setup_requires = -@@ -38,7 +38,7 @@ setup_requires = + voluptuous>=0.9.3 + elasticsearch>=7.0.4,<8.0.0 +- urllib3>=1.24.2,<1.25 ++ urllib3>=1.24.2 + requests>=2.20.0 boto3>=1.9.142 requests_aws4auth>=0.9 click>=6.7,<7.0 Index: patches/patch-setup_py =================================================================== RCS file: /cvs/ports/sysutils/py-elasticsearch-curator/patches/patch-setup_py,v retrieving revision 1.5 diff -u -p -r1.5 patch-setup_py --- patches/patch-setup_py 24 Oct 2019 13:35:04 -0000 1.5 +++ patches/patch-setup_py 15 May 2020 12:46:52 -0000 @@ -1,9 +1,17 @@ $OpenBSD: patch-setup_py,v 1.5 2019/10/24 13:35:04 pvk Exp $ +Loosen requirements. + Index: setup.py --- setup.py.orig +++ setup.py -@@ -28,7 +28,7 @@ def get_install_requires(): +@@ -23,12 +23,12 @@ def get_version(): + + def get_install_requires(): + res = ['elasticsearch>=7.0.4,<8.0.0' ] +- res.append('urllib3>=1.24.2,<1.25') ++ res.append('urllib3>=1.24.2') + res.append('requests>=2.20.0') res.append('boto3>=1.9.142') res.append('requests_aws4auth>=0.9') res.append('click>=6.7,<7.0') -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
