On Fri, Sep 18, 2020 at 09:54:41AM +0100, Stuart Henderson wrote:
> On 2020/09/17 21:31, Pamela Mosiejczuk wrote:
> > www/py-vcrpy has removed the python 2 flavor, and with the preceding
> > update to that, we can remove the python 2 flavor on test-vcr.
> > OK?
> @conflict isn't needed, and it will need a quirks entry to have
> py-test-vcr updated to py3-test-vcr.
I'm confused by this, because I've been told otherwise in the past. I was
told the quirks entry was insufficient to get pkg_add to update to the
python3 version automatically.
Was that past advice wrong? Or is there something different about this
situation?
--Kurt
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /home/cvs/ports/devel/py-test-vcr/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 Makefile
> > --- Makefile 3 Jul 2020 21:12:51 -0000 1.2
> > +++ Makefile 18 Sep 2020 01:24:47 -0000
> > @@ -5,7 +5,7 @@ COMMENT = plugin for managing VCR.py ca
> > MODPY_EGG_VERSION = 1.0.2
> > DISTNAME = pytest-vcr-${MODPY_EGG_VERSION}
> > PKGNAME = py-test-vcr-${MODPY_EGG_VERSION}
> > -REVISION = 0
> > +REVISION = 1
> >
> > CATEGORIES = devel
> >
> > @@ -22,9 +22,9 @@ MODPY_PI = Yes
> > MODPY_PYTEST = Yes
> >
> > FLAVORS = python3
> > -FLAVOR ?=
> > +FLAVOR = python3
> >
> > RUN_DEPENDS = www/py-vcrpy${MODPY_FLAVOR}
> >
> > -#tests not included in PyPI sdist, an issue is open upstream
> > +#tests will be included in pypi sdist on future releases
> > .include <bsd.port.mk>
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /home/cvs/ports/devel/py-test-vcr/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 PLIST
> > --- pkg/PLIST 19 Nov 2019 00:03:08 -0000 1.1.1.1
> > +++ pkg/PLIST 18 Sep 2020 01:21:08 -0000
> > @@ -1,4 +1,6 @@
> > @comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/19 00:03:08 pamela Exp $
> > +@conflict py-test-vcr-<=1.0.2
> > +@pkgpath devel/py-test-vcr
> >
> > lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_vcr.${MODPY_PYC_MAGIC_TAG}pyc
> >
> > lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> >
> > lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> >
>