On Fri, Mar 18, 2022 at 02:31:02PM +0000, Stuart Henderson wrote:
> couple of tweaks. you had a mis-edit in py-mock PLIST, no bump for quirks
> (and new entries normally go at the end).
> ok kmos?
ok kmos
--Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/Makefile,v
> retrieving revision 1.2197
> diff -u -p -r1.2197 Makefile
> --- Makefile 14 Mar 2022 07:55:35 -0000 1.2197
> +++ Makefile 18 Mar 2022 14:30:01 -0000
> @@ -1418,7 +1418,6 @@
> SUBDIR += py-mccabe,python3
> SUBDIR += py-minidump,python3
> SUBDIR += py-minimock,python3
> - SUBDIR += py-mock
> SUBDIR += py-mock,python3
> SUBDIR += py-modulegraph
> SUBDIR += py-modulegraph,python3
> Index: py-mock/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-mock/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- py-mock/Makefile 11 Mar 2022 18:52:48 -0000 1.19
> +++ py-mock/Makefile 18 Mar 2022 14:30:01 -0000
> @@ -1,10 +1,9 @@
> COMMENT= python mocking and patching library for testing
>
> -MODPY_EGG_VERSION= 3.0.5
> +MODPY_EGG_VERSION= 4.0.3
> DISTNAME= mock-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> CATEGORIES= devel
> -REVISION= 2
>
> HOMEPAGE= https://mock.readthedocs.io/en/latest/
>
> Index: py-mock/distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-mock/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- py-mock/distinfo 2 Dec 2019 22:47:52 -0000 1.5
> +++ py-mock/distinfo 18 Mar 2022 14:30:01 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mock-3.0.5.tar.gz) = g2V9iUyQ1WgdYhVcgr2pwRh4J1JYgO2o/1307IE0N8M=
> -SIZE (mock-3.0.5.tar.gz) = 28126
> +SHA256 (mock-4.0.3.tar.gz) = fT+73hgij0/y8fEZpFzf+kWLTA3uMutNK7L4JVS6x7w=
> +SIZE (mock-4.0.3.tar.gz) = 72316
> Index: py-mock/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-mock/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- py-mock/pkg/PLIST 11 Mar 2022 18:52:48 -0000 1.5
> +++ py-mock/pkg/PLIST 18 Mar 2022 14:30:01 -0000
> @@ -1,3 +1,4 @@
> +@pkgpath devel/py-mock
> lib/python${MODPY_VERSION}/site-packages/mock/
>
> lib/python${MODPY_VERSION}/site-packages/mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -8,5 +9,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mock/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mock/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/mock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/mock/${MODPY_PYCACHE}backports.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mock/${MODPY_PYCACHE}mock.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/mock/backports.py
> lib/python${MODPY_VERSION}/site-packages/mock/mock.py
> Index: py2-setuptools/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py2-setuptools/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- py2-setuptools/Makefile 11 Mar 2022 18:53:05 -0000 1.3
> +++ py2-setuptools/Makefile 18 Mar 2022 14:30:01 -0000
> @@ -24,17 +24,9 @@ MODULES = lang/python
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> -MODPY_PYTEST = Yes
> -MODPY_PYTEST_ARGS = setuptools/tests
> +NO_TEST = Yes
>
> SUBST_VARS+ = MODPY_FLAVOR
> -
> -# Not listed, but needed for tests
> -TEST_DEPENDS = devel/py-futures \
> - devel/py-mock \
> - devel/py-pip \
> - devel/py-wheel \
> - sysutils/py-packaging
>
> # Override automatic py-setuptools depend to avoid recursion
> MODPY_SETUPUTILS_DEPEND =
> Index: quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1363
> diff -u -p -r1.1363 Makefile
> --- quirks/Makefile 14 Mar 2022 08:04:13 -0000 1.1363
> +++ quirks/Makefile 18 Mar 2022 14:30:01 -0000
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-5.1
> +PKGNAME = quirks-5.2
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1377
> diff -u -p -r1.1377 Quirks.pm
> --- quirks/files/Quirks.pm 10 Mar 2022 10:57:58 -0000 1.1377
> +++ quirks/files/Quirks.pm 18 Mar 2022 14:30:01 -0000
> @@ -718,6 +718,7 @@ my $stem_extensions = {
> 'ssvnc-viewer' => 'tigervnc',
> 'py-tz' => 'py3-tz',
> 'py-pretend' => 'py3-pretend',
> + 'py-mock' => 'py3-mock',
> };
>
> my $obsolete_reason = {};
>
