On Mon, May 24, 2021 at 09:54:48PM +0100, Stuart Henderson wrote: > ok for maturin > > py-adblock; tests fail for me like this. not necessarily a blocker, > do you want to send the qutebrowser diff to go with it to give a better > way to test? > > The tests are working fine upon a recheck, maybe something was wrong with the tarball so I've attached a new one with proper TEST_DEPENDS.
===> Regression tests for py3-adblock-0.4.4 pip3.8 install --isolated --root=/build/usr/ports/pobj/py-adblock-0.4.4-python3/python-adblock-0.4.4 --ignore-installed --no-deps /build/usr/ports/pobj/py-adblock-0.4.4-python3/python-adblock-0.4.4/target/wheels/*.whl WARNING: The directory '/nonexistent/.cache/pip' or its parent directory is not owned or is not writable by the current user. The cache has been disabled. Check the permissions and owner of that directory. If executing pip with sudo, you may want sudo's -H flag. Processing /build/usr/ports/pobj/py-adblock-0.4.4-python3/python-adblock-0.4.4/target/wheels/adblock-0.4.4-cp36-abi3-openbsd_6_9_amd64.whl Installing collected packages: adblock Successfully installed adblock-0.4.4 cd /build/usr/ports/pobj/py-adblock-0.4.4-python3/python-adblock-0.4.4 && /usr/bin/env -i CC=cc PYTHONUSERBASE= PORTSDIR="/build/usr/ports" LIBTOOL="/usr/bin/libtool" PATH='/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin' PREFIX='/usr/local' LOCALBASE='/usr/local' X11BASE='/usr/X11R6' CFLAGS='-O2 -pipe' TRUEPREFIX='/usr/local' DESTDIR='' HOME='/py-adblock-0.4.4_writes_to_HOME' PICFLAG="-fpic" BINGRP=bin BINOWN=root BINMODE=755 NONBINMODE=644 DIRMODE=755 INSTALL_COPY=-c INSTALL_STRIP=-s MANGRP=bin MANOWN=root MANMODE=644 BSD_INSTALL_PROGRAM="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -c -s -m 755" BSD_INSTALL_SCRIPT="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -c -m 755" BSD_INSTALL_DATA="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -c -m 644" BSD_INSTALL_MAN="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -c -m 644" BSD_INSTALL_PROGRAM_DIR="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -d -m 755" BSD_INSTALL_SCRIPT_DIR="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -d -m 755" BSD_INSTALL_DATA_DIR="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -d -m 755" BSD_INSTALL_MAN_DIR="/build/usr/ports/pobj/py-adblock-0.4.4-python3/bin/install -d -m 755" PYTHONPATH=/build/usr/ports/pobj/py-adblock-0.4.4-python3/python-adblock-0.4.4/usr/local/lib/python3.8/site-packages:/usr/local/lib/python3.8/site-packages LC_CTYPE=en_US.UTF-8 py.test -v ============================= test session starts ============================== platform openbsd6 -- Python 3.8.8, pytest-4.4.0, py-1.8.0, pluggy-0.11.0 -- /usr/local/bin/python3.8 cachedir: .pytest_cache rootdir: /build/usr/ports/pobj/py-adblock-0.4.4-python3/python-adblock-0.4.4 collecting ... collected 9 items tests/test_engine.py::test_engine_creation_and_blocking PASSED [ 11%] tests/test_engine.py::test_serde_file PASSED [ 22%] tests/test_engine.py::test_serde PASSED [ 33%] tests/test_imports.py::test_added_classes PASSED [ 44%] tests/test_imports.py::test_dunder_all_classes_imported PASSED [ 55%] tests/test_metadata.py::test_version_numbers_all_same PASSED [ 66%] tests/test_metadata.py::test_required_python_version PASSED [ 77%] tests/test_repr.py::test_has_nondefault_repr PASSED [ 88%] tests/test_typestubs.py::test_functions_and_methods_exist_in_rust PASSED [100%] =========================== 9 passed in 5.28 seconds =========================== This qutebrowser update removes the only existing patch leaving an empty 'patches' dir. On the first run, one must execute the cmd ":adblock-update" (as in vi). https://adblock-tester.com/ Index: Makefile =================================================================== RCS file: /cvs/ports/www/qutebrowser/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile 6 Apr 2021 20:00:13 -0000 1.29 +++ Makefile 25 May 2021 00:45:55 -0000 @@ -2,9 +2,8 @@ COMMENT = keyboard-focused browser with a minimal GUI -MODPY_EGG_VERSION = 2.1.1 +MODPY_EGG_VERSION = 2.2.2 DISTNAME = qutebrowser-${MODPY_EGG_VERSION} -REVISION = 0 HOMEPAGE = https://www.qutebrowser.org/ @@ -24,6 +23,7 @@ RUN_DEPENDS = devel/desktop-file-utils textproc/py-yaml${MODPY_FLAVOR} \ x11/gtk+3,-guic \ x11/py-qt5${MODPY_FLAVOR} \ + www/py-adblock${MODPY_FLAVOR} \ www/py-jinja2${MODPY_FLAVOR} \ www/py-qtwebengine${MODPY_FLAVOR} Index: distinfo =================================================================== RCS file: /cvs/ports/www/qutebrowser/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo 2 Apr 2021 14:24:40 -0000 1.17 +++ distinfo 25 May 2021 00:45:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (qutebrowser-2.1.1.tar.gz) = txsArX1JiRGXjlu9FTpt0EUKxq3j5b85j8luFTKDQs4= -SIZE (qutebrowser-2.1.1.tar.gz) = 6249239 +SHA256 (qutebrowser-2.2.2.tar.gz) = eFXqnZsYe409CsabMxeAMW6T1bG/87MSkLLV/4C4coc= +SIZE (qutebrowser-2.2.2.tar.gz) = 6314896 Index: patches/patch-qutebrowser_misc_elf_py =================================================================== RCS file: patches/patch-qutebrowser_misc_elf_py diff -N patches/patch-qutebrowser_misc_elf_py --- patches/patch-qutebrowser_misc_elf_py 7 Apr 2021 16:12:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-qutebrowser_misc_elf_py,v 1.2 2021/04/07 16:12:49 sthen Exp $ - -Fix QtWebEngine version detection on OpenBSD, similar to / replaced by - -From a38fabda2581790d365cb82ea37cf45c1c7bb3a6 Mon Sep 17 00:00:00 2001 -From: Dimitri Karamazov <[email protected]> -Date: Tue, 6 Apr 2021 23:13:43 +0530 -Subject: [PATCH] Remove reduntant operations - -Index: qutebrowser/misc/elf.py ---- qutebrowser/misc/elf.py.orig -+++ qutebrowser/misc/elf.py -@@ -316,8 +316,8 @@ def parse_webenginecore() -> Optional[Versions]: - else: - library_path = pathlib.Path(QLibraryInfo.location(QLibraryInfo.LibrariesPath)) - -- # PyQt bundles those files with a .5 suffix -- lib_file = library_path / 'libQt5WebEngineCore.so.5' -+ library_name = sorted(list(pathlib.Path(library_path).glob('libQt5WebEngineCore.so*'))) -+ lib_file = library_path / library_name[-1].as_posix() - if not lib_file.exists(): - return None - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/qutebrowser/pkg/PLIST,v retrieving revision 1.14 diff -u -p -r1.14 PLIST --- pkg/PLIST 23 Mar 2021 14:59:00 -0000 1.14 +++ pkg/PLIST 25 May 2021 00:45:56 -0000 @@ -93,6 +93,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}cookies.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}darkmode.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}interceptor.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}spell.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}tabhistory.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}webenginedownloads.${MODPY_PYC_MAGIC_TAG}pyc @@ -106,6 +107,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/cookies.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/darkmode.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/interceptor.py +lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/notification.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/spell.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/tabhistory.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/webenginedownloads.py @@ -164,11 +166,13 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/${MODPY_PYCACHE}argparser.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/${MODPY_PYCACHE}cmdexc.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/${MODPY_PYCACHE}runners.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/${MODPY_PYCACHE}userscripts.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/argparser.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/cmdexc.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/command.py +lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/parser.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/runners.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/commands/userscripts.py lib/python${MODPY_VERSION}/site-packages/qutebrowser/completion/ @@ -290,6 +294,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/log.html lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/no_pdfjs.html lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/pre.html +lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/process.html lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/settings.html lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/styled.html lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/tabs.html @@ -308,7 +313,9 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/pac_utils.js lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/position_caret.js lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/ +lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/discord.user.js lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/globalthis.user.js +lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/googledocs.user.js lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/object_fromentries.user.js lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/string_replaceall.user.js lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/whatsapp_web.user.js
py-adblock.tar.gz
Description: Binary data
