From 4cadc1d4c0f2314a32e71a8df86a33c11162647b Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.co>
Date: Fri, 1 Jan 2016 19:08:27 -0300
Subject: [PATCH] Update pytest configuration

* Move it from tox.ini to pytest.ini
* Ignore tests/fixtures
---
 pytest.ini | 2 ++
 tox.ini    | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..a7785005
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+addopts = --tb=native
+norecursedirs = tests/fixtures
diff --git a/tox.ini b/tox.ini
index 600ba3f1..6cab5b95 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,3 @@ deps =
 
 commands =
     py.test --verbose --doctest-modules --basetemp={envtmpdir} {posargs:./tests ./httpie}
-
-[pytest]
-addopts = --tb=native