summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-04-04 07:59:14 +0200
committerFlorian Bruhin <git@the-compiler.org>2016-04-04 07:59:14 +0200
commitc3d154a856ade632b57cb19f3965747768127606 (patch)
tree01e9e9b9f83a067b9e84937a3dd2ff1ff7d2be22
parent88e648d6f941d655243dc4c2b112607873ea1f84 (diff)
downloadqutebrowser-c3d154a856ade632b57cb19f3965747768127606.tar.gz
qutebrowser-c3d154a856ade632b57cb19f3965747768127606.zip
Revert "Move note about conifg redirect to CONTRIBUTING."
This reverts commit 2634b333f2b7e1dccc4c8b0bbda14dd7805278bf.
-rw-r--r--CONTRIBUTING.asciidoc29
-rw-r--r--INSTALL.asciidoc8
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
~~~~~~~~