Recent update of www/py-urllib3 [0] breaks www/py-requests:

Traceback (most recent call last):
  File "/usr/local/bin/urlwatch", line 6, in <module>
    from pkg_resources import load_entry_point
  File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 
3252, in <module>
    def _initialize_master_working_set():
  File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 
3235, in _call_aside
    f(*args, **kwargs)
  File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 
3264, in _initialize_master_working_set
    working_set = WorkingSet._build_master()
  File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 
585, in _build_master
    return cls._build_from_requirements(__requires__)
  File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 
598, in _build_from_requirements
    dists = ws.resolve(reqs, Environment())
  File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 
786, in resolve
    raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 
'urllib3!=1.25.0,!=1.25.1,<1.26,>=1.21.1' distribution was not found and is 
required by requests

Easy fix is to move py-requests forward to 2.25.0. Run tested on amd64.
No new failing tests:

======== 14 failed, 539 passed, 12 skipped, 1 xpassed in 103.45 seconds ========

OK?


[0] 
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/py-urllib3/Makefile?rev=1.19&content-type=text/x-cvsweb-markup


diff --git Makefile Makefile
index d7d047251f6..c47a848a093 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=               elegant and simple HTTP library for Python
 
-MODPY_EGG_VERSION=     2.24.0
+MODPY_EGG_VERSION=     2.25.0
 DISTNAME=              requests-${MODPY_EGG_VERSION}
 PKGNAME=               py-${DISTNAME}
 
diff --git distinfo distinfo
index 07fe00e802a..2cc600d6a20 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (requests-2.24.0.tar.gz) = s1WaEx23LDPulpSAhA//S7bdER3n3SfI7h+CD08AIxs=
-SIZE (requests-2.24.0.tar.gz) = 115071
+SHA256 (requests-2.25.0.tar.gz) = fxoLky9KYKGmXKpCY5Ibt9nukRlX4K5KI6bdCBha1fg=
+SIZE (requests-2.25.0.tar.gz) = 101897

Reply via email to