diff --git a/devel/py-pytest-relaxed/Makefile b/devel/py-pytest-relaxed/Makefile index 2c81b5ad459d..c75ad848fc4c 100644 --- a/devel/py-pytest-relaxed/Makefile +++ b/devel/py-pytest-relaxed/Makefile @@ -1,27 +1,23 @@ PORTNAME= pytest-relaxed -PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bofh@FreeBSD.org COMMENT= Relaxed test discovery/organization for pytest WWW= https://pytest-relaxed.readthedocs.io/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3:devel/py-pytest4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=4:devel/py-decorator@${PY_FLAVOR} USES= python:3.6+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils pytest NO_ARCH= yes -do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs - .include diff --git a/devel/py-pytest-relaxed/distinfo b/devel/py-pytest-relaxed/distinfo index 9a109ec96617..e490026a9b36 100644 --- a/devel/py-pytest-relaxed/distinfo +++ b/devel/py-pytest-relaxed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560858639 -SHA256 (pytest-relaxed-1.1.5.tar.gz) = e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6 -SIZE (pytest-relaxed-1.1.5.tar.gz) = 26786 +TIMESTAMP = 1673400565 +SHA256 (pytest-relaxed-2.0.0.tar.gz) = 4b373cc754666ff60f5425a69cb414642c2a11ce7a46c8ce066a738e4092ca39 +SIZE (pytest-relaxed-2.0.0.tar.gz) = 27040 diff --git a/devel/py-pytest-relaxed/files/patch-setup.py b/devel/py-pytest-relaxed/files/patch-setup.py deleted file mode 100644 index d03b242daa7d..000000000000 --- a/devel/py-pytest-relaxed/files/patch-setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2022-03-12 07:31:32 UTC -+++ setup.py -@@ -24,7 +24,7 @@ setup( - # TODO: do we need to name the LHS 'pytest_relaxed' too? meh - "pytest11": ["relaxed = pytest_relaxed.plugin"] - }, -- install_requires=["pytest>=3,<5", "six>=1,<2", "decorator>=4,<5"], -+ install_requires=["pytest>=3,<5", "six>=1,<2", "decorator>=4"], - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Framework :: Pytest", diff --git a/devel/py-pytest-relaxed/files/patch-tests_test__display.py b/devel/py-pytest-relaxed/files/patch-tests_test__display.py index e79263b4b2d0..9bfced24100d 100644 --- a/devel/py-pytest-relaxed/files/patch-tests_test__display.py +++ b/devel/py-pytest-relaxed/files/patch-tests_test__display.py @@ -1,32 +1,23 @@ # Two tests fail when warnings are present in the test run # https://github.com/bitprophet/pytest-relaxed/issues/7 ---- tests/test_display.py.orig 2019-06-14 18:05:29 UTC +--- tests/test_display.py.orig 2022-12-17 02:40:44 UTC +++ tests/test_display.py @@ -18,7 +18,7 @@ def _expect_regular_output(testdir): assert "== FAILURES ==" in output assert "AssertionError" in output # Summary - assert "== 1 failed, 4 passed, 1 skipped in " in output + assert "== 1 failed, 4 passed, 1 skipped" in output class TestRegularFunctions: -@@ -170,7 +170,7 @@ OtherBehaviors +@@ -166,7 +166,7 @@ OtherBehaviors assert "== FAILURES ==" in output assert "AssertionError" in output # Summary - assert "== 1 failed, 4 passed, 1 skipped in " in output + assert "== 1 failed, 4 passed, 1 skipped" in output - def test_tests_are_colorized_by_test_result( # noqa: F811,E501 - self, testdir, environ -@@ -225,7 +225,7 @@ OtherBehaviors - assert "== FAILURES ==" in output - assert "AssertionError" in output - # Summary -- assert "== 1 failed, 4 passed, 1 skipped in " in output -+ assert "== 1 failed, 4 passed, 1 skipped" in output - - def test_nests_many_levels_deep_no_problem(self, testdir): - testdir.makepyfile( + def test_tests_are_colorized_by_test_result( + self, testdir, environ # noqa: F811,E501