Date: Mon, 28 Jun 2021 14:07:44 +1000 From: Kubilay Kocak <koobs@FreeBSD.org> To: Kevin Bowling <kbowling@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 46a663d44cb0 - main - devel/py-pytest-flask: revert 6.2.4 update Message-ID: <5be1f77c-74ec-13d9-9bf2-cabd89516ec0@FreeBSD.org> In-Reply-To: <202106270511.15R5BvQv060251@gitrepo.freebsd.org> References: <202106270511.15R5BvQv060251@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 27/06/2021 3:11 pm, Kevin Bowling wrote: > The branch main has been updated by kbowling: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=46a663d44cb038c4b5fcca21f1c0151db0e8302e > > commit 46a663d44cb038c4b5fcca21f1c0151db0e8302e > Author: Kevin Bowling <kbowling@FreeBSD.org> > AuthorDate: 2021-06-27 05:07:31 +0000 > Commit: Kevin Bowling <kbowling@FreeBSD.org> > CommitDate: 2021-06-27 05:08:40 +0000 > > devel/py-pytest-flask: revert 6.2.4 update > > Revert "devel/py-pytest: Update to 6.2.4" > > This reverts commit 0c6ce3c9c26d878acf943d53fb2a01ba602b71c2. > > Revert "devel/py-pytest-translations: Update to 3.1.0" > > This reverts commit 5989f395a01e1afc9b1b3a0c668d3cf48226f0c3. > > Revert "devel/py-pytest-xdist: Update to 2.3.0" > > This reverts commit d07f92b9bf00821e372f003d698525cd1ae19dc2. > > Revert "devel/py-pytest-flask: Update to 1.2.0" > > This reverts commit b15351babf6846ec3cdc902203874e55413ee08a. > > PR: 256624 > Requested by: koobs For clarity: I didn't request a revert. > devel/py-pytest-flask/Makefile | 2 +- > devel/py-pytest-flask/distinfo | 6 +++--- > devel/py-pytest-translations/Makefile | 15 +++++++++++---- > devel/py-pytest-translations/distinfo | 6 +++--- > devel/py-pytest-xdist/Makefile | 2 +- > devel/py-pytest-xdist/distinfo | 6 +++--- > devel/py-pytest/Makefile | 12 ++++++++---- > devel/py-pytest/distinfo | 6 +++--- > devel/py-pytest/files/patch-testing-test_parseopt.py | 11 +++++++++++ > 9 files changed, 44 insertions(+), 22 deletions(-) > > diff --git a/devel/py-pytest-flask/Makefile b/devel/py-pytest-flask/Makefile > index ac44b95fa728..ea2d49339048 100644 > --- a/devel/py-pytest-flask/Makefile > +++ b/devel/py-pytest-flask/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= pytest-flask > -PORTVERSION= 1.2.0 > +PORTVERSION= 0.15.1 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > diff --git a/devel/py-pytest-flask/distinfo b/devel/py-pytest-flask/distinfo > index 61a41a1c2e9f..2b39344f9738 100644 > --- a/devel/py-pytest-flask/distinfo > +++ b/devel/py-pytest-flask/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1624270576 > -SHA256 (pytest-flask-1.2.0.tar.gz) = 46fde652f77777bf02dc91205aec4ce20cdf2acbbbd66a918ab91f5c14693d3d > -SIZE (pytest-flask-1.2.0.tar.gz) = 32446 > +TIMESTAMP = 1581929217 > +SHA256 (pytest-flask-0.15.1.tar.gz) = cbd8c5b9f8f1b83e9c159ac4294964807c4934317a5fba181739ac15e1b823e6 > +SIZE (pytest-flask-0.15.1.tar.gz) = 24207 > diff --git a/devel/py-pytest-translations/Makefile b/devel/py-pytest-translations/Makefile > index 4adee38cd3f4..f0412c09a268 100644 > --- a/devel/py-pytest-translations/Makefile > +++ b/devel/py-pytest-translations/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= pytest-translations > -PORTVERSION= 3.1.0 > +PORTVERSION= 2.0.0 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > @@ -19,8 +19,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${P > ${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ > - de-hunspell>0:german/hunspell > + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist concurrent distutils > @@ -29,7 +28,15 @@ TEST_ENV= PYTHONPATH=${WRKSRC}/src > > NO_ARCH= yes > > +# Disable some of the tests. Upstream issue: > +# https://github.com/Thermondo/pytest-translations/issues/44 > do-test: > - cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts= > + cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts= \ > + -k 'not test_language_missing_in_po \ > + and not test_language_catalog_missing \ > + and not test_python_format_placeholders \ > + and not test_pass \ > + and not test_fail \ > + and not test_wordlist' > > .include <bsd.port.mk> > diff --git a/devel/py-pytest-translations/distinfo b/devel/py-pytest-translations/distinfo > index 11b4fc2dd5a8..75d052da93c4 100644 > --- a/devel/py-pytest-translations/distinfo > +++ b/devel/py-pytest-translations/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1624530137 > -SHA256 (pytest-translations-3.1.0.tar.gz) = 0f00cf85ed3c73a589ac58053c81713c31d3194db69d3f9c3e83b2f23e7d7693 > -SIZE (pytest-translations-3.1.0.tar.gz) = 8956 > +TIMESTAMP = 1576674845 > +SHA256 (pytest-translations-2.0.0.tar.gz) = 8f5aa5e98746ccc5e400486ea2084fd71251ccb35c0c53e4e1026d8af380bc08 > +SIZE (pytest-translations-2.0.0.tar.gz) = 8467 > diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile > index 3210aa8af104..44341bb80115 100644 > --- a/devel/py-pytest-xdist/Makefile > +++ b/devel/py-pytest-xdist/Makefile > @@ -1,7 +1,7 @@ > # Created by: Kubilay Kocak <koobs@FreeBSD.org> > > PORTNAME= pytest-xdist > -PORTVERSION= 2.3.0 > +PORTVERSION= 1.32.0 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > diff --git a/devel/py-pytest-xdist/distinfo b/devel/py-pytest-xdist/distinfo > index 8843cddac746..f7f6d920d0f1 100644 > --- a/devel/py-pytest-xdist/distinfo > +++ b/devel/py-pytest-xdist/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1624480550 > -SHA256 (pytest-xdist-2.3.0.tar.gz) = e8ecde2f85d88fbcadb7d28cb33da0fa29bca5cf7d5967fa89fc0e97e5299ea5 > -SIZE (pytest-xdist-2.3.0.tar.gz) = 66072 > +TIMESTAMP = 1589772305 > +SHA256 (pytest-xdist-1.32.0.tar.gz) = 1d4166dcac69adb38eeaedb88c8fada8588348258a3492ab49ba9161f2971129 > +SIZE (pytest-xdist-1.32.0.tar.gz) = 67733 > diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile > index 478833803b41..2f87d8b80937 100644 > --- a/devel/py-pytest/Makefile > +++ b/devel/py-pytest/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= pytest > -PORTVERSION= 6.2.4 > +PORTVERSION= 4.6.11 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > @@ -18,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY > ${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR} > TEST_DEPENDS= bash:shells/bash \ > lsof:sysutils/lsof \ > @@ -30,10 +29,10 @@ TEST_DEPENDS= bash:shells/bash \ > ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}xmlschema>=0:textproc/py-xmlschema@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR} > > USES= python:3.6+ > @@ -47,7 +46,12 @@ NO_ARCH= yes > RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} > .endif > > +post-patch: > + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_parseopt.py > + > +# test_cache_failure_warns fails > +# https://github.com/pytest-dev/pytest/issues/1845 > do-test: > - cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs > + cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns' > > .include <bsd.port.post.mk> > diff --git a/devel/py-pytest/distinfo b/devel/py-pytest/distinfo > index 6ccf342cc812..db173fdad5c5 100644 > --- a/devel/py-pytest/distinfo > +++ b/devel/py-pytest/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1623756059 > -SHA256 (pytest-6.2.4.tar.gz) = 50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b > -SIZE (pytest-6.2.4.tar.gz) = 1118084 > +TIMESTAMP = 1620405525 > +SHA256 (pytest-4.6.11.tar.gz) = 50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353 > +SIZE (pytest-4.6.11.tar.gz) = 952305 > diff --git a/devel/py-pytest/files/patch-testing-test_parseopt.py b/devel/py-pytest/files/patch-testing-test_parseopt.py > new file mode 100644 > index 000000000000..22683ffee3af > --- /dev/null > +++ b/devel/py-pytest/files/patch-testing-test_parseopt.py > @@ -0,0 +1,11 @@ > +--- testing/test_parseopt.py.orig 2020-06-05 12:09:03 UTC > ++++ testing/test_parseopt.py > +@@ -305,7 +305,7 @@ def test_argcomplete(testdir, monkeypatch): > + # redirect output from argcomplete to stdin and stderr is not trivial > + # http://stackoverflow.com/q/12589419/1307905 > + # so we use bash > +- fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" python -m pytest 8>&1 9>&2') > ++ fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" %%PYTHON_CMD%% -m pytest 8>&1 9>&2') > + # alternative would be exteneded Testdir.{run(),_run(),popen()} to be able > + # to handle a keyword argument env that replaces os.environ in popen or > + # extends the copy, advantage: could not forget to restore >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5be1f77c-74ec-13d9-9bf2-cabd89516ec0>