From 1959a7639379ff7f88c3f35cdf99f27e20ee7403 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 17 Sep 2017 22:06:56 +0200 Subject: [PATCH] Update contributing docs --- doc/contributing.asciidoc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index 9567b26a3..4b02c4c12 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -5,12 +5,6 @@ The Compiler :data-uri: :toc: -IMPORTANT: I'm currently (July 2017) more busy than usual until September, -because of exams coming up. In addition to that, a new config system is coming -which will conflict with many non-trivial contributions. Because of that, please -refrain from contributing new features until then. If you're reading this note -after mid-September, please open an issue. - I `<3` footnote:[Of course, that says `<3` in HTML.] contributors! This document contains guidelines for contributing to qutebrowser, as well as @@ -104,10 +98,9 @@ unittests and several linters/checkers. Currently, the following tox environments are available: * Tests using https://www.pytest.org[pytest]: - - `py34`: Run pytest for python-3.4. - - `py35`: Run pytest for python-3.5. - - `py34-cov`: Run pytest for python-3.4 with code coverage report. - - `py35-cov`: Run pytest for python-3.5 with code coverage report. + - `py35`, `py36`: Run pytest for python 3.5/3.6 with the system-wide PyQt. + - `py36-pyqt57`, ..., `py36-pyqt59`: Run pytest with the given PyQt version (`py35-*` also works) + - `py36-pyqt59-cov`: Run with coverage support (other Python/PyQt versions work too) * `flake8`: Run https://pypi.python.org/pypi/flake8[flake8] checks: https://pypi.python.org/pypi/pyflakes[pyflakes], https://pypi.python.org/pypi/pep8[pep8],