diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index e4faa47..ecb2daf 100755 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -3,6 +3,7 @@ ELASTICSEARCH_VERSION: - 8.0.0-SNAPSHOT - 7.x-SNAPSHOT + - 7.14-SNAPSHOT PANDAS_VERSION: - 1.2.0 diff --git a/README.md b/README.md index bafc35a..f63f9d8 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,8 @@ $ conda install -c conda-forge eland ### Supported Versions -- Supports Python 3.6+ and Pandas 1.0.0+ -- Supports Elasticsearch clusters that are 7.x+, recommended 7.6 or later for all features to work. +- Supports Python 3.7+ and Pandas 1.3 +- Supports Elasticsearch clusters that are 7.x+, recommended 7.14 or later for all features to work. ### Connecting to Elasticsearch diff --git a/docs/guide/overview.asciidoc b/docs/guide/overview.asciidoc index 4e328a2..2bcfa62 100644 --- a/docs/guide/overview.asciidoc +++ b/docs/guide/overview.asciidoc @@ -8,8 +8,8 @@ Source code is available on https://github.com/elastic/eland[GitHub]. [discrete] === Compatibility -The library is compatible with Python 3.6 and later and all -{es} versions since `7.6.x` but you **have to use a matching major version**: +The library is compatible with Python 3.7 and later and all +{es} versions since 7.14 but you **should use a matching major version**: The recommended way to set your requirements in your `setup.py` or `requirements.txt` is:: @@ -17,13 +17,6 @@ The recommended way to set your requirements in your `setup.py` or # Elasticsearch 7.x eland>=7,<8 -Because Eland uses some experimental APIs for {ml} it -is also recommended to install the same major and minor for `elasticsearch-py` -as your cluster. For example if your cluster is v7.8.1 you would install -like so:: - - $ python -m pip install 'eland>=7,<8' 'elasticsearch>=7.8,<7.9' - [discrete] === Getting Started diff --git a/setup.py b/setup.py index 3ea00be..a7bdcb1 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,12 @@ setup( classifiers=CLASSIFIERS, keywords="elastic eland pandas python", packages=find_packages(include=["eland", "eland.*"]), - install_requires=["elasticsearch>=7.13", "pandas>=1.2,<1.4", "matplotlib", "numpy"], + install_requires=[ + "elasticsearch>=7.14,<8", + "pandas>=1.2,<1.4", + "matplotlib", + "numpy", + ], python_requires=">=3.7", package_data={"eland": ["py.typed"]}, include_package_data=True,