Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1710 from MrKioZ/master
Fix for issue #1697 Django 3.0
  • Loading branch information
acdha committed Jan 20, 2020
2 parents 2e6c4a9 + e1b4f5a commit 87bd4c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion haystack/utils/__init__.py
Expand Up @@ -3,10 +3,10 @@
from __future__ import unicode_literals

import importlib
import six
import re

from django.conf import settings
from django.utils import six

from haystack.constants import ID, DJANGO_CT, DJANGO_ID
from haystack.utils.highlighting import Highlighter
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -3,7 +3,7 @@

from setuptools import setup

install_requires = ["Django>=1.11"]
install_requires = ["Django>=1.11", "six"]

tests_require = [
"pysolr>=3.7.0",
Expand Down

0 comments on commit 87bd4c1

Please sign in to comment.