Updates vcrpy to 4.1.0, which removes the python2 flavor.
There is a breaking change to how aiohttp follows redirects, and
cassettes may need to be re-recorded after the update.
Passes 267 tests, fails 17. This port is a test dependency for www/tuir
and sysutils/py-vmomi, with no change to pass/fail numbers, and a run
dependency for devel/py-test-vcr, diff to remove py2 there as well
follows.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/py-vcrpy/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 3 Jul 2020 21:13:20 -0000 1.2
+++ Makefile 18 Sep 2020 01:24:09 -0000
@@ -2,10 +2,9 @@
COMMENT = automatically mock HTTP interactions to speed testing
-MODPY_EGG_VERSION = 2.1.1
+MODPY_EGG_VERSION = 4.1.0
DISTNAME = vcrpy-${MODPY_EGG_VERSION}
PKGNAME = py-vcrpy-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = www
@@ -22,20 +21,12 @@ MODPY_PI = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
devel/py-wrapt${MODPY_FLAVOR} \
- textproc/py-yaml${MODPY_FLAVOR}
-
-.if ! ${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-contextlib2 \
- devel/py-mock
-.endif
-
-.if ${FLAVOR:Mpython3}
-RUN_DEPENDS += www/py-yarl
-.endif
+ textproc/py-yaml${MODPY_FLAVOR} \
+ www/py-yarl
TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
devel/py-test-httpbin${MODPY_FLAVOR}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/www/py-vcrpy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 Nov 2019 23:54:11 -0000 1.1.1.1
+++ distinfo 18 Sep 2020 00:27:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (vcrpy-2.1.1.tar.gz) = J8xpbfZtd3A+q1zfoEGy+Yd7vytUvNOQ3omkvpZMpTY=
-SIZE (vcrpy-2.1.1.tar.gz) = 71072
+SHA256 (vcrpy-4.1.0.tar.gz) = QTjnnrNZga05FAbLtyJ7zn66i614jc8aicLkqLdA3r4=
+SIZE (vcrpy-4.1.0.tar.gz) = 78104
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/www/py-vcrpy/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Nov 2019 23:54:11 -0000 1.1.1.1
+++ pkg/PLIST 18 Sep 2020 01:15:10 -0000
@@ -1,23 +1,24 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/18 23:54:11 pamela Exp $
+@conflict py-vcrpy-<4.1.0
+@pkgpath www/py-vcrpy
lib/python${MODPY_VERSION}/site-packages/vcr/
lib/python${MODPY_VERSION}/site-packages/vcr/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}_handle_coroutine.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}cassette.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}matchers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}migration.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}patch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}record_mode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}serialize.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/_handle_coroutine.py
lib/python${MODPY_VERSION}/site-packages/vcr/cassette.py
-lib/python${MODPY_VERSION}/site-packages/vcr/compat.py
lib/python${MODPY_VERSION}/site-packages/vcr/config.py
lib/python${MODPY_VERSION}/site-packages/vcr/errors.py
lib/python${MODPY_VERSION}/site-packages/vcr/filters.py
@@ -30,6 +31,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/vcr/persisters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/persisters/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/persisters/filesystem.py
+lib/python${MODPY_VERSION}/site-packages/vcr/record_mode.py
lib/python${MODPY_VERSION}/site-packages/vcr/request.py
lib/python${MODPY_VERSION}/site-packages/vcr/serialize.py
lib/python${MODPY_VERSION}/site-packages/vcr/serializers/
@@ -46,21 +48,21 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}aiohttp_stubs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}boto3_stubs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}boto_stubs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}httplib2_stubs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}httpx_stubs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}requests_stubs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}tornado_stubs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/${MODPY_PYCACHE}urllib3_stubs.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/stubs/aiohttp_stubs/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/stubs/aiohttp_stubs/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/stubs/aiohttp_stubs/${MODPY_PYCACHE}/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/stubs/aiohttp_stubs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/vcr/stubs/aiohttp_stubs.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/boto3_stubs.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/boto_stubs.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/compat.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/httplib2_stubs.py
+lib/python${MODPY_VERSION}/site-packages/vcr/stubs/httpx_stubs.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/requests_stubs.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/tornado_stubs.py
lib/python${MODPY_VERSION}/site-packages/vcr/stubs/urllib3_stubs.py
