From 474255cbe74979dde3d6297217791e690392328a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 19 Jul 2015 21:55:55 +0200
Subject: [PATCH] Move pytest options to pytest.ini.

---
 pytest.ini | 27 +++++++++++++++++++++++++++
 tox.ini    | 28 ----------------------------
 2 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 000000000..89f770d53
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,27 @@
+[pytest]
+norecursedirs = .tox .venv
+markers =
+    gui: Tests using the GUI (e.g. spawning widgets)
+    posix: Tests which only can run on a POSIX OS.
+    windows: Tests which only can run on Windows.
+    linux: Tests which only can run on Linux.
+    osx: Tests which only can run on OS X.
+    not_frozen: Tests which can't be run if sys.frozen is True.
+    frozen: Tests which can only be run if sys.frozen is True.
+flakes-ignore =
+    UnusedImport
+    UnusedVariable
+    resources.py ALL
+pep8ignore =
+    E265  # Block comment should start with '#'
+    E501  # Line too long
+    E402  # module level import not at top of file
+    E266  # too many leading '#' for block comment
+    W503  # line break before binary operator
+    resources.py ALL
+mccabe-complexity = 12
+qt_log_level_fail = WARNING
+qt_log_ignore =
+    ^SpellCheck: .*
+    ^SetProcessDpiAwareness failed: .*
+    ^QWindowsWindow::setGeometryDp: Unable to set geometry .*
diff --git a/tox.ini b/tox.ini
index ea2cd1643..a68c07fa8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -179,31 +179,3 @@ deps = {[testenv:smoke-frozen]deps}
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} scripts/dev/freeze.py {posargs}
-
-[pytest]
-norecursedirs = .tox .venv
-markers =
-    gui: Tests using the GUI (e.g. spawning widgets)
-    posix: Tests which only can run on a POSIX OS.
-    windows: Tests which only can run on Windows.
-    linux: Tests which only can run on Linux.
-    osx: Tests which only can run on OS X.
-    not_frozen: Tests which can't be run if sys.frozen is True.
-    frozen: Tests which can only be run if sys.frozen is True.
-flakes-ignore =
-    UnusedImport
-    UnusedVariable
-    resources.py ALL
-pep8ignore =
-    E265  # Block comment should start with '#'
-    E501  # Line too long
-    E402  # module level import not at top of file
-    E266  # too many leading '#' for block comment
-    W503  # line break before binary operator
-    resources.py ALL
-mccabe-complexity = 12
-qt_log_level_fail = WARNING
-qt_log_ignore =
-    ^SpellCheck: .*
-    ^SetProcessDpiAwareness failed: .*
-    ^QWindowsWindow::setGeometryDp: Unable to set geometry .*