Skip to content

Commit

Permalink
elasticsearch-dsl-py < 7.0
Browse files Browse the repository at this point in the history
 mn/#3-support-latest-elasticsearch-dsl-6
  • Loading branch information
codekiln committed Jul 10, 2023
1 parent ab7004d commit 3bfcbca
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 35 deletions.
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Core requirements for using this application

Django # Web application framework
elasticsearch-dsl==6.1.0 # For interacting with Elaticsearch
elasticsearch-dsl<7.0.0 # For interacting with Elaticsearch
texttable # Printing tabular data from management commands
multiprocessing-logging # for logging in ./manage.py es_update --workers
27 changes: 13 additions & 14 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
asgiref==3.7.2
# via django
astroid==2.15.5
astroid==2.15.6
# via
# pylint
# pylint-celery
backports-functools-lru-cache==1.6.5
backports-functools-lru-cache==1.6.6
# via caniusepython3
bleach==6.0.0
# via readme-renderer
Expand All @@ -22,9 +22,9 @@ certifi==2023.5.7
# via requests
chardet==5.1.0
# via diff-cover
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
click==8.1.3
click==8.1.4
# via
# click-log
# code-annotations
Expand All @@ -42,7 +42,7 @@ distlib==0.3.6
# via
# caniusepython3
# virtualenv
django==4.2.2
django==4.2.3
# via -r requirements/base.in
docutils==0.20.1
# via readme-renderer
Expand All @@ -52,25 +52,23 @@ edx-lint==5.3.4
# -r requirements/quality.in
elasticsearch==6.8.2
# via elasticsearch-dsl
elasticsearch-dsl==6.1.0
elasticsearch-dsl==6.4.0
# via -r requirements/base.in
filelock==3.12.2
# via
# tox
# virtualenv
idna==3.4
# via requests
importlib-metadata==6.7.0
importlib-metadata==6.8.0
# via
# keyring
# twine
ipaddress==1.0.23
# via elasticsearch-dsl
isort==5.12.0
# via
# -r requirements/quality.in
# pylint
jaraco-classes==3.2.3
jaraco-classes==3.3.0
# via keyring
jinja2==3.1.2
# via
Expand Down Expand Up @@ -99,11 +97,11 @@ packaging==23.1
# tox
pbr==5.11.1
# via stevedore
pip-tools==6.13.0
pip-tools==6.14.0
# via -r requirements/dev.in
pkginfo==1.9.6
# via twine
platformdirs==3.8.0
platformdirs==3.8.1
# via
# pylint
# virtualenv
Expand Down Expand Up @@ -177,6 +175,7 @@ texttable==1.6.7
tomli==2.0.1
# via
# build
# pip-tools
# pylint
# pyproject-hooks
# tox
Expand All @@ -193,7 +192,7 @@ tox-pyenv==1.1.0
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/dev.in
typing-extensions==4.7.0
typing-extensions==4.7.1
# via
# asgiref
# astroid
Expand All @@ -213,7 +212,7 @@ wheel==0.40.0
# pip-tools
wrapt==1.15.0
# via astroid
zipp==3.15.0
zipp==3.16.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
12 changes: 6 additions & 6 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# pip-compile --output-file=requirements/quality.txt requirements/quality.in
#
astroid==2.15.5
astroid==2.15.6
# via
# pylint
# pylint-celery
backports-functools-lru-cache==1.6.5
backports-functools-lru-cache==1.6.6
# via caniusepython3
caniusepython3==7.3.0
# via -r requirements/quality.in
certifi==2023.5.7
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
click==8.1.3
click==8.1.4
# via
# click-log
# code-annotations
Expand Down Expand Up @@ -49,7 +49,7 @@ packaging==23.1
# via caniusepython3
pbr==5.11.1
# via stevedore
platformdirs==3.8.0
platformdirs==3.8.1
# via pylint
pycodestyle==2.10.0
# via -r requirements/quality.in
Expand Down Expand Up @@ -87,7 +87,7 @@ tomli==2.0.1
# via pylint
tomlkit==0.11.8
# via pylint
typing-extensions==4.7.0
typing-extensions==4.7.1
# via
# astroid
# pylint
Expand Down
8 changes: 3 additions & 5 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ asgiref==3.7.2
# via django
certifi==2023.5.7
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
codecov==2.1.13
# via -r requirements/test.in
Expand All @@ -27,13 +27,11 @@ filelock==3.12.2
# virtualenv
idna==3.4
# via requests
ipaddress==1.0.23
# via elasticsearch-dsl
multiprocessing-logging==0.3.4
# via -r requirements/base.in
packaging==23.1
# via tox
platformdirs==3.8.0
platformdirs==3.8.1
# via virtualenv
pluggy==1.2.0
# via tox
Expand All @@ -60,7 +58,7 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.1
# via -r requirements/test.in
typing-extensions==4.7.0
typing-extensions==4.7.1
# via asgiref
urllib3==2.0.3
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
certifi==2023.5.7
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
codecov==2.1.13
# via -r requirements/travis.in
Expand All @@ -22,7 +22,7 @@ idna==3.4
# via requests
packaging==23.1
# via tox
platformdirs==3.8.0
platformdirs==3.8.1
# via virtualenv
pluggy==1.2.0
# via tox
Expand Down
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def get_version(*file_paths):
license='MIT',
include_package_data=True,
install_requires=[
# TBD: GH issue #3 includes support for elasticsearch-dsl>=6.2.0
"Django>=1.8", "elasticsearch-dsl>=6.0.0,<6.2.0", "texttable>=1.2.1",
"Django>=1.8", "elasticsearch-dsl>=6.4.0<7.0.0", "texttable>=1.2.1",
"multiprocessing-logging>=0.2.6"
],
zip_safe=False,
Expand All @@ -59,14 +58,9 @@ def get_version(*file_paths):
classifiers=[
'Development Status :: 4 - Beta',
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
],
)

0 comments on commit 3bfcbca

Please sign in to comment.