Fix tests

Author: klen

Makefile

@@ -1,7 +1,4 @@
-BUILDDIR=_build
 MODULE=django_markdown
-SPHINXBUILD=sphinx-build
-ALLSPHINXOPTS= -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 VIRTUALENV=$(shell echo "$${VDIR:-'.env'}")
 
 all: $(VIRTUALENV)
@@ -15,9 +12,9 @@ help:
 # target: clean - Clean repo
 clean:
 	@rm -rf build dist docs/_build
-	find $(CURDIR)/$(MODULE) -name "*.pyc" -delete
-	find $(CURDIR)/$(MODULE) -name "*.orig" -delete
-	find $(CURDIR)/$(MODULE) -name "__pycache__" -delete
+	find $(CURDIR) -name "*.pyc" -delete
+	find $(CURDIR) -name "*.orig" -delete
+	find $(CURDIR) -name "__pycache__" | xargs rm -rf
 
 
 # ==============
@@ -79,13 +76,17 @@ docs:
 
 $(VIRTUALENV): requirements.txt
 	[ -d $(VIRTUALENV) ] || @virtualenv --no-site-packages $(VIRTUALENV)
-	@$(VIRTUALENV)/bin/pip install -M -r requirements.txt
+	@$(VIRTUALENV)/bin/pip install -r requirements.txt
 	touch $(VIRTUALENV)
 
+$(VIRTUALENV)/bin/py.test: requirements-tests.txt $(VIRTUALENV)
+	@$(VIRTUALENV)/bin/pip install -r requirements-tests.txt
+	touch $(VIRTUALENV)/bin/py.test
+
 .PHONY: t
 # target: t - Runs tests
-t: clean
-	$(VIRTUALENV)/bin/python setup.py test
+t: clean $(VIRTUALENV)/bin/py.test
+	@$(VIRTUALENV)/bin/py.test
 
 $(CURDIR)/example/db.sqlite3: $(VIRTUALENV)
 	$(VIRTUALENV)/bin/python example/manage.py syncdb --noinput

requirements-tests.txt

@@ -0,0 +1,5 @@
+-e .
+
+pytest
+pytest-django
+ipdb

setup.py

@@ -57,8 +57,6 @@ def _read(fname):
     package_data={'': PACKAGE_DATA, },
 
     install_requires=install_requires,
-    tests_require=install_requires,
-    test_suite='tests',
 )
 
 # pylama:ignore=C0111

tests/settings.py

@@ -7,6 +7,7 @@
 ROOT_URLCONF = 'tests.urls'
 
 SECRET_KEY = 'KeepMeSecret'
+STATIC_URL = '/static/'
 
 DEBUG = True
 

tox.ini

@@ -18,7 +18,8 @@ ignore=D,C0111,E501,C0301
 ignore=E501,C0301
 
 [pytest]
-addopts = -x tests/__init__.py
+DJANGO_SETTIGNS_MODULE=tests
+addopts = -sx tests/__init__.py
 
 [testenv]
 commands=py.test