Close to done with this cleanup

theonion · Mar 2, 2015 · 4b54617 · 4b54617
1 parent 29daf2f
commit 4b54617
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 212 deletions.
diff --git a/conftest.py b/conftest.py
@@ -1,4 +1,7 @@
-import os
-import sys
+from logan.runner import configure_app
 
-sys.path.append(os.path.dirname(__file__))
+configure_app(
+    project="betty",
+    default_settings="betty.conf.server",
+    config_path="./tests/betty.testconf.py"
+)
diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,6 @@
 python_files=test*.py
 addopts=--tb=short
 timeout=5
-DJANGO_SETTINGS_MODULE=tests.settings
 django_find_project = false
 
 [flake8]

diff --git a/setup.py b/setup.py
@@ -22,8 +22,8 @@
     "httmock==1.2.2",
     "django-discover-runner",
     "flake8>=2.0,<2.1",
-    "pytest",
-    "pytest-django",
+    "pytest==2.6.4",
+    "pytest-django==2.8.0",
     "pytest-cov>=1.4",
     "coveralls==0.4.1",
 ]

diff --git a/tests/settings.py → tests/betty.testconf.py b/tests/settings.py → tests/betty.testconf.py
@@ -1,5 +1,3 @@
-from betty.conf.server import *  # noqa
-
 import os
 import tempfile