diff --git a/DjangoBlog/whoosh_cn_backend.py b/DjangoBlog/whoosh_cn_backend.py index d8b43cc..5b29a9a 100644 --- a/DjangoBlog/whoosh_cn_backend.py +++ b/DjangoBlog/whoosh_cn_backend.py @@ -11,7 +11,7 @@ import warnings from django.conf import settings from django.core.exceptions import ImproperlyConfigured -from django.utils import six +import six from django.utils.datetime_safe import datetime from django.utils.encoding import force_text @@ -912,7 +912,6 @@ class WhooshSearchQuery(BaseSearchQuery): return u"%s%s" % (index_fieldname, query_frag) - # if not filter_type in ('in', 'range'): # # 'in' is a bit of a special case, as we don't want to # # convert a valid list/tuple to string. Defer handling it diff --git a/requirements.txt b/requirements.txt index 56fc89a..5f6b623 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,58 +1,59 @@ appdirs==1.4.3 -asn1crypto==1.2.0 -astroid==2.3.2 -attrs==19.1.0 -bottle==0.12.17 -certifi==2019.9.11 -cffi==1.13.1 +asgiref==3.2.3 +asn1crypto==1.3.0 +astroid==2.3.3 +attrs==19.3.0 +bottle==0.12.18 +certifi==2019.11.28 +cffi==1.14.0 chardet==3.0.4 -coverage==4.5.4 +coverage==5.0.3 cryptography==2.8 -Django==2.2.8 +Django==3.0.3 django-appconf==1.0.3 django-autoslug==1.9.6 -django-compressor==2.3 -django-debug-toolbar==2.0 -django-haystack==2.8.1 +django-compressor==2.4 +django-debug-toolbar==2.2 +django-haystack==3.0b1 django-ipware==2.1.0 -django-mdeditor==0.1.16 -django-uuslug==1.1.9 -elasticsearch==7.0.0 -elasticsearch-dsl==7.0.0 -idna==2.8 -ipaddress==1.0.22 +django-mdeditor==0.1.17 +django-uuslug==1.2.0 +elasticsearch==7.5.1 +elasticsearch-dsl==7.1.0 +idna==2.9 +ipaddress==1.0.23 isort==4.3.21 -jieba==0.39 -jsonpickle==1.2 -lazy-object-proxy==1.4.2 +jieba==0.42.1 +jsonpickle==1.3 +lazy-object-proxy==1.4.3 markdown2==2.3.8 mccabe==0.6.1 mistune==0.8.4 -mysqlclient==1.4.4 +mysqlclient==1.4.6 olefile==0.46 -packaging==19.2 -Pillow==6.2.1 +packaging==20.1 +Pillow==7.0.0 pycparser==2.19 -Pygments==2.4.2 -pylint==2.4.3 -pyparsing==2.4.2 -python-dateutil==2.8.0 +Pygments==2.5.2 +pylint==2.4.4 +pyparsing==2.4.6 +python-dateutil==2.8.1 python-logstash==0.4.6 python-memcached==1.59 python-slugify==4.0.0 pytz==2019.3 raven==6.10.0 rcssmin==1.0.6 -requests==2.22.0 +requests==2.23.0 rjsmin==1.1.0 -six==1.12.0 +six==1.14.0 sqlparse==0.3.0 text-unidecode==1.3 -typed-ast==1.4.0 +typed-ast==1.4.1 Unidecode==1.1.1 -urllib3==1.25.6 +urllib3==1.25.8 webencodings==0.5.1 WeRoBot==1.10.1 Whoosh==2.7.4 -wrapt==1.11.2 +wrapt==1.12.0 xmltodict==0.12.0