Florian Bruhin
parent
62fef9d9e6
commit
ec34865168
|
|
@ -9,7 +9,7 @@ open pull requests.
|
|||
pull request page after pushing changes.
|
||||
|
||||
- If you are stuck somewhere or have questions,
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/index.asciidoc#getting-help[please ask]!
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/index.asciidoc#getting-help[please ask]!
|
||||
|
||||
See the link:../doc/contributing.asciidoc[full contribution documentation] for
|
||||
details and other useful hints.
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
github: The-Compiler
|
||||
custom: https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating
|
||||
custom: https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ jobs:
|
|||
file: scripts/dev/ci/docker/Dockerfile
|
||||
context: .
|
||||
tags: "qutebrowser/ci:${{ matrix.image }}"
|
||||
push: ${{ github.ref == 'refs/heads/master' }}
|
||||
push: ${{ github.ref == 'refs/heads/main' }}
|
||||
|
||||
irc:
|
||||
timeout-minutes: 2
|
||||
|
|
|
|||
|
|
@ -15,33 +15,33 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
- os: macos-11
|
||||
branch: master
|
||||
branch: main
|
||||
toxenv: build-release-qt5
|
||||
name: qt5-macos
|
||||
- os: windows-2019
|
||||
args: --64bit
|
||||
branch: master
|
||||
branch: main
|
||||
toxenv: build-release-qt5
|
||||
name: qt5-windows-64bit
|
||||
- os: windows-2019
|
||||
args: --32bit
|
||||
branch: master
|
||||
branch: main
|
||||
toxenv: build-release-qt5
|
||||
name: qt5-windows-32bit
|
||||
|
||||
- os: macos-11
|
||||
args: --debug
|
||||
branch: master
|
||||
branch: main
|
||||
toxenv: build-release-qt5
|
||||
name: qt5-macos-debug
|
||||
- os: windows-2019
|
||||
args: --64bit --debug
|
||||
branch: master
|
||||
branch: main
|
||||
toxenv: build-release-qt5
|
||||
name: qt5-windows-64bit-debug
|
||||
- os: windows-2019
|
||||
args: --32bit --debug
|
||||
branch: master
|
||||
branch: main
|
||||
toxenv: build-release-qt5
|
||||
name: qt5-windows-32bit-debug
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// If you are reading this in plaintext or on PyPi:
|
||||
//
|
||||
// A rendered version is available at:
|
||||
// https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc
|
||||
// https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc
|
||||
|
||||
qutebrowser
|
||||
===========
|
||||
|
|
@ -10,9 +10,9 @@ qutebrowser
|
|||
image:qutebrowser/icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on Python and Qt.*
|
||||
|
||||
image:https://github.com/qutebrowser/qutebrowser/workflows/CI/badge.svg["Build Status", link="https://github.com/qutebrowser/qutebrowser/actions?query=workflow%3ACI"]
|
||||
image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=master"]
|
||||
image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=main["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=main"]
|
||||
|
||||
link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[blog] | https://github.com/qutebrowser/qutebrowser/blob/master/doc/faq.asciidoc[FAQ] | https://www.qutebrowser.org/doc/contributing.html[contributing] | link:https://github.com/qutebrowser/qutebrowser/releases[releases] | https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc[installing]
|
||||
link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[blog] | https://github.com/qutebrowser/qutebrowser/blob/main/doc/faq.asciidoc[FAQ] | https://www.qutebrowser.org/doc/contributing.html[contributing] | link:https://github.com/qutebrowser/qutebrowser/releases[releases] | https://github.com/qutebrowser/qutebrowser/blob/main/doc/install.asciidoc[installing]
|
||||
// QUTE_WEB_HIDE_END
|
||||
|
||||
qutebrowser is a keyboard-focused browser with a minimal GUI. It's based
|
||||
|
|
@ -25,7 +25,7 @@ It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl.
|
|||
part-time on qutebrowser, funded by donations.** To sustain this for a long
|
||||
time, your help is needed! See the
|
||||
https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] or
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating[alternative donation methods]
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating[alternative donation methods]
|
||||
for more information. Depending on your sign-up date and how
|
||||
long you keep a certain level, you can get qutebrowser t-shirts, stickers and
|
||||
more!
|
||||
|
|
|
|||
|
|
@ -1168,7 +1168,7 @@ Changed
|
|||
It also has compatibility issues with various websites (GitHub, Twitch, Android
|
||||
Developer documentation, YouTube, ...). Since no newer Debian Stable is released
|
||||
at the time of writing, it's recommended to
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc#installing-qutebrowser-with-virtualenv[install qutebrowser in a virtualenv]
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/doc/install.asciidoc#installing-qutebrowser-with-virtualenv[install qutebrowser in a virtualenv]
|
||||
with a newer version of Qt/PyQt.
|
||||
- New optional dependency on the Python `adblock` library (see above for details).
|
||||
- The (formerly optional) `cssutils` dependency is now removed. It was only
|
||||
|
|
@ -3319,7 +3319,7 @@ Major changes
|
|||
completion is too slow on your machine, try setting it to a few 1000 items.
|
||||
- Up/Down now navigates through the command history instead of selecting
|
||||
completion items. Either use Tab to cycle through the completion, or
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#migrating-older-configurations[restore the old behavior].
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/configuring.asciidoc#migrating-older-configurations[restore the old behavior].
|
||||
|
||||
Added
|
||||
~~~~~
|
||||
|
|
|
|||
|
|
@ -84,9 +84,9 @@ If you prefer to send a patch to the mailinglist, you can generate a patch
|
|||
based on your changes like this:
|
||||
|
||||
----
|
||||
git format-patch origin/master <1>
|
||||
git format-patch origin/main <1>
|
||||
----
|
||||
<1> Replace `master` by the branch your work was based on, e.g.,
|
||||
<1> Replace `main` by the branch your work was based on, e.g.,
|
||||
`origin/develop`.
|
||||
|
||||
Running qutebrowser
|
||||
|
|
@ -759,13 +759,13 @@ qutebrowser release
|
|||
* Make sure there are no unstaged changes and the tests are green.
|
||||
* Make sure all issues with the related milestone are closed.
|
||||
* Consider updating the completions for `content.headers.user_agent` in `configdata.yml`.
|
||||
* Minor release: Consider updating some files from master:
|
||||
* Minor release: Consider updating some files from main:
|
||||
- `misc/requirements/` and `requirements.txt`
|
||||
- `scripts/`
|
||||
* Make sure Python is up-to-date on build machines.
|
||||
* Mark the milestone at https://github.com/qutebrowser/qutebrowser/milestones as closed.
|
||||
* Update changelog in master branch
|
||||
* If necessary: Update changelog in release branch from master.
|
||||
* Update changelog in main branch
|
||||
* If necessary: Update changelog in release branch from main.
|
||||
* Run `./.venv/bin/python3 scripts/dev/update_version.py {major,minor,patch}`.
|
||||
* Run the printed instructions accordingly.
|
||||
* Update `qutebrowser-git` PKGBUILD if dependencies/install changed.
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ Why does it take longer to open a URL in qutebrowser than in chromium?::
|
|||
loaded until it is detected that there is an instance running
|
||||
to which the URL is then passed. This takes some time.
|
||||
One workaround is to use this
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/scripts/open_url_in_instance.sh[script]
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/scripts/open_url_in_instance.sh[script]
|
||||
and place it in your $PATH with the name "qutebrowser". This
|
||||
script passes the URL via a unix socket to qutebrowser (if its
|
||||
running already) using socat which is much faster and starts a new
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Documentation
|
|||
|
||||
The following help pages are currently available:
|
||||
|
||||
* link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png[Key binding cheatsheet]
|
||||
* link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png[Key binding cheatsheet]
|
||||
* link:../quickstart{outfilesuffix}[Quick start guide]
|
||||
* link:../faq{outfilesuffix}[Frequently asked questions]
|
||||
* link:../changelog{outfilesuffix}[Change Log]
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ Packagers
|
|||
---------
|
||||
|
||||
qutebrowser ships with a
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/misc/Makefile[Makefile]
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/misc/Makefile[Makefile]
|
||||
intended for packagers. This installs system-wide files in a proper locations,
|
||||
so it should be preferred to the usual `setup.py install` or `pip install`
|
||||
invocation.
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ Basic keybindings to get you started
|
|||
What to do now
|
||||
--------------
|
||||
|
||||
* View the link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png[key binding cheatsheet]
|
||||
* View the link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png[key binding cheatsheet]
|
||||
to make yourself familiar with the key bindings: +
|
||||
image:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png"]
|
||||
image:https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png"]
|
||||
* There's also a https://www.shortcutfoo.com/app/dojos/qutebrowser[free training
|
||||
course] on shortcutfoo for the keybindings - note that you need to be in
|
||||
insert mode (i) for it to work.
|
||||
|
|
@ -63,11 +63,11 @@ qutebrowser, funded by donations.
|
|||
|
||||
To sustain this for a long time, your help is needed! Check the
|
||||
https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] or
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating[alternative
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating[alternative
|
||||
donation methods] for more information. Depending on your sign-up date and how
|
||||
long you keep a certain level, you can get qutebrowser t-shirts, stickers and
|
||||
more!
|
||||
|
||||
Alternatively, there are also various options available for one-time donations, see the
|
||||
https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating[donation section]
|
||||
https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating[donation section]
|
||||
in the README for details.
|
||||
|
|
|
|||
|
|
@ -23,16 +23,16 @@
|
|||
<launchable type="desktop-id">org.qutebrowser.qutebrowser.desktop</launchable>
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/main.png</image>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/main.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/downloads.png</image>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/downloads.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/completion.png</image>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/completion.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/hints.png</image>
|
||||
<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/hints.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<url type="homepage">https://www.qutebrowser.org</url>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
set +e
|
||||
|
||||
# JS field injection code from https://github.com/qutebrowser/qutebrowser/blob/master/misc/userscripts/password_fill
|
||||
# JS field injection code from https://github.com/qutebrowser/qutebrowser/blob/main/misc/userscripts/password_fill
|
||||
javascript_escape() {
|
||||
# print the first argument in an escaped way, such that it can safely
|
||||
# be used within javascripts double quotes
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ insert mode if you prefer that).
|
|||
[2]: https://qutebrowser.org/
|
||||
[3]: https://gnupg.org/
|
||||
[4]: https://github.com/keepassxreboot/keepassxc-browser/blob/develop/keepassxc-protocol.md
|
||||
[5]: https://github.com/qutebrowser/qutebrowser/blob/master/doc/userscripts.asciidoc
|
||||
[5]: https://github.com/qutebrowser/qutebrowser/blob/main/doc/userscripts.asciidoc
|
||||
[6]: https://keepassxc.org/docs/KeePassXC_GettingStarted.html#_setup_browser_integration
|
||||
"""
|
||||
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ class YamlConfig(QObject):
|
|||
f.write(textwrap.dedent("""
|
||||
# If a config.py file exists, this file is ignored unless it's explicitly loaded
|
||||
# via config.load_autoconfig(). For more information, see:
|
||||
# https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#loading-autoconfigyml
|
||||
# https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/configuring.asciidoc#loading-autoconfigyml
|
||||
# DO NOT edit this file by hand, qutebrowser will overwrite it.
|
||||
# Instead, create a config.py - see :help for details.
|
||||
|
||||
|
|
|
|||
|
|
@ -510,7 +510,7 @@ class FatalCrashDialog(_CrashDialog):
|
|||
"<br/>Note: Crash reports for fatal crashes sometimes don't "
|
||||
"contain the information necessary to fix an issue. Please "
|
||||
"follow the steps in <a href='https://github.com/qutebrowser/"
|
||||
"qutebrowser/blob/master/doc/stacktrace.asciidoc'>"
|
||||
"qutebrowser/blob/main/doc/stacktrace.asciidoc'>"
|
||||
"stacktrace.asciidoc</a> to submit a stacktrace.<br/>")
|
||||
self._lbl.setText(text)
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ def _missing_str(name, *, webengine=False):
|
|||
"<b>The error encountered was:</b><br />%ERROR%"]
|
||||
lines = ['Please search for the python3 version of {} in your '
|
||||
'distributions packages, or see '
|
||||
'https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc'
|
||||
'https://github.com/qutebrowser/qutebrowser/blob/main/doc/install.asciidoc'
|
||||
.format(name)]
|
||||
blocks.append('<br />'.join(lines))
|
||||
if not webengine:
|
||||
|
|
|
|||
|
|
@ -84,9 +84,9 @@ class AsciiDoc:
|
|||
|
||||
replacements = [
|
||||
# patch image links to use local copy
|
||||
("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png",
|
||||
("https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png",
|
||||
"qute://help/img/cheatsheet-big.png"),
|
||||
("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png",
|
||||
("https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-small.png",
|
||||
"qute://help/img/cheatsheet-small.png"),
|
||||
|
||||
# patch relative links to work with qute://help flat structure
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ from scripts import utils
|
|||
code = subprocess.run(['git', '--no-pager', 'diff', '--exit-code', '--stat',
|
||||
'--', 'doc'], check=False).returncode
|
||||
|
||||
if os.environ.get('GITHUB_REF', 'refs/heads/master') != 'refs/heads/master':
|
||||
if os.environ.get('GITHUB_REF', 'refs/heads/main') != 'refs/heads/main':
|
||||
if code != 0:
|
||||
print("Docs changed but ignoring change as we're building a PR")
|
||||
sys.exit(0)
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ if __name__ == "__main__":
|
|||
print("Run the following commands to create a new release:")
|
||||
print("* git push origin; git push origin v{v}".format(v=version))
|
||||
if args.bump == 'patch':
|
||||
print("* git checkout master && git cherry-pick v{v} && "
|
||||
print("* git checkout main && git cherry-pick v{v} && "
|
||||
"git push origin".format(v=version))
|
||||
else:
|
||||
print("* git branch v{x} v{v} && git push --set-upstream origin v{x}"
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
|
||||
<h2>...and how?</h2>
|
||||
|
||||
<p>See <a href="https://github.com/qutebrowser/qutebrowser/blob/master/doc/contributing.asciidoc">
|
||||
<p>See <a href="https://github.com/qutebrowser/qutebrowser/blob/main/doc/contributing.asciidoc">
|
||||
here</a> for more information.</p>
|
||||
|
||||
<h2>More useless trivia!</h2>
|
||||
|
|
|
|||
2
tox.ini
2
tox.ini
|
|
@ -250,7 +250,7 @@ deps = {[testenv:mypy-pyqt6]deps}
|
|||
setenv = {[testenv:mypy-pyqt6]setenv}
|
||||
commands =
|
||||
{envpython} -m mypy --cobertura-xml-report {envtmpdir} {env:QUTE_CONSTANTS_ARGS} qutebrowser tests {posargs}
|
||||
{envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:master}} {envtmpdir}/cobertura.xml
|
||||
{envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:main}} {envtmpdir}/cobertura.xml
|
||||
|
||||
[testenv:sphinx]
|
||||
basepython = {env:PYTHON:python3}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ part-time on qutebrowser, funded by donations.</b></p>
|
|||
<p>To sustain this for a long
|
||||
time, your help is needed! See the
|
||||
<a href="https://github.com/sponsors/The-Compiler/">GitHub Sponsors page</a> or
|
||||
<a href="https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating">alternative
|
||||
<a href="https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating">alternative
|
||||
donation methods</a> for more information. Depending on your sign-up date and
|
||||
how long you keep a certain level, you can get qutebrowser t-shirts, stickers
|
||||
and more!
|
||||
|
|
|
|||
Loading…
Reference in New Issue