Skip to content

Commit d86c6a9

Browse files
committed
Remove numpy pin from ci/docker/conda-python-spark.dockerfile and add it to tasks.yml
1 parent daec936 commit d86c6a9

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

ci/docker/conda-python-spark.dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ FROM ${repo}:${arch}-conda-python-${python}
2222

2323
ARG jdk=8
2424
ARG maven=3.5
25-
# https://github.com/apache/arrow/issues/33697
26-
# numpy version pin should be removed with new apache spark release
27-
# that includes https://github.com/apache/spark/pull/37817
28-
ARG numpy=1.23
2925

3026
RUN mamba install -q -y \
3127
openjdk=${jdk} \
3228
maven=${maven} \
33-
numpy=${numpy} \
3429
pandas && \
3530
mamba clean --all
3631

dev/tasks/tasks.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,9 +1587,9 @@ tasks:
15871587
image: conda-python-hdfs
15881588
{% endfor %}
15891589

1590-
{% for python_version, spark_version, test_pyarrow_only in [("3.7", "v3.1.2", "false"),
1591-
("3.8", "v3.2.0", "false"),
1592-
("3.9", "master", "false")] %}
1590+
{% for python_version, spark_version, test_pyarrow_only, numpy_version in [("3.7", "v3.1.2", "false", "latest"),
1591+
("3.8", "v3.2.0", "false", "1.23"),
1592+
("3.9", "master", "false", "latest")] %}
15931593
test-conda-python-{{ python_version }}-spark-{{ spark_version }}:
15941594
ci: github
15951595
template: docker-tests/github.linux.yml
@@ -1598,6 +1598,7 @@ tasks:
15981598
PYTHON: "{{ python_version }}"
15991599
SPARK: "{{ spark_version }}"
16001600
TEST_PYARROW_ONLY: "{{ test_pyarrow_only }}"
1601+
NUMPY: "{{ numpy_version }}"
16011602
# use the branch-3.0 of spark, so prevent reusing any layers
16021603
flags: --no-leaf-cache
16031604
image: conda-python-spark

0 commit comments

Comments
 (0)