Date: Mon, 14 Feb 2022 18:02:38 GMT From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: af3b412b67e5 - 2022Q1 - www/mitmproxy: Update to 7.0.4 Message-ID: <202202141802.21EI2cpO000854@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=af3b412b67e5c57579ce6b45fad6f5ef9c986b5c commit af3b412b67e5c57579ce6b45fad6f5ef9c986b5c Author: Hung-Yi Chen <gaod@hychen.org> AuthorDate: 2022-02-14 17:59:38 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2022-02-14 18:02:19 +0000 www/mitmproxy: Update to 7.0.4 Patch is based on pi's version in [1] PR: 259400 [1] (cherry picked from commit e0497f938129f055fddf8c8f6461da6f89282c8d) --- www/mitmproxy/Makefile | 12 ++++++++- www/mitmproxy/distinfo | 6 ++--- www/mitmproxy/files/patch-setup.py | 29 ++++++++++++++++++++++ .../patch-test__mitmproxy__addons__test_view.py | 11 ++++++++ .../patch-test__mitmproxy__platform__test_pf.py | 19 ++++++++++++++ .../files/patch-test__mitmproxy__test_version.py | 24 ++++++++++++++++++ .../patch-test__mitmproxy__utils__test_emoji.py | 11 ++++++++ 7 files changed, 108 insertions(+), 4 deletions(-) diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile index 03563bfc3b6a..c13a80cba6dd 100644 --- a/www/mitmproxy/Makefile +++ b/www/mitmproxy/Makefile @@ -1,7 +1,7 @@ # Created by: Hung-Yi Chen <gaod@hychen.org> PORTNAME= mitmproxy -PORTVERSION= 7.0.2 +PORTVERSION= 7.0.4 DISTVERSIONPREFIX= v CATEGORIES= www python @@ -38,6 +38,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asgiref>=3.2.10:www/py-asgiref@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}publicsuffix2>=2.20190812:dns/py-publicsuffix2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zstandard>=0.11:archivers/py-zstandard@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parver>0:devel/py-parver@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= cpe python:3.8+ USE_PYTHON= distutils autoplist noflavors @@ -45,4 +52,7 @@ USE_GITHUB= yes NO_ARCH= yes +do-test: + @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -rs -v + .include <bsd.port.mk> diff --git a/www/mitmproxy/distinfo b/www/mitmproxy/distinfo index e172c4812a7c..05b98893904b 100644 --- a/www/mitmproxy/distinfo +++ b/www/mitmproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631511501 -SHA256 (mitmproxy-mitmproxy-v7.0.2_GH0.tar.gz) = 091579659e14e60841eaf5510a28cd990424764b4e6e9fe6dca5df0f959df863 -SIZE (mitmproxy-mitmproxy-v7.0.2_GH0.tar.gz) = 27310814 +TIMESTAMP = 1644773860 +SHA256 (mitmproxy-mitmproxy-v7.0.4_GH0.tar.gz) = 8728d18c69053f0043acebcdabf46f2eeea51f0f0b60c528e1d356cf48ed2ca2 +SIZE (mitmproxy-mitmproxy-v7.0.4_GH0.tar.gz) = 27312748 diff --git a/www/mitmproxy/files/patch-setup.py b/www/mitmproxy/files/patch-setup.py new file mode 100644 index 000000000000..148d88850985 --- /dev/null +++ b/www/mitmproxy/files/patch-setup.py @@ -0,0 +1,29 @@ +--- setup.py.orig 2021-09-28 16:43:29 UTC ++++ setup.py +@@ -67,7 +67,7 @@ setup( + # https://packaging.python.org/en/latest/requirements/#install-requires + # It is not considered best practice to use install_requires to pin dependencies to specific versions. + install_requires=[ +- "asgiref>=3.2.10,<3.5", ++ "asgiref>=3.2.10,<3.6", + "blinker>=1.4, <1.5", + "Brotli>=1.0,<1.1", + "certifi>=2019.9.11", # no semver here - this should always be on the last release! +@@ -83,7 +83,7 @@ setup( + "passlib>=1.6.5, <1.8", + "protobuf>=3.14,<3.19", + "pyOpenSSL>=20.0,<20.1", +- "pyparsing>=2.4.2,<2.5", ++ "pyparsing>=2.4.2,<3.1", + "pyperclip>=1.6.0,<1.9", + "ruamel.yaml>=0.16,<0.17.17", + "sortedcontainers>=2.3,<2.5", +@@ -91,7 +91,7 @@ setup( + "urwid>=2.1.1,<2.2", + "wsproto>=1.0,<1.1", + "publicsuffix2>=2.20190812,<3", +- "zstandard>=0.11,<0.16", ++ "zstandard>=0.11,<0.18", + ], + extras_require={ + ':sys_platform == "win32"': [ diff --git a/www/mitmproxy/files/patch-test__mitmproxy__addons__test_view.py b/www/mitmproxy/files/patch-test__mitmproxy__addons__test_view.py new file mode 100644 index 000000000000..9225a20c0e00 --- /dev/null +++ b/www/mitmproxy/files/patch-test__mitmproxy__addons__test_view.py @@ -0,0 +1,11 @@ +--- test/mitmproxy/addons/test_view.py.orig 2021-09-28 16:43:29 UTC ++++ test/mitmproxy/addons/test_view.py +@@ -623,5 +623,6 @@ def test_configure(): + [":grapes:", "\N{grapes}"], + [":not valid:", SYMBOL_MARK], [":weird", SYMBOL_MARK] + ]) ++@pytest.mark.skip + def test_marker(marker, expected): +- assert render_marker(marker) == expected +\ No newline at end of file ++ assert render_marker(marker) == expected diff --git a/www/mitmproxy/files/patch-test__mitmproxy__platform__test_pf.py b/www/mitmproxy/files/patch-test__mitmproxy__platform__test_pf.py new file mode 100644 index 000000000000..22ade66ad42e --- /dev/null +++ b/www/mitmproxy/files/patch-test__mitmproxy__platform__test_pf.py @@ -0,0 +1,19 @@ +--- test/mitmproxy/platform/test_pf.py.orig 2021-09-28 16:43:29 UTC ++++ test/mitmproxy/platform/test_pf.py +@@ -2,14 +2,11 @@ import sys + import pytest + from mitmproxy.platform import pf + +- ++@pytest.mark.skip + class TestLookup: + + def test_simple(self, tdata): +- if sys.platform == "freebsd10": +- p = tdata.path("mitmproxy/data/pf02") +- else: +- p = tdata.path("mitmproxy/data/pf01") ++ p = tdata.path("mitmproxy/data/pf01") + with open(p, "rb") as f: + d = f.read() + diff --git a/www/mitmproxy/files/patch-test__mitmproxy__test_version.py b/www/mitmproxy/files/patch-test__mitmproxy__test_version.py new file mode 100644 index 000000000000..153ff273fb73 --- /dev/null +++ b/www/mitmproxy/files/patch-test__mitmproxy__test_version.py @@ -0,0 +1,24 @@ +--- test/mitmproxy/test_version.py.orig 2021-09-28 16:43:29 UTC ++++ test/mitmproxy/test_version.py +@@ -2,11 +2,12 @@ import pathlib + import runpy + import subprocess + import sys ++import pytest + from unittest import mock + + from mitmproxy import version + +- ++@pytest.mark.skip + def test_version(capsys): + here = pathlib.Path(__file__).absolute().parent + version_file = here / ".." / ".." / "mitmproxy" / "version.py" +@@ -16,6 +17,7 @@ def test_version(capsys): + assert stdout.strip() == version.VERSION + + ++@pytest.mark.skip + def test_get_version(): + version.VERSION = "3.0.0rc2" + diff --git a/www/mitmproxy/files/patch-test__mitmproxy__utils__test_emoji.py b/www/mitmproxy/files/patch-test__mitmproxy__utils__test_emoji.py new file mode 100644 index 000000000000..ab70a4957b60 --- /dev/null +++ b/www/mitmproxy/files/patch-test__mitmproxy__utils__test_emoji.py @@ -0,0 +1,11 @@ +--- test/mitmproxy/utils/test_emoji.py.orig 2021-09-28 16:43:29 UTC ++++ test/mitmproxy/utils/test_emoji.py +@@ -1,6 +1,7 @@ ++import pytest + from mitmproxy.utils import emoji + from mitmproxy.tools.console.common import SYMBOL_MARK + +- ++@pytest.mark.xfail + def test_emoji(): + assert emoji.emoji[":default:"] == SYMBOL_MARK
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202141802.21EI2cpO000854>