From 48393250f74f0063511ed6c6de59cbabcf75b7ef Mon Sep 17 00:00:00 2001 From: Adam Dobrawy Date: Sun, 9 Jul 2017 21:47:05 +0200 Subject: [PATCH] Fix test in tox --- manage.py | 10 ++++++++++ setup.py | 11 +---------- tox.ini | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 manage.py diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..113473d --- /dev/null +++ b/manage.py @@ -0,0 +1,10 @@ +import sys +import os + +os.environ['DJANGO_SETTINGS_MODULE'] = 'django_mailbox.tests.settings' + +from django.core import management + +if len(sys.argv) > 1 and sys.argv[1] == 'test': + management.execute_from_command_line() + sys.exit() \ No newline at end of file diff --git a/setup.py b/setup.py index d6fffde..d6e4625 100755 --- a/setup.py +++ b/setup.py @@ -1,16 +1,7 @@ -import sys from setuptools import find_packages, setup -import os from django_mailbox import __version__ as version_string -os.environ['DJANGO_SETTINGS_MODULE'] = 'django_mailbox.tests.settings' - -from django.core import management - -if len(sys.argv) > 1 and sys.argv[1] == 'test': - management.execute_from_command_line() - sys.exit() tests_require = [ 'django', @@ -61,7 +52,7 @@ setup( 'Topic :: Communications :: Email :: Email Clients (MUA)', ], packages=find_packages(), - include_package_data = True, + include_package_data=True, install_requires=[ 'six>=1.6.1' ] diff --git a/tox.ini b/tox.ini index 62a8842..698322f 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ deps= -r{toxinidir}/test_requirements.txt sitepackages=False commands= - python setup.py test {posargs} + python manage.py test {posargs} [testenv:flake8] deps=flake8