Skip to content

GH-36541: [Python][CI] Ensure the "Without pandas" CI build has no pandas installed (don't install doc requirements in conda-python image) #36542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 3 commits into from
Jul 8, 2023
Merged

GH-36541: [Python][CI] Ensure the "Without pandas" CI build has no pandas installed (don't install doc requirements in conda-python image) #36542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
392827d
don't install sphinx requirements in conda-python image
jorisvandenbossche Jul 7, 2023
befc348
add doc requirements to conda-python-pandas
jorisvandenbossche Jul 7, 2023
ffb88ad
add missing pandas marks
jorisvandenbossche Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ci/docker/conda-python-pandas.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 0 additions & 2 deletions ci/docker/conda-python.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 2 additions & 0 deletions python/pyarrow/tests/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")})
Expand All @@ -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")})
Expand Down
3 changes: 2 additions & 1 deletion python/pyarrow/tests/test_extension_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down