Commit Graph

24493 Commits

Author SHA1 Message Date
Florian Bruhin 0718b25796 reuse: Initial copyright text update for myself
git ls-files | \
    xargs sed -Ei 's/Copyright [0-9]{4}(-[0-9]{4}) Florian Bruhin \(The Compiler\) <mail@qutebrowser\.org>/SPDX-FileCopyrightText: Florian Bruhin (The Compiler) <mail@qutebrowser.org>/'
2023-07-23 12:49:05 +02:00
Florian Bruhin 67686bb1a7 reuse: Fix remaining userscripts without extension
reuse annotate --license="GPL-3.0-or-later" --style python \
    misc/userscripts/openfeeds \
    misc/userscripts/qute-bitwarden \
    misc/userscripts/qute-keepass \
    misc/userscripts/qute-keepassxc \
    misc/userscripts/qute-lastpass \
    misc/userscripts/qute-pass \
    misc/userscripts/tor_identity \
    misc/userscripts/dmenu_qutebrowser \
    misc/userscripts/rss
2023-07-23 12:28:23 +02:00
Florian Bruhin 9cd75691c9 reuse: Fix up the situation in qutebrowser/javascript/caret.js 2023-07-23 12:26:01 +02:00
Florian Bruhin d2975c6d09 reuse: Get files in misc/nsis/ to use SPDX
reuse annotate --license="GPL-3.0-or-later" --style python \
    misc/nsis/uninstall_pages.nsh \
    misc/nsis/install.nsh \
    misc/nsis/uninstall.nsh

And fixing qutebrowser.nsi manually as that uses iso-8859-1 and the reuse tool
doesn't like that apparently.
2023-07-23 12:19:27 +02:00
Florian Bruhin 77ca342cff reuse: Remove some more old license headers
git ls-files | \
xargs grep -l "This file is part of qutebrowser" | \
xargs grep -l SPDX-License-Identifier | \
xargs sed -i '/# This file is part of qutebrowser\./,/along with qutebrowser\.  If not, see <https:\/\/www\.gnu.org\/licenses\/>./d'
2023-07-23 12:15:03 +02:00
Florian Bruhin b2aaba6043 reuse: Adjust most license headers
git ls-files | xargs grep -l "is free software"  | xargs reuse annotate --license="GPL-3.0-or-later" --skip-unrecognised
2023-07-23 12:11:07 +02:00
Florian Bruhin 73303da665 reuse: Run init commands
- reuse init
- reuse download --all

See #7104
2023-07-23 12:10:12 +02:00
Florian Bruhin 9330e9fd91 Fix funny remaining master branch reference 2023-07-23 12:08:22 +02:00
Florian Bruhin ec34865168 Move master branch references to main
Closes #7097
2023-07-23 11:38:19 +02:00
Florian Bruhin 62fef9d9e6 Update changelog regarding dropped OS versions
See #7092, #6050
2023-07-22 20:08:26 +02:00
Florian Bruhin 97c1798d88 Update changelog 2023-07-22 19:20:43 +02:00
Florian Bruhin bacc76815a Merge remote-tracking branch 'origin/pr/7768' 2023-07-22 19:11:36 +02:00
Paul Mairo 8fdf168ac0 quitter: fix prompt_queue being None at shudown
When pressing C-c if qutebrowser is not fully started yet, the prompt_queue is not
initialized and prompts for an annoying crash report.

Fixes #6827
2023-07-22 16:14:51 +02:00
Florian Bruhin 4a031f4eaf Merge branch 'master' of https://github.com/rmpr/qutebrowser 2023-07-22 15:04:35 +02:00
Paul Mairo b9450a1356 fixup! fixup! mkvenv: Fix '--pyqt-type link' without --pyqt-version
I broke it oops
2023-07-22 15:03:13 +02:00
Paul Mairo 2a3993e5b8 fixup! mkvenv: Fix '--pyqt-type link' without --pyqt-version 2023-07-22 14:56:20 +02:00
Paul Mairo 5fa531e09e mkvenv: Fix '--pyqt-type link' without --pyqt-version
This is a follow-up of #7770 which was an attempt to fix the script broken in 9212ba9.
Before flipping the QT6 switch.
2023-07-22 14:38:06 +02:00
Florian Bruhin 04594f5f9d Fix Qt 5 warning opening always
The stray comma made it a tuple (False,) which was always True.
2023-07-22 14:28:57 +02:00
Florian Bruhin 273230eb07 Merge remote-tracking branch 'origin/pr/7789' 2023-07-22 12:36:31 +02:00
Paul Mairo ed70741587 Create a workaround to install PyQT 6.5.2 until release
Right now the version of PyQT available on PyPI is 6.5.1 and it's buggy with
Qutebrowser, this is a quick hack to get it working until it's released early next week.
2023-07-22 12:22:53 +02:00
Florian Bruhin 1387b0598b
Merge pull request #7772 from pylbrecht/logfilter
Don't crash on --logfilter at startup
2023-07-21 14:52:24 +02:00
Philipp Albrecht 01ab247a41 Initialize logging as early as possible
Now that `qutebrowser.utils.log` is a Qt-free zone, we can initialize logging before
`machinery.init()` without crashing.
2023-07-21 14:23:15 +02:00
Philipp Albrecht 5da4c6022e Add note on keeping qutebrowser.utils.log a Qt-free zone 2023-07-21 08:41:10 +02:00
Philipp Albrecht d7b420dc4b Log machinery info in machinery.init()
Now that we moved all Qt related things out of `qutebrowser.utils.log` we can import
`qutebrowser.utils.log` in `qutebrowser.qt.machinery`, and therefore move the machinery
log where it belongs.
2023-07-20 15:09:48 +02:00
Philipp Albrecht 250143a70a Move qt logger from qtlog to log
This resolves a temporary workaround for a circular import.

Now that we fully separated `qutebrowser.utils.log` and `qutebrowser.utils.qtlog`, we
can go back to keeping all logger definitions in the same place.
2023-07-20 15:09:48 +02:00
Philipp Albrecht e3a58e84c6 Don't crash on --logfilter 2023-07-20 15:09:48 +02:00
Philipp Albrecht f91ace9622 Move hide_qt_warning() to qtlog
Just to keep related things together.
2023-07-20 15:09:48 +02:00
Philipp Albrecht ebfe9b7aa0 Move qt_message_handler() to qtlog
I had to create `qtlog.init()` to deal with the global variable `_args`.
2023-07-20 15:09:48 +02:00
Philipp Albrecht 30570a5cad Move disable_qt_msghandler() to qtlog 2023-07-20 15:09:45 +02:00
Philipp Albrecht 1e0fb604ae Move shutdown_log() to qtlog 2023-07-20 15:09:05 +02:00
Philipp Albrecht b5b43a566e Add qtlog module 2023-07-20 15:09:05 +02:00
Florian Bruhin 059a280e4e
Merge pull request #7785 from qutebrowser/update-dependencies
Update dependencies
2023-07-20 15:06:19 +02:00
Florian Bruhin 9ef21eed1a tox: Update VIRTUALENV_PIP 2023-07-20 15:04:30 +02:00
qutebrowser bot 4e0180cede Update dependencies 2023-07-20 10:57:42 +00:00
Florian Bruhin 09f28f24c6 Fix lint 2023-07-20 12:42:29 +02:00
Florian Bruhin 5cfab728b2 Improve handling of Optional with new PyQt stubs 2023-07-19 17:27:55 +02:00
Florian Bruhin 92dea988c0 Initial upgrade to new PyQt6 stubs 2023-07-19 17:08:24 +02:00
Philipp Albrecht 1bd1c89256 Include qutebrowser *and* qutebrowser.* 2023-07-13 10:50:07 +02:00
Philipp Albrecht c4fff2fa83 Use explicit include 2023-07-13 10:44:55 +02:00
Philipp Albrecht 56062421e5 Map qutebrowser package to qutebrowser dir 2023-07-13 10:34:57 +02:00
Philipp Albrecht 2a34c15b69 Specify qutebrowser package via where= 2023-07-13 10:28:23 +02:00
Florian Bruhin 3b04cb1d99 mypy: Remvoe some more type ignores
Fixed in latest PyQt snapshots
2023-07-13 09:27:19 +02:00
Philipp Albrecht 0781e0d046 Include namespace packages in setuptools build
Building qutebrowser showed some warnings as the following:

```
/tmp/build-env-4jb2oh0t/lib/python3.8/site-packages/setuptools/command/build_py.py:201: _Warning: Package 'qutebrowser.html' is absent from the `packages` configuration.
!!

        ********************************************************************************
        ############################
        # Package would be ignored #
        ############################
        Python recognizes 'qutebrowser.html' as an importable package[^1],
        but it is absent from setuptools' `packages` configuration.

        This leads to an ambiguous overall configuration. If you want to distribute this
        package, please make sure that 'qutebrowser.html' is explicitly added
        to the `packages` configuration field.

        Alternatively, you can also rely on setuptools' discovery methods
        (for example by using `find_namespace_packages(...)`/`find_namespace:`
        instead of `find_packages(...)`/`find:`).

        You can read more about "package discovery" on setuptools documentation page:

        - https://setuptools.pypa.io/en/latest/userguide/package_discovery.html

        If you don't want 'qutebrowser.html' to be distributed and are
        already explicitly excluding 'qutebrowser.html' via
        `find_namespace_packages(...)/find_namespace` or `find_packages(...)/find`,
        you can try to use `exclude_package_data`, or `include-package-data=False` in
        combination with a more fine grained `package-data` configuration.

        You can read more about "package data files" on setuptools documentation page:

        - https://setuptools.pypa.io/en/latest/userguide/datafiles.html

        [^1]: For Python, any directory (with suitable naming) can be imported,
              even if it does not contain any `.py` files.
              On the other hand, currently there is no concept of package data
              directory, all directories are treated like packages.
        ********************************************************************************

!!
```

Using `find_namespace_packages()` as suggested in the setuptools docs[1] solved the issue.

[1] https://setuptools.pypa.io/en/latest/userguide/package_discovery.html#finding-namespace-packages
2023-07-12 10:46:46 +02:00
Florian Bruhin 9646f53fb5
Merge pull request #7764 from pylbrecht:search-vanished
Don't show warning when jumping to next/prev search result without matches
2023-07-10 16:38:36 +02:00
Florian Bruhin 72aee69c9f Fix lint after dropping PyQt6-stubs 2023-07-10 10:14:03 +02:00
Florian Bruhin 9fcba3d61b Update changelog URLs 2023-07-10 10:07:36 +02:00
Florian Bruhin 6d1dcc30ad Merge remote-tracking branch 'origin/update-dependencies' 2023-07-10 10:04:14 +02:00
qutebrowser bot 93fb20e67e Update dependencies 2023-07-10 04:23:00 +00:00
Florian Bruhin 5a9027c54e mypy: Switch to upstream stubs for PyQt6
They are getting much better
2023-07-09 01:02:33 +02:00
Florian Bruhin 8da62bcbf4 Add aria-haspopup to hint selectors
Helps on https://www.keepersecurity.com/ - see https://www.reddit.com/r/qutebrowser/comments/14qtlc8/no_hint_on_drop_down_list/
2023-07-05 22:37:56 +02:00