Merge pull request matplotlib#23355 from matplotlib/revert-23095-osx-tk-xfail

Revert "Try to unbreak CI by xfailing OSX Tk tests"

Author: tacaswell

lib/matplotlib/tests/test_backend_tk.py

@@ -37,10 +37,6 @@ def _isolated_tk_test(success_count, func=None):
         sys.platform == "linux" and not _c_internal_utils.display_is_valid(),
         reason="$DISPLAY and $WAYLAND_DISPLAY are unset"
     )
-    @pytest.mark.xfail(  # GitHub issue #23094
-        sys.platform == 'darwin',
-        reason="Tk version mismatch on OSX CI"
-    )
     @functools.wraps(func)
     def test_func():
         # even if the package exists, may not actually be importable this can

lib/matplotlib/tests/test_backends_interactive.py

@@ -59,9 +59,6 @@ def _get_testable_interactive_backends():
         elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin':
             # ignore on OSX because that's currently broken (github #16849)
             marks.append(pytest.mark.xfail(reason='github #16849'))
-        elif env["MPLBACKEND"] == "tkagg" and sys.platform == 'darwin':
-            marks.append(  # GitHub issue #23094
-                pytest.mark.xfail(reason="Tk version mismatch on OSX CI"))
         envs.append(
             pytest.param(
                 {**env, 'BACKEND_DEPS': ','.join(deps)},
@@ -236,9 +233,6 @@ def _test_thread_impl():
                 reason='PyPy does not support Tkinter threading: '
                        'https://foss.heptapod.net/pypy/pypy/-/issues/1929',
                 strict=True))
-    elif backend == "tkagg" and sys.platform == "darwin":
-        param.marks.append(  # GitHub issue #23094
-            pytest.mark.xfail("Tk version mismatch on OSX CI"))
 
 
 @pytest.mark.parametrize("env", _thread_safe_backends)
@@ -516,10 +510,6 @@ def _test_number_of_draws_script():
     elif backend == "wx":
         param.marks.append(
             pytest.mark.skip("wx does not support blitting"))
-    elif backend == "tkagg" and sys.platform == "darwin":
-        param.marks.append(  # GitHub issue #23094
-            pytest.mark.xfail("Tk version mismatch on OSX CI")
-        )
 
 
 @pytest.mark.parametrize("env", _blit_backends)