Merge pull request #499 from ClearcodeHQ/elasticsearch-update

Support elasticsearch 8.6
ClearcodeHQ · Jul 28, 2023 · 5e1db2a · 5e1db2a
2 parents 5cbea1b + 861de4f
commit 5e1db2a
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  tests_8_2:
+  tests_8_6:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -17,19 +17,87 @@ jobs:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
       ES_JAVA_OPTS: "-Xms256m -Xmx512m"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/pytest
+        with:
+          python-version: ${{ matrix.python-version }}
+          elasticsearch: "8.6"
+  tests_8_5:
+    needs: [tests_8_6]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: [3.8, 3.9, "3.10", "3.11", pypy-3.8]
+    env:
+      OS: ubuntu-latest
+      PYTHON: ${{ matrix.python-version }}
+      ES_JAVA_OPTS: "-Xms256m -Xmx512m"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/pytest
+        with:
+          python-version: ${{ matrix.python-version }}
+          elasticsearch: "8.5"
+  tests_8_4:
+    needs: [tests_8_5]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: [3.9, "3.10", "3.11"]
+    env:
+      OS: ubuntu-latest
+      PYTHON: ${{ matrix.python-version }}
+      ES_JAVA_OPTS: "-Xms256m -Xmx512m"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/pytest
+        with:
+          python-version: ${{ matrix.python-version }}
+          elasticsearch: "8.4"
+  tests_8_3:
+    needs: [tests_8_4]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.10", "3.11"]
+    env:
+      OS: ubuntu-latest
+      PYTHON: ${{ matrix.python-version }}
+      ES_JAVA_OPTS: "-Xms256m -Xmx512m"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/pytest
+        with:
+          python-version: ${{ matrix.python-version }}
+          elasticsearch: "8.3"
+  tests_8_2:
+    needs: [tests_8_4]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.11"]
+    env:
+      OS: ubuntu-latest
+      PYTHON: ${{ matrix.python-version }}
+      ES_JAVA_OPTS: "-Xms256m -Xmx512m"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
           elasticsearch: "8.2"
   tests_8_1:
-    needs: [tests_8_2]
+    needs: [tests_8_4]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", pypy-3.8]
+        python-version: ["3.10", "3.11"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -41,12 +109,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
           elasticsearch: "8.1"
   tests_8_0:
-    needs: [tests_8_1]
+    needs: [tests_8_4]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", pypy-3.8]
+        python-version: ["3.11"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -78,7 +146,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.9, "3.10", "3.11"]
+        python-version: ["3.11"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -89,7 +157,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           elasticsearch: "7.16"
   tests_7_15:
-    needs: [tests_7_16]
+    needs: [tests_7_17]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -105,7 +173,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           elasticsearch: "7.15"
   tests_7_14:
-    needs: [tests_7_15]
+    needs: [tests_7_17]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true

diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,7 @@ name = "pypi"
 pytest = "==7.3.2"
 port-for = "==0.7.0"
 mirakuru = "==2.5.1"
-elasticsearch = "==8.2"
+elasticsearch = "==8.6"
 
 [dev-packages]
 towncrier = "==23.6.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/newsfragments/384.feature.rst b/newsfragments/384.feature.rst
@@ -1 +1 @@
-Support elasticsearch up to 8.2
+Support elasticsearch up to 8.6