diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml index 08d9211..d7d0bf3 100755 --- a/.ci/jobs/defaults.yml +++ b/.ci/jobs/defaults.yml @@ -50,11 +50,15 @@ - axis: type: yaml filename: .ci/test-matrix.yml - name: TEST_SUITE + name: PYTHON_VERSION - axis: type: yaml filename: .ci/test-matrix.yml - name: PYTHON_VERSION + name: PANDAS_VERSION + - axis: + type: yaml + filename: .ci/test-matrix.yml + name: TEST_SUITE yaml-strategy: exclude-key: exclude filename: .ci/test-matrix.yml diff --git a/.ci/run-repository.sh b/.ci/run-repository.sh index 6e92e8f..29547a0 100755 --- a/.ci/run-repository.sh +++ b/.ci/run-repository.sh @@ -21,6 +21,7 @@ echo -e "\033[34;1mINFO:\033[0m VERSION ${ELASTICSEARCH_VERSION}\033[0m" echo -e "\033[34;1mINFO:\033[0m CONTAINER ${ELASTICSEARCH_CONTAINER}\033[0m" echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m" echo -e "\033[34;1mINFO:\033[0m PYTHON_VERSION ${PYTHON_VERSION}\033[0m" +echo -e "\033[34;1mINFO:\033[0m PANDAS_VERSION ${PANDAS_VERSION}\033[0m" echo -e "\033[1m>>>>> Build [elastic/eland container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" @@ -35,4 +36,4 @@ docker run \ --name eland-test-runner \ --rm \ elastic/eland \ - nox -s lint test-${PYTHON_VERSION} + nox -s lint "test-${PYTHON_VERSION}(pandas_version='${PANDAS_VERSION}')" diff --git a/.ci/run-tests b/.ci/run-tests index 0f73a09..a72fe7d 100755 --- a/.ci/run-tests +++ b/.ci/run-tests @@ -12,6 +12,7 @@ set -euxo pipefail TEST_SUITE=${TEST_SUITE-xpack} NODE_NAME=localhost +PANDAS_VERSION=${PANDAS_VERSION-1.3.0} elasticsearch_image=elasticsearch @@ -55,5 +56,6 @@ ELASTICSEARCH_CONTAINER=${elasticsearch_image}:${ELASTICSEARCH_VERSION} \ NODE_NAME=${NODE_NAME} \ ELASTICSEARCH_URL=${elasticsearch_url} \ TEST_SUITE=${TEST_SUITE} \ + PANDAS_VERSION=${PANDAS_VERSION} \ bash .ci/run-repository.sh diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index 4c0912a..72e6901 100755 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -5,8 +5,9 @@ ELASTICSEARCH_VERSION: - 7.x-SNAPSHOT - 7.10-SNAPSHOT -TEST_SUITE: - - xpack +PANDAS_VERSION: + - 1.2.0 + - 1.3.0 PYTHON_VERSION: - 3.9 @@ -14,4 +15,7 @@ PYTHON_VERSION: - 3.7 - 3.6 +TEST_SUITE: + - xpack + exclude: ~ diff --git a/noxfile.py b/noxfile.py index 300491e..caf6c4c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -90,10 +90,12 @@ def lint(session): @nox.session(python=["3.6", "3.7", "3.8", "3.9"]) -def test(session): +@nox.parametrize("pandas_version", ["1.2.0", "1.3.0"]) +def test(session, pandas_version: str): session.install("-r", "requirements-dev.txt") - session.run("python", "-m", "tests.setup_tests") session.install(".") + session.run("python", "-m", "pip", "install", f"pandas=={pandas_version}") + session.run("python", "-m", "tests.setup_tests") # Notebooks are only run on Python 3.7+ due to pandas 1.2.0 if session.python == "3.6":