This is an automated email from the ASF dual-hosted git repository.
jorisvandenbossche pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 6d5cfb2b2f GH-39958: [Python][CI] Remove upper pin on pytest (#40487)
6d5cfb2b2f is described below
commit 6d5cfb2b2fc3a2cbb0bb7ecc9aff24e2834ade66
Author: Alenka Frim <[email protected]>
AuthorDate: Tue Mar 19 15:13:16 2024 +0100
GH-39958: [Python][CI] Remove upper pin on pytest (#40487)
### Rationale for this change
The latest version of pytest (`8.0.0`) is breaking our CI:
- S3 fixture from out test suite fails
- `doctest-cython` check fails
### What changes are included in this PR?
- added `allow_bucket_creation=True` to the `s3_example_fs` fixture
- removed the pin on pytest, except for the doc builds
### Are these changes tested?
Yes.
### Are there any user-facing changes?
No
Closes:
- Closes https://github.com/apache/arrow/issues/39958
- Closes https://github.com/apache/arrow/issues/39957
* GitHub Issue: #39958
Lead-authored-by: AlenkaF <[email protected]>
Co-authored-by: Joris Van den Bossche <[email protected]>
Signed-off-by: Joris Van den Bossche <[email protected]>
---
ci/conda_env_python.txt | 2 +-
docker-compose.yml | 10 ++++++----
python/pyarrow/tests/parquet/conftest.py | 1 +
python/requirements-test.txt | 2 +-
python/requirements-wheel-test.txt | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ci/conda_env_python.txt b/ci/conda_env_python.txt
index 19e94d7d3e..4366e30010 100644
--- a/ci/conda_env_python.txt
+++ b/ci/conda_env_python.txt
@@ -23,7 +23,7 @@ cloudpickle
fsspec
hypothesis
numpy>=1.16.6
-pytest<8
+pytest
pytest-faulthandler
s3fs>=2023.10.0
setuptools
diff --git a/docker-compose.yml b/docker-compose.yml
index eb434b9062..9b0610fe55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1208,15 +1208,17 @@ services:
LANG: "C.UTF-8"
BUILD_DOCS_CPP: "ON"
BUILD_DOCS_PYTHON: "ON"
- # GH-31506/GH-33609: Remove --disable-warnings once
- # https://github.com/lgpage/pytest-cython/issues/24 is resolved
- # and a new version that includes the fix is released.
- PYTEST_ARGS: "--doctest-modules --doctest-cython --disable-warnings"
+ PYTEST_ARGS: "--doctest-modules --doctest-cython"
volumes: *conda-volumes
+ # pytest is installed with an upper pin of 8.0.0 because
+ # newer version breaks cython doctesting, see:
+ # https://github.com/lgpage/pytest-cython/issues/58
+ # Remove pip install pytest~=7 when upstream issue is resolved
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 &&
archery numpydoc --allow-rule GL10,PR01,PR03,PR04,PR05,PR10,RT03,YD01
&&
/arrow/ci/scripts/python_test.sh /arrow"]
diff --git a/python/pyarrow/tests/parquet/conftest.py
b/python/pyarrow/tests/parquet/conftest.py
index 461c24af22..767e7f6b69 100644
--- a/python/pyarrow/tests/parquet/conftest.py
+++ b/python/pyarrow/tests/parquet/conftest.py
@@ -81,6 +81,7 @@ def s3_example_fs(s3_server):
host, port, access_key, secret_key = s3_server['connection']
uri = (
"s3://{}:{}@mybucket/data.parquet?scheme=http&endpoint_override={}:{}"
+ "&allow_bucket_creation=True"
.format(access_key, secret_key, host, port)
)
fs, path = FileSystem.from_uri(uri)
diff --git a/python/requirements-test.txt b/python/requirements-test.txt
index 2108d70a54..975477c422 100644
--- a/python/requirements-test.txt
+++ b/python/requirements-test.txt
@@ -1,5 +1,5 @@
cffi
hypothesis
pandas
-pytest<8
+pytest
pytz
diff --git a/python/requirements-wheel-test.txt
b/python/requirements-wheel-test.txt
index a1046bc18c..46bedc13ba 100644
--- a/python/requirements-wheel-test.txt
+++ b/python/requirements-wheel-test.txt
@@ -1,7 +1,7 @@
cffi
cython
hypothesis
-pytest<8
+pytest
pytz
tzdata; sys_platform == 'win32'
