From c8297009e4ce7e811bf83858840aa773d54f5828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20=C5=9Aliwi=C5=84ski?= Date: Fri, 28 Jul 2023 12:07:34 +0200 Subject: [PATCH] Support elasticsearch 8.2 --- .github/workflows/tests.yml | 40 ++++++++++++++++++++++++++++++++--- Pipfile | 2 +- Pipfile.lock | 8 +++---- newsfragments/384.feature.rst | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c8c5ec5..fa8ef040 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: branches: [ main ] jobs: - tests_8_0: + tests_8_2: runs-on: ubuntu-latest strategy: fail-fast: true @@ -17,6 +17,40 @@ 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.2" + tests_8_1: + needs: [tests_8_2] + 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.1" + tests_8_0: + needs: [tests_8_1] + 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 @@ -44,7 +78,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: [3.7, 3.8, 3.9, "3.10", "3.11", pypy-3.8] + python-version: [3.9, "3.10", "3.11"] env: OS: ubuntu-latest PYTHON: ${{ matrix.python-version }} @@ -60,7 +94,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ["3.11", pypy-3.8] + python-version: ["3.11"] env: OS: ubuntu-latest PYTHON: ${{ matrix.python-version }} diff --git a/Pipfile b/Pipfile index 6f8b55cf..e0ae3e6d 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.0.1" +elasticsearch = "==8.2" [dev-packages] towncrier = "==23.6.0" diff --git a/Pipfile.lock b/Pipfile.lock index 063bef2f..5107aafa 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f9c8d21d7a68efdc5ad1d220f434940b72c8de8283132c8d4b415d5019f69837" + "sha256": "601b1f3ca1c2a644586d48bb54c04ccfdacfe6f97db14c0eb2ed9b1a9cca0231" }, "pipfile-spec": 6, "requires": {}, @@ -32,11 +32,11 @@ }, "elasticsearch": { "hashes": [ - "sha256:68598bd9cb297199523bf28c4a71c63d559ebca42107110f39ef2a748b58c6d7", - "sha256:b9facb8d7db71ad0d3c0ccc87dc224985abfe00bea888acd1d187cb0972c61f2" + "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb", + "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb" ], "index": "pypi", - "version": "==8.0.1" + "version": "==8.2" }, "iniconfig": { "hashes": [ diff --git a/newsfragments/384.feature.rst b/newsfragments/384.feature.rst index cf13306d..741e5ef0 100644 --- a/newsfragments/384.feature.rst +++ b/newsfragments/384.feature.rst @@ -1 +1 @@ -Support elasticsearch 8. \ No newline at end of file +Support elasticsearch up to 8.2 \ No newline at end of file