From b1e037780085934ea81953dafde4a868280b37b8 Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Wed, 3 Apr 2024 14:06:48 +0200 Subject: [PATCH 1/3] Pin pytest-cython --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9b0610fe553..ad398494476 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1214,11 +1214,16 @@ services: # newer version breaks cython doctesting, see: # https://github.com/lgpage/pytest-cython/issues/58 # Remove pip install pytest~=7 when upstream issue is resolved + # Also pytest-cython needs an upper pin of 0.3.0 due + # to an issue with typing annotiations + # https://github.com/lgpage/pytest-cython/issues/67 + # With 0.3.* bug fix release, both pins can be removed command: ["/arrow/ci/scripts/cpp_build.sh /arrow /build && /arrow/ci/scripts/python_build.sh /arrow /build && pip install -e /arrow/dev/archery[numpydoc] && pip install pytest~=7.4 && + pip install pytest-cython~=0.2.2 && archery numpydoc --allow-rule GL10,PR01,PR03,PR04,PR05,PR10,RT03,YD01 && /arrow/ci/scripts/python_test.sh /arrow"] From 6bcce2dd76b819dafa1ce4c9921ac9c6213a193e Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Wed, 3 Apr 2024 15:57:08 +0200 Subject: [PATCH 2/3] Move the pin to the definition of python-conda-command --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ad398494476..0e3f9513ee1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -842,9 +842,14 @@ services: PYTEST_ARGS: # inherit volumes: *conda-volumes command: &python-conda-command + # pytest-cython needs an upper pin of 0.3.0 due + # to an issue with typing annotiations + # https://github.com/lgpage/pytest-cython/issues/67 + # With 0.3.* bug fix release, the pin can be removed [" /arrow/ci/scripts/cpp_build.sh /arrow /build && /arrow/ci/scripts/python_build.sh /arrow /build && + pip install pytest-cython~=0.2.2 && /arrow/ci/scripts/python_test.sh /arrow"] ubuntu-cuda-python: @@ -1214,16 +1219,11 @@ services: # newer version breaks cython doctesting, see: # https://github.com/lgpage/pytest-cython/issues/58 # Remove pip install pytest~=7 when upstream issue is resolved - # Also pytest-cython needs an upper pin of 0.3.0 due - # to an issue with typing annotiations - # https://github.com/lgpage/pytest-cython/issues/67 - # With 0.3.* bug fix release, both pins can be removed command: ["/arrow/ci/scripts/cpp_build.sh /arrow /build && /arrow/ci/scripts/python_build.sh /arrow /build && pip install -e /arrow/dev/archery[numpydoc] && pip install pytest~=7.4 && - pip install pytest-cython~=0.2.2 && archery numpydoc --allow-rule GL10,PR01,PR03,PR04,PR05,PR10,RT03,YD01 && /arrow/ci/scripts/python_test.sh /arrow"] From e4d17da46ad82d0e26e4cd58b2571811c3f3d90b Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Thu, 4 Apr 2024 12:07:42 +0200 Subject: [PATCH 3/3] Move pin to conda_env_sphinx.txt --- ci/conda_env_sphinx.txt | 5 ++++- docker-compose.yml | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/conda_env_sphinx.txt b/ci/conda_env_sphinx.txt index 6899f9c36a7..0a356d5722c 100644 --- a/ci/conda_env_sphinx.txt +++ b/ci/conda_env_sphinx.txt @@ -29,5 +29,8 @@ sphinx-copybutton sphinxcontrib-jquery sphinx==6.2 # Requirement for doctest-cython -pytest-cython +# Needs upper pin of 0.3.0, see: +# https://github.com/lgpage/pytest-cython/issues/67 +# With 0.3.* bug fix release, the pin can be removed +pytest-cython==0.2.2 pandas diff --git a/docker-compose.yml b/docker-compose.yml index 0e3f9513ee1..9b0610fe553 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -842,14 +842,9 @@ services: PYTEST_ARGS: # inherit volumes: *conda-volumes command: &python-conda-command - # pytest-cython needs an upper pin of 0.3.0 due - # to an issue with typing annotiations - # https://github.com/lgpage/pytest-cython/issues/67 - # With 0.3.* bug fix release, the pin can be removed [" /arrow/ci/scripts/cpp_build.sh /arrow /build && /arrow/ci/scripts/python_build.sh /arrow /build && - pip install pytest-cython~=0.2.2 && /arrow/ci/scripts/python_test.sh /arrow"] ubuntu-cuda-python: