From 861de4fc34f247cb28f5872898bd0cd1d081c4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20=C5=9Aliwi=C5=84ski?= Date: Fri, 28 Jul 2023 12:37:34 +0200 Subject: [PATCH] Support elasticsearch up to 8.6 --- .github/workflows/tests.yml | 84 +++++++++++++++++++++++++++++++---- Pipfile | 2 +- Pipfile.lock | 8 ++-- newsfragments/384.feature.rst | 2 +- 4 files changed, 82 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fa8ef040..cdd79779 100644 --- 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,6 +17,74 @@ 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 @@ -24,12 +92,12 @@ jobs: 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 index e0ae3e6d..7fc4569b 100644 --- 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 index 5107aafa..0f0d3103 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "601b1f3ca1c2a644586d48bb54c04ccfdacfe6f97db14c0eb2ed9b1a9cca0231" + "sha256": "c7b2c19017aee3ebe5aa0f84bb9a9dbfa5af8497469a1ae9a8633d0a1a88d4f8" }, "pipfile-spec": 6, "requires": {}, @@ -32,11 +32,11 @@ }, "elasticsearch": { "hashes": [ - "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb", - "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb" + "sha256:70f6da78878c5df28cd4a4b902a57192a86b0306e69bc08177a14dac9759db59", + "sha256:9d2c1010bda4699c202be82cb960aee3fb9359ca98bb83dfa7db06679212e9a7" ], "index": "pypi", - "version": "==8.2" + "version": "==8.6" }, "iniconfig": { "hashes": [ diff --git a/newsfragments/384.feature.rst b/newsfragments/384.feature.rst index 741e5ef0..11f058b2 100644 --- a/newsfragments/384.feature.rst +++ b/newsfragments/384.feature.rst @@ -1 +1 @@ -Support elasticsearch up to 8.2 \ No newline at end of file +Support elasticsearch up to 8.6 \ No newline at end of file