Skip to content

Commit 28cf7a4

Browse files
authored
apacheGH-46343: [CI][Python] Remove workaround for gdb packaging issue (apache#46848)
### Rationale for this change In apache#46511 we skipped installing gdb on conda-based Python 3.10 CI jobs, to work around conda-forge/gdb-feedstock#83 Now that conda-forge has fixed the issue, we can re-enable gdb on those builds. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: apache#46343 Authored-by: Antoine Pitrou <[email protected]> Signed-off-by: Jacob Wujciak-Jens <[email protected]>
1 parent baa5387 commit 28cf7a4

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

ci/docker/conda-python.dockerfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,11 @@ FROM ${repo}:${arch}-conda-cpp
2323
ARG python=3.9
2424
COPY ci/conda_env_python.txt \
2525
/arrow/ci/
26-
# If the Python version being used is 3.10 we need to install gdb<16.3 (GH-46343).
2726
# If the Python version being tested is the same as the Python used by the system gdb,
2827
# we need to install the conda-forge gdb instead (GH-38323).
29-
RUN if [ "$python" == "3.10" ]; then \
30-
GDB_PACKAGE="gdb<16.3"; \
31-
elif [ "$python" == "$(gdb --batch --eval-command 'python import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" ]; then \
32-
GDB_PACKAGE="gdb"; \
33-
else \
34-
GDB_PACKAGE=""; \
35-
fi && \
36-
mamba install -q -y \
28+
RUN mamba install -q -y \
3729
--file arrow/ci/conda_env_python.txt \
38-
$([[ -n "$GDB_PACKAGE" ]] && echo "$GDB_PACKAGE") \
30+
$([ "$python" == $(gdb --batch --eval-command 'python import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")') ] && echo "gdb") \
3931
"python=${python}.*=*_cp*" \
4032
nomkl && \
4133
mamba clean --all --yes

0 commit comments

Comments
 (0)