diff --git a/ci/docker/conda-python-pandas.dockerfile b/ci/docker/conda-python-pandas.dockerfile index 0c476881ab1..83ad52a13d6 100644 --- a/ci/docker/conda-python-pandas.dockerfile +++ b/ci/docker/conda-python-pandas.dockerfile @@ -22,6 +22,13 @@ FROM ${repo}:${arch}-conda-python-${python} ARG pandas=latest ARG numpy=latest + +# the doc builds are using the conda-python-pandas image, +# so ensure to install doc requirements +COPY ci/conda_env_sphinx.txt /arrow/ci/ +RUN mamba install -q -y --file arrow/ci/conda_env_sphinx.txt && \ + mamba clean --all + COPY ci/scripts/install_pandas.sh /arrow/ci/scripts/ RUN mamba uninstall -q -y numpy && \ /arrow/ci/scripts/install_pandas.sh ${pandas} ${numpy} diff --git a/ci/docker/conda-python.dockerfile b/ci/docker/conda-python.dockerfile index ba50d267301..21e57228f44 100644 --- a/ci/docker/conda-python.dockerfile +++ b/ci/docker/conda-python.dockerfile @@ -22,11 +22,9 @@ FROM ${repo}:${arch}-conda-cpp # install python specific packages ARG python=3.8 COPY ci/conda_env_python.txt \ - ci/conda_env_sphinx.txt \ /arrow/ci/ RUN mamba install -q -y \ --file arrow/ci/conda_env_python.txt \ - --file arrow/ci/conda_env_sphinx.txt \ gdb \ python=${python} \ nomkl && \ diff --git a/python/pyarrow/tests/test_dataset.py b/python/pyarrow/tests/test_dataset.py index 144da21cf5e..247bf6ee458 100644 --- a/python/pyarrow/tests/test_dataset.py +++ b/python/pyarrow/tests/test_dataset.py @@ -3230,6 +3230,7 @@ def test_json_format(tempdir, dataset_reader): assert result.equals(table) +@pytest.mark.pandas def test_json_format_options(tempdir, dataset_reader): table = pa.table({'a': pa.array([1, 2, 3], type="int64"), 'b': pa.array([.1, .2, .3], type="float64")}) @@ -3250,6 +3251,7 @@ def test_json_format_options(tempdir, dataset_reader): assert result.equals(table) +@pytest.mark.pandas def test_json_fragment_options(tempdir, dataset_reader): table = pa.table({'a': pa.array([1, 2, 3], type="int64"), 'b': pa.array([.1, .2, .3], type="float64")}) diff --git a/python/pyarrow/tests/test_extension_type.py b/python/pyarrow/tests/test_extension_type.py index 152b64a028b..009896fd67e 100644 --- a/python/pyarrow/tests/test_extension_type.py +++ b/python/pyarrow/tests/test_extension_type.py @@ -1096,7 +1096,8 @@ def test_empty_take(): ([1, 2, 3], IntegerType), (["cat", "dog", "horse"], LabelType) )) -@pytest.mark.parametrize("into", ("to_numpy", "to_pandas")) +@pytest.mark.parametrize( + "into", ["to_numpy", pytest.param("to_pandas", marks=pytest.mark.pandas)]) def test_extension_array_to_numpy_pandas(data, ty, into): storage = pa.array(data) ext_arr = pa.ExtensionArray.from_storage(ty(), storage)