From 6cdb28464a509bea3f70356e8a87689bdd01bf06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Kothe?= Date: Mon, 22 Sep 2025 21:28:48 -0300 Subject: [PATCH 1/3] fix(Dockerfile): don't install PyQt5 on linux/arm --- Dockerfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 41112b00950f3..6d919e80191bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ FROM python:3.11.13 WORKDIR /home/pandas +# https://docs.docker.com/reference/dockerfile/#automatic-platform-args-in-the-global-scope +ARG TARGETPLATFORM + RUN apt-get update && \ apt-get --no-install-recommends -y upgrade && \ apt-get --no-install-recommends -y install \ @@ -13,7 +16,14 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* COPY requirements-dev.txt /tmp -RUN python -m pip install --no-cache-dir --upgrade pip && \ + +RUN case "$TARGETPLATFORM" in \ + linux/arm*) \ + # Drop PyQt5 for ARM GH#61037 + sed -i "/^pyqt5/Id" /tmp/requirements-dev.txt \ + ;; \ + esac && \ + python -m pip install --no-cache-dir --upgrade pip && \ python -m pip install --no-cache-dir -r /tmp/requirements-dev.txt RUN git config --global --add safe.directory /home/pandas From ad487882cdf4ce23454bbb6cc2315ba8318663ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Kothe?= Date: Mon, 22 Sep 2025 22:07:57 -0300 Subject: [PATCH 2/3] ci(docker): build on arm64 --- .github/workflows/code-checks.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 82b1ef586e5dc..d8fd6c618b360 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -132,15 +132,22 @@ jobs: asv run --quick --dry-run --durations=30 --python=same --show-stderr build_docker_dev_environment: - name: Build Docker Dev Environment - runs-on: ubuntu-24.04 + name: Build Docker Dev Environment (${{ matrix.arch }}) + runs-on: ${{ matrix.platform }} + strategy: + matrix: + include: + - arch: amd64 + platform: ubuntu-24.04 + - arch: arm64 + platform: ubuntu-24.04-arm defaults: run: shell: bash -el {0} concurrency: # https://github.community/t/concurrecy-not-work-for-push/183068/7 - group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment + group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment-${{ matrix.arch }} cancel-in-progress: true steps: @@ -153,10 +160,10 @@ jobs: fetch-depth: 0 - name: Build image - run: docker build --pull --no-cache --tag pandas-dev-env . + run: docker build --pull --no-cache --tag pandas-dev-env-${{ matrix.arch }} . - name: Show environment - run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())" + run: docker run --rm pandas-dev-env-${{ matrix.arch }} python -c "import pandas as pd; print(pd.show_versions())" requirements-dev-text-installable: name: Test install requirements-dev.txt From d0c81d677dd46bdc2ae42e98e3b14dec08e136f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Kothe?= Date: Tue, 23 Sep 2025 14:36:50 -0300 Subject: [PATCH 3/3] Revert "ci(docker): build on arm64" This reverts commit ad487882cdf4ce23454bbb6cc2315ba8318663ea. --- .github/workflows/code-checks.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index d8fd6c618b360..82b1ef586e5dc 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -132,22 +132,15 @@ jobs: asv run --quick --dry-run --durations=30 --python=same --show-stderr build_docker_dev_environment: - name: Build Docker Dev Environment (${{ matrix.arch }}) - runs-on: ${{ matrix.platform }} - strategy: - matrix: - include: - - arch: amd64 - platform: ubuntu-24.04 - - arch: arm64 - platform: ubuntu-24.04-arm + name: Build Docker Dev Environment + runs-on: ubuntu-24.04 defaults: run: shell: bash -el {0} concurrency: # https://github.community/t/concurrecy-not-work-for-push/183068/7 - group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment-${{ matrix.arch }} + group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment cancel-in-progress: true steps: @@ -160,10 +153,10 @@ jobs: fetch-depth: 0 - name: Build image - run: docker build --pull --no-cache --tag pandas-dev-env-${{ matrix.arch }} . + run: docker build --pull --no-cache --tag pandas-dev-env . - name: Show environment - run: docker run --rm pandas-dev-env-${{ matrix.arch }} python -c "import pandas as pd; print(pd.show_versions())" + run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())" requirements-dev-text-installable: name: Test install requirements-dev.txt