Merge pull request #513 from ClearcodeHQ/es7-compatibility

Make sure it works against elasticsearch 7.* library - closes #512

.github/actions/elastic_7/action.yml

@@ -0,0 +1,42 @@
+name: 'Pytest run'
+description: 'Greet someone'
+inputs:
+  python-version:  # id of input
+    description: 'Python version to use'
+    required: true
+  elasticsearch:
+    description: 'Elasticsearch version'
+    required: true
+runs:
+  using: "composite"
+  steps:
+  - name: Set up Python ${{ inputs.python-version }}
+    uses: actions/setup-python@v3
+    with:
+      python-version: ${{ inputs.python-version }}
+  - uses: actions/cache@v3
+    with:
+      path: ~/elasticsearch
+      key: elasticsearch-${{ inputs.elasticsearch }}
+  - name: Setup elasticsearch
+    uses: ankane/setup-elasticsearch@v1
+    with:
+      elasticsearch-version: ${{ inputs.elasticsearch }}
+  - name: Prep environment
+    shell: bash
+    run: pip install pipenv && pipenv install --dev --skip-lock
+  - name: Downgrade elasticsearch
+    shell: bash
+    run: pipenv run pip install "elasticsearch<8"
+  - name: Run test
+    shell: bash
+    run: pipenv run pytest --elasticsearch-executable=$ES_HOME/bin/elasticsearch -n 0 --cov-report=xml
+  - name: Run xdist test
+    shell: bash
+    run: pipenv run pytest --elasticsearch-executable=$ES_HOME/bin/elasticsearch -n 1 --cov-report=xml:coverage-xdist.xml
+  - name: Upload coverage to Codecov
+    uses: codecov/[email protected]
+    with:
+      flags: linux,elastic-${{ inputs.elasticsearch }}
+      env_vars: OS, PYTHON
+      fail_ci_if_error: false

.github/workflows/tests.yml

@@ -157,3 +157,19 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           elasticsearch: "7.17"
+  tests_7_17_lib_7:
+    needs: [tests_7_17]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.11"]
+    env:
+      OS: ubuntu-latest
+      PYTHON: ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/elastic_7
+        with:
+          python-version: ${{ matrix.python-version }}
+          elasticsearch: "7.17"

newsfragments/512.bugfix.rst

@@ -0,0 +1 @@
+Fixed compatibility with elasticsearch client 7.x

pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "pytest >= 6.2",
     "port-for >= 0.7.1",
     "mirakuru",
-    "elasticsearch",
+    "elasticsearch >= 7",
 ]
 requires-python = ">= 3.8"
 

pytest_elasticsearch/factories.py

@@ -22,6 +22,7 @@
 
 import pytest
 from elasticsearch import Elasticsearch
+from elasticsearch import __version__ as elastic_version
 from mirakuru import ProcessExitedWithError
 from port_for import get_port
 from port_for.api import PortType
@@ -101,7 +102,6 @@ def elasticsearch_proc_fixture(
             elasticsearch_index_store_type,
             timeout=60,
         )
-        print(elasticsearch_executor.command)
 
         elasticsearch_executor.start()
         yield elasticsearch_executor
@@ -161,7 +161,8 @@ def elasticsearch_fixture(request: FixtureRequest) -> Iterator[Elasticsearch]:
             request_timeout=30,
             verify_certs=False,
         )
-        client.options(ignore_status=400)
+        if elastic_version >= (8, 0, 0):
+            client.options(ignore_status=400)
 
         yield client
         for index in client.indices.get_alias():