From 3bfcbca4c006402a1a14570fd83c55a87f00da1c Mon Sep 17 00:00:00 2001 From: Myer Nore Date: Mon, 10 Jul 2023 16:27:36 -0400 Subject: [PATCH] elasticsearch-dsl-py < 7.0 mn/#3-support-latest-elasticsearch-dsl-6 --- requirements/base.in | 2 +- requirements/dev.txt | 27 +++++++++++++-------------- requirements/quality.txt | 12 ++++++------ requirements/test.txt | 8 +++----- requirements/travis.txt | 4 ++-- setup.py | 8 +------- 6 files changed, 26 insertions(+), 35 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 5e661e0..4b25d24 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -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 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 505a850..09ea31c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 @@ -52,7 +52,7 @@ 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 @@ -60,17 +60,15 @@ filelock==3.12.2 # 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 @@ -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 @@ -177,6 +175,7 @@ texttable==1.6.7 tomli==2.0.1 # via # build + # pip-tools # pylint # pyproject-hooks # tox @@ -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 @@ -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: diff --git a/requirements/quality.txt b/requirements/quality.txt index 640d9db..76cf470 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/test.txt b/requirements/test.txt index 9446c25..3f3f592 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/travis.txt b/requirements/travis.txt index 3456fbf..f96a9a6 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -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 @@ -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 diff --git a/setup.py b/setup.py index 9bdec25..d7d0852 100755 --- a/setup.py +++ b/setup.py @@ -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, @@ -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', ], )