On 2019/04/28 23:27, Kurt Mosiejczuk wrote:
> I actually found I was missing two RUN_DEPENDS, py-atomicwrites
> and, for python 2.7, py-pathlib2.
>
> Those are included here.
>
> Besides the extensive testing I've done making sure we don't
> regress, I tested all ports that list py-test as a BUILD_DEPENDS.
>
> devel/py-pluggy and devel/py-hypothesis updates are needed
> for tests of this and other things. They are coming right after
> this email.
OK for the four (I would prefer to mention cpuinfo in a Makefile
comment for devel/py-test-benchmark rather than just hidden in a patch
though).
+cc shadchin@, any comments?
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-test/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 28 Apr 2018 10:47:05 -0000 1.30
> +++ Makefile 29 Apr 2019 03:09:46 -0000
> @@ -2,13 +2,13 @@
>
> COMMENT= cross-project testing tool for Python
>
> -MODPY_EGG_VERSION= 3.5.0
> +MODPY_EGG_VERSION = 4.4.0
> DISTNAME= pytest-${MODPY_EGG_VERSION}
> PKGNAME= py-test-${MODPY_EGG_VERSION}
>
> CATEGORIES= devel
>
> -HOMEPAGE= http://pytest.org/latest/
> +HOMEPAGE = https://docs.pytest.org/en/latest/
>
> MAINTAINER= Alexandr Shadchin <shadc...@openbsd.org>
>
> @@ -18,29 +18,40 @@ PERMIT_PACKAGE_CDROM= Yes
> MODULES= lang/python
>
> MODPY_PI = Yes
> -MODPY_SETUPTOOLS= Yes
> +MODPY_SETUPTOOLS = Yes
> +MODPY_PYTEST = Yes
> +MODPY_PYTEST_ARGS = testing
>
> FLAVORS= python3
> FLAVOR?=
>
> -BUILD_DEPENDS= devel/py-setuptools_scm${MODPY_FLAVOR}
> +BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
>
> -RUN_DEPENDS= devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
> +RUN_DEPENDS = devel/py-atomicwrites${MODPY_FLAVOR} \
> + devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
> devel/py-more-itertools${MODPY_FLAVOR} \
> - devel/py-pluggy${MODPY_FLAVOR}>=0.6 \
> - devel/py-py${MODPY_FLAVOR}>=1.5.0 \
> + devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
> + devel/py-py${MODPY_FLAVOR} \
> devel/py-setuptools${MODPY_FLAVOR} \
> - devel/py-six${MODPY_FLAVOR}>=1.10.0
> + devel/py-six${MODPY_FLAVOR}
> .if !${FLAVOR:Mpython3}
> -RUN_DEPENDS += devel/py-funcsigs
> +RUN_DEPENDS += devel/py-funcsigs \
> + devel/py-pathlib2
> .endif
>
> -TEST_DEPENDS= ${RUN_DEPENDS} \
> +TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
> + ${RUN_DEPENDS} \
> devel/py-hypothesis${MODPY_FLAVOR} \
> devel/py-mock${MODPY_FLAVOR} \
> devel/py-nose${MODPY_FLAVOR} \
> shells/bash \
> www/py-requests${MODPY_FLAVOR}
> +.if !${FLAVOR:Mpython3}
> +TEST_DEPENDS += devel/py-pathlib2 \
> + sysutils/py-scandir
> +.endif
> +
> +
>
> post-install:
> mv ${PREFIX}/bin/py.test{,${MODPY_BIN_SUFFIX}}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-test/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 28 Apr 2018 10:47:05 -0000 1.17
> +++ distinfo 29 Apr 2019 03:09:46 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pytest-3.5.0.tar.gz) = +uSR0YdPGZU3/VhyteHw50oAm5ed+dU9FVP9A9oXA+E=
> -SIZE (pytest-3.5.0.tar.gz) = 830816
> +SHA256 (pytest-4.4.0.tar.gz) = 8h0vH7ggCDDcu12OxGapyRIOINi1PHWF0YASXM4dKXo=
> +SIZE (pytest-4.4.0.tar.gz) = 931197
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-test/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 28 Apr 2018 10:47:05 -0000 1.9
> +++ pkg/PLIST 29 Apr 2019 03:09:46 -0000
> @@ -11,7 +11,6 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}cacheprovider.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}debugging.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -27,18 +26,22 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}nose.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}outcomes.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pastebin.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pathlib.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pytester.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python_api.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}recwarn.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}reports.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}resultlog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}setuponly.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}setupplan.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}skipping.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}stepwise.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}tmpdir.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}unittest.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}warning_types.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/_pytest/_argcomplete.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/_code/
> @@ -51,6 +54,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/_pytest/_code/_py2traceback.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/_code/code.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/_code/source.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/saferepr.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/_version.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/
> lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/__init__.py
> @@ -65,7 +74,16 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/_pytest/cacheprovider.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/capture.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/compat.py
> -lib/python${MODPY_VERSION}/site-packages/_pytest/config.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}argparsing.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}findpaths.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/argparsing.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/config/findpaths.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/debugging.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/deprecated.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/doctest.py
> @@ -91,18 +109,22 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/_pytest/nose.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/outcomes.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/pastebin.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/pathlib.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/pytester.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/python.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/python_api.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/recwarn.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/reports.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/resultlog.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/runner.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/setuponly.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/setupplan.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/skipping.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/stepwise.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/terminal.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/tmpdir.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/unittest.py
> +lib/python${MODPY_VERSION}/site-packages/_pytest/warning_types.py
> lib/python${MODPY_VERSION}/site-packages/_pytest/warnings.py
>
> lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
