From 0f54c0bb56dc9ad37526c945e35a48aeec9e6659 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:42:47 -0700
Subject: [PATCH 1/3] CI: Install libegl explicitly for pytest-qt on ubuntu

---
 .circleci/config.yml                      | 2 ++
 .github/workflows/code-checks.yml         | 5 +++++
 .github/workflows/docbuild-and-upload.yml | 4 ++++
 .github/workflows/unit-tests.yml          | 4 ++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7533899f90470..04efd4806c404 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,6 +16,7 @@ jobs:
       - run:
           name: Install Environment and Run Tests
           shell: /bin/bash -exo pipefail
+          # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
           command: |
             MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-aarch64.sh"
             wget -q $MINI_URL -O Miniforge3.sh
@@ -33,6 +34,7 @@ jobs:
             fi
             python -m pip install --no-build-isolation -ve . --config-settings=setup-args="--werror"
             PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
+            sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3
             ci/run_tests.sh
   test-linux-musl:
     docker:
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 937af7e49c6d3..99b403869b6ab 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -51,6 +51,11 @@ jobs:
     # TODO: The doctests have to be run first right now, since the Cython doctests only work
     # with pandas installed in non-editable mode
     # This can be removed once pytest-cython doesn't require C extensions to be installed inplace
+
+    - name: Extra installs
+      # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
+      run: sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3
+
     - name: Run doctests
       run: cd ci && ./code_checks.sh doctests
       if: ${{ steps.build.outcome == 'success' && always() }}
diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml
index 924a6263f34d2..bc3ab50164cc3 100644
--- a/.github/workflows/docbuild-and-upload.yml
+++ b/.github/workflows/docbuild-and-upload.yml
@@ -46,6 +46,10 @@ jobs:
     - name: Build Pandas
       uses: ./.github/actions/build_pandas
 
+    - name: Extra installs
+      # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
+      run: sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3
+
     - name: Test website
       run: python -m pytest web/
 
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 4539884e6afd3..b0c328d822e38 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -134,8 +134,8 @@ jobs:
         fetch-depth: 0
 
     - name: Extra installs
-      run: sudo apt-get update && sudo apt-get install -y ${{ matrix.extra_apt }}
-      if: ${{ matrix.extra_apt }}
+      # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
+      run: sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3 ${{ matrix.extra_apt || ''}}
 
     - name: Generate extra locales
       # These extra locales will be available for locale.setlocale() calls in tests

From 1a94cc43e22145538570030e909842324c0b04e2 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:11:08 -0700
Subject: [PATCH 2/3] Add libopengl

---
 .circleci/config.yml                      | 2 +-
 .github/workflows/code-checks.yml         | 2 +-
 .github/workflows/docbuild-and-upload.yml | 2 +-
 .github/workflows/unit-tests.yml          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 04efd4806c404..33e87b7565d05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             fi
             python -m pip install --no-build-isolation -ve . --config-settings=setup-args="--werror"
             PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
-            sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3
+            sudo apt-get update && sudo apt-get install -y libegl1 libopengl
             ci/run_tests.sh
   test-linux-musl:
     docker:
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 99b403869b6ab..192938c9dceeb 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -54,7 +54,7 @@ jobs:
 
     - name: Extra installs
       # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
-      run: sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3
+      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl
 
     - name: Run doctests
       run: cd ci && ./code_checks.sh doctests
diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml
index bc3ab50164cc3..205a3eb2f8854 100644
--- a/.github/workflows/docbuild-and-upload.yml
+++ b/.github/workflows/docbuild-and-upload.yml
@@ -48,7 +48,7 @@ jobs:
 
     - name: Extra installs
       # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
-      run: sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3
+      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl
 
     - name: Test website
       run: python -m pytest web/
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index b0c328d822e38..a44364765faeb 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -135,7 +135,7 @@ jobs:
 
     - name: Extra installs
       # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
-      run: sudo apt-get update && sudo apt-get install -y libgl1 libegl1 libdbus-1-3 ${{ matrix.extra_apt || ''}}
+      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl ${{ matrix.extra_apt || ''}}
 
     - name: Generate extra locales
       # These extra locales will be available for locale.setlocale() calls in tests

From a421c62795d7c11137d5ce88b7e5a916dc14330d Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:15:43 -0700
Subject: [PATCH 3/3] Wrong name

---
 .circleci/config.yml                      | 2 +-
 .github/workflows/code-checks.yml         | 2 +-
 .github/workflows/docbuild-and-upload.yml | 2 +-
 .github/workflows/unit-tests.yml          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33e87b7565d05..ebbca94718259 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             fi
             python -m pip install --no-build-isolation -ve . --config-settings=setup-args="--werror"
             PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
-            sudo apt-get update && sudo apt-get install -y libegl1 libopengl
+            sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
             ci/run_tests.sh
   test-linux-musl:
     docker:
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 192938c9dceeb..7e9c056e75131 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -54,7 +54,7 @@ jobs:
 
     - name: Extra installs
       # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
-      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl
+      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
 
     - name: Run doctests
       run: cd ci && ./code_checks.sh doctests
diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml
index 205a3eb2f8854..47b97fa57852a 100644
--- a/.github/workflows/docbuild-and-upload.yml
+++ b/.github/workflows/docbuild-and-upload.yml
@@ -48,7 +48,7 @@ jobs:
 
     - name: Extra installs
       # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
-      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl
+      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
 
     - name: Test website
       run: python -m pytest web/
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index a44364765faeb..a085d0265a1a5 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -135,7 +135,7 @@ jobs:
 
     - name: Extra installs
       # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
-      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl ${{ matrix.extra_apt || ''}}
+      run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0 ${{ matrix.extra_apt || ''}}
 
     - name: Generate extra locales
       # These extra locales will be available for locale.setlocale() calls in tests