Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ python-dateutil = "*"

[dev-packages]
coverage = "*"
nose = "*"
sphinx = "*"
sphinx-rtd-theme = "*"
"urllib3" = "*"
Expand Down
11 changes: 1 addition & 10 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/rtd_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ django>=3.1,<=4.2
django-haystack>=2.8,<=3.2
djangorestframework>=3.7.0,<=3.13
elasticsearch>=2.0.0,<=8.3.3
nose
sphinx
sphinx-rtd-theme
urllib3
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get_version(package):
"django-haystack>=2.8,<3.4",
"python-dateutil",
],
tests_require=["nose", "coverage"],
tests_require=["coverage", "geopy", "requests"],
zip_safe=False,
test_suite="tests.run_tests.start",
classifiers=[
Expand Down
22 changes: 8 additions & 14 deletions tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,17 @@

import os
import sys
import nose

import django
from django.core.management import call_command


def start(argv=None):
sys.exitfunc = lambda: sys.stderr.write("Shutting down...\n")

if argv is None:
argv = [
"nosetests",
"--verbose",
"--with-coverage",
"--cover-erase",
"--cover-branches",
"--cover-package=drf_haystack",
]

nose.run_exit(argv=argv, defaultTest=os.path.abspath(os.path.dirname(__file__)))
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"
django.setup()

call_command("test", sys.argv[1:])


if __name__ == "__main__":
Expand Down