This is an automated email from the ASF dual-hosted git repository.

assignuser 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 28cf7a4b3d GH-46343: [CI][Python] Remove workaround for gdb packaging 
issue (#46848)
28cf7a4b3d is described below

commit 28cf7a4b3d662d8faef69ec26d9720cf8746c498
Author: Antoine Pitrou <[email protected]>
AuthorDate: Wed Jun 18 17:19:23 2025 +0200

    GH-46343: [CI][Python] Remove workaround for gdb packaging issue (#46848)
    
    ### Rationale for this change
    
    In https://github.com/apache/arrow/pull/46511 we skipped installing gdb on 
conda-based Python 3.10 CI jobs, to work around 
https://github.com/conda-forge/gdb-feedstock/issues/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: #46343
    
    Authored-by: Antoine Pitrou <[email protected]>
    Signed-off-by: Jacob Wujciak-Jens <[email protected]>
---
 ci/docker/conda-python.dockerfile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ci/docker/conda-python.dockerfile 
b/ci/docker/conda-python.dockerfile
index 53231fc1cd..1c7ca9fb4b 100644
--- a/ci/docker/conda-python.dockerfile
+++ b/ci/docker/conda-python.dockerfile
@@ -23,19 +23,11 @@ FROM ${repo}:${arch}-conda-cpp
 ARG python=3.9
 COPY ci/conda_env_python.txt \
      /arrow/ci/
-# If the Python version being used is 3.10 we need to install gdb<16.3 
(GH-46343).
 # If the Python version being tested is the same as the Python used by the 
system gdb,
 # we need to install the conda-forge gdb instead (GH-38323).
-RUN if [ "$python" == "3.10" ]; then \
-        GDB_PACKAGE="gdb<16.3"; \
-    elif [ "$python" == "$(gdb --batch --eval-command 'python import sys; 
print(f"{sys.version_info.major}.{sys.version_info.minor}")')" ]; then \
-        GDB_PACKAGE="gdb"; \
-    else \
-        GDB_PACKAGE=""; \
-    fi && \
-    mamba install -q -y \
+RUN mamba install -q -y \
         --file arrow/ci/conda_env_python.txt \
-        $([[ -n "$GDB_PACKAGE" ]] && echo "$GDB_PACKAGE") \
+        $([ "$python" == $(gdb --batch --eval-command 'python import sys; 
print(f"{sys.version_info.major}.{sys.version_info.minor}")') ] && echo "gdb") \
         "python=${python}.*=*_cp*" \
         nomkl && \
     mamba clean --all --yes

Reply via email to