From 990e237e1bc10f90947854575f0ee86ac8dec5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 18 Sep 2016 11:10:09 +0300
Subject: [PATCH 1/2] setup.cfg: Move pytest options to pytest.ini

https://github.com/pytest-dev/pytest/issues/567
---
 pytest.ini | 3 +++
 setup.cfg  | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..39a29fe
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+norecursedirs = .git .* *.egg* old docs dist build
+addopts = -rw
diff --git a/setup.cfg b/setup.cfg
index 218ddcc..8d84284 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,3 @@ requires-dist =
     pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0
     pycodestyle >= 2.0.0, < 2.1.0
     mccabe >= 0.5.0, < 0.6.0
-
-[pytest]
-norecursedirs = .git .* *.egg* old docs dist build
-addopts = -rw

From 17b88586d371123cc61d05079cc05b92f3268773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 18 Sep 2016 20:38:06 +0300
Subject: [PATCH 2/2] MANIFEST: Include *.ini in tarball

test_config_file_finder needs tox.ini present to pass.
---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 96b10e7..74b090b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
 include *.rst
 include CONTRIBUTORS.txt
 include LICENSE
+include *.ini
 global-exclude *.pyc
 recursive-include docs *.rst *.py
 recursive-include tests *.py *.ini *.rst *_diff