From c3d154a856ade632b57cb19f3965747768127606 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 4 Apr 2016 07:59:14 +0200 Subject: [PATCH] Revert "Move note about conifg redirect to CONTRIBUTING." This reverts commit 2634b333f2b7e1dccc4c8b0bbda14dd7805278bf. --- CONTRIBUTING.asciidoc | 29 ----------------------------- INSTALL.asciidoc | 8 ++++++++ 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc index f88f5cee5..46a388143 100644 --- a/CONTRIBUTING.asciidoc +++ b/CONTRIBUTING.asciidoc @@ -63,35 +63,6 @@ handy. Of course, if using git is the issue which prevents you from contributing, feel free to send normal patches instead, e.g. generated via `diff -Nur`. -Running qutebrowser with tox -------------------------------- - -Once you have cloned the repository, you can run tox inside the qutebrowser -repository to set up a -https://docs.python.org/3/library/venv.html[virtual environment]: - ----- -$ tox -e mkvenv ----- - -This installs all needed Python dependencies in a `.venv` subfolder. The -system-wide Qt5/PyQt5 installations are symlinked into the virtual environment. - -You can then create a simple wrapper script to start qutebrowser: - ----- -#!/bin/bash -~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser "$@" ----- - -If you regularly use a non-development version of qutebrowser, you may want to -redirect your development version it to a local config using the `-c` flag: - ----- -#!/bin/bash -~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser -c .qutebrowser-local "$@" ----- - Getting patches ~~~~~~~~~~~~~~~ diff --git a/INSTALL.asciidoc b/INSTALL.asciidoc index 1e1d0afd5..241f14f8d 100644 --- a/INSTALL.asciidoc +++ b/INSTALL.asciidoc @@ -266,6 +266,14 @@ your `$PATH` (e.g. `/usr/local/bin/qutebrowser` or `~/bin/qutebrowser`): ~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser "$@" ---- +If you are developing on qutebrowser, you may want to redirect it to a local +config: + +---- +#!/bin/bash +~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser -c .qutebrowser-local "$@" +---- + Updating ~~~~~~~~