From 888cbdcd5a7af6dbda8bb14bd5d961e990494d3b Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Sun, 1 Feb 2026 20:01:10 +1000
Subject: [PATCH 1/2] Revert "Add debug logging for selected mpl tests"

This reverts commit 29bb9ea07d3ce47c347ed258d120ce2ffa4180cd.
---
 .github/workflows/build-ultraplot.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/build-ultraplot.yml b/.github/workflows/build-ultraplot.yml
index 8010fc175..4130688d1 100644
--- a/.github/workflows/build-ultraplot.yml
+++ b/.github/workflows/build-ultraplot.yml
@@ -99,10 +99,6 @@ jobs:
         if: steps.cache-baseline.outputs.cache-hit != 'true' || !env.IS_PR
         run: |
           mkdir -p ultraplot/tests/baseline
-          echo "TEST_MODE=${TEST_MODE}"
-          echo "IS_PR=${IS_PR}"
-          echo "PR_BASE_SHA=${{ github.event.pull_request.base.sha }}"
-          echo "TEST_NODEIDS=${TEST_NODEIDS}"
           # Save PR-selected nodeids for reuse after checkout (if provided)
           if [ "${TEST_MODE}" = "selected" ] && [ -n "${TEST_NODEIDS}" ]; then
             printf "%s\n" ${TEST_NODEIDS} > /tmp/pr_selected_nodeids.txt
@@ -133,7 +129,6 @@ jobs:
               echo "${filtered}"
             }
             FILTERED_NODEIDS="$(filter_nodeids)"
-            echo "FILTERED_NODEIDS_BASE=${FILTERED_NODEIDS}"
             if [ -z "${FILTERED_NODEIDS}" ]; then
               echo "No valid nodeids found on base; skipping baseline generation."
               exit 0
@@ -168,8 +163,6 @@ jobs:
 
           mkdir -p results
           python -c "import ultraplot as plt; plt.config.Configurator()._save_yaml('ultraplot.yml')"
-          echo "TEST_MODE=${TEST_MODE}"
-          echo "TEST_NODEIDS=${TEST_NODEIDS}"
           if [ "${TEST_MODE}" = "selected" ] && [ -s /tmp/pr_selected_nodeids.txt ]; then
             status=0
             filter_nodeids() {
@@ -183,7 +176,6 @@ jobs:
               echo "${filtered}"
             }
             FILTERED_NODEIDS="$(filter_nodeids)"
-            echo "FILTERED_NODEIDS_PR=${FILTERED_NODEIDS}"
             if [ -z "${FILTERED_NODEIDS}" ]; then
               echo "No valid nodeids found on PR branch; skipping image comparison."
               exit 0

From 9bc9d1928fd5f6e0b610667a397caf675ec0b548 Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Sun, 1 Feb 2026 20:01:30 +1000
Subject: [PATCH 2/2] Fix leftover merge markers in test_config

---
 ultraplot/tests/test_config.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ultraplot/tests/test_config.py b/ultraplot/tests/test_config.py
index 930f8cf14..47f5018a4 100644
--- a/ultraplot/tests/test_config.py
+++ b/ultraplot/tests/test_config.py
@@ -213,5 +213,3 @@ def _reader():
     observed = [results.get() for _ in range(results.qsize())]
     assert observed, "No rcParams observations were recorded."
     assert all(value in allowed for value in observed)
-=======
->>>>>>> 05e1ec4a (Add threaded rc cycle consistency test)