Merge pull request #502 from ClearcodeHQ/es89

Support elasticsearch 8.9 - closes #416
ClearcodeHQ · Jul 28, 2023 · 4de00c8 · 4de00c8
2 parents 5e1db2a + 00d1ebe
commit 4de00c8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 67 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  tests_8_6:
+  tests_8_9:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -22,9 +22,9 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.6"
-  tests_8_5:
-    needs: [tests_8_6]
+          elasticsearch: "8.9"
+  tests_8_8:
+    needs: [tests_8_9]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -39,9 +39,9 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.5"
-  tests_8_4:
-    needs: [tests_8_5]
+          elasticsearch: "8.8"
+  tests_8_7:
+    needs: [tests_8_8]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -56,9 +56,9 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.4"
-  tests_8_3:
-    needs: [tests_8_4]
+          elasticsearch: "8.6"
+  tests_8_6:
+    needs: [tests_8_7]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -73,26 +73,9 @@ jobs:
       - 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_4]
+          elasticsearch: "8.6"
+  tests_8_5:
+    needs: [tests_8_7]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -107,9 +90,9 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.1"
-  tests_8_0:
-    needs: [tests_8_4]
+          elasticsearch: "8.5"
+  tests_8_4:
+    needs: [tests_8_7]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -124,61 +107,47 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "8.0"
-  tests_7_17:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", pypy-3.8]
-    env:
-      OS: ubuntu-latest
-      PYTHON: ${{ matrix.python-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/pytest
-        with:
-          python-version: ${{ matrix.python-version }}
-          elasticsearch: "7.17"
-  tests_7_16:
-    needs: [tests_7_17]
+          elasticsearch: "8.4"
+  tests_8_3:
+    needs: [tests_8_7]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.11"]
+        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: "7.16"
-  tests_7_15:
-    needs: [tests_7_17]
+          elasticsearch: "8.3"
+  tests_8_0:
+    needs: [tests_8_7]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.11"]
+        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: "7.15"
-  tests_7_14:
-    needs: [tests_7_17]
+          elasticsearch: "8.0"
+  tests_7_17:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11"]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}
@@ -187,4 +156,4 @@ jobs:
       - uses: ./.github/actions/pytest
         with:
           python-version: ${{ matrix.python-version }}
-          elasticsearch: "7.14"
+          elasticsearch: "7.17"
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.6"
+elasticsearch = "==8.9"
 
 [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.6
+Support elasticsearch up to 8.9
diff --git a/newsfragments/384.misc.rst b/newsfragments/384.misc.rst
@@ -0,0 +1 @@
+Dropped Elasticsearch older than 7.17 from CI.