Merge pull request #26136 from meeseeksmachine/auto-backport-of-pr-26135-on-v3.7.x

QuLogic · web-flow · commit 0df4ec045e8f · 2023-06-21T17:58:14.000-04:00
Backport PR #26135 on branch v3.7.x (TST: xfail Tk test on Python 3.9 Azure macOS also)
diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py
@@ -40,7 +40,7 @@ def _isolated_tk_test(success_count, func=None):
     )
     @pytest.mark.xfail(  # https://github.com/actions/setup-python/issues/649
         'TF_BUILD' in os.environ and sys.platform == 'darwin' and
-        sys.version_info[:2] == (3, 10),
+        sys.version_info[:2] < (3, 11),
         reason='Tk version mismatch on Azure macOS CI'
     )
     @functools.wraps(func)
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -64,7 +64,7 @@ def _get_testable_interactive_backends():
             # ignore on OSX because that's currently broken (github #16849)
             marks.append(pytest.mark.xfail(reason='github #16849'))
         elif (env['MPLBACKEND'] == 'tkagg' and 'TF_BUILD' in os.environ and
-              sys.platform == 'darwin' and sys.version_info[:2] == (3, 10)):
+              sys.platform == 'darwin' and sys.version_info[:2] < (3, 11)):
             marks.append(  # https://github.com/actions/setup-python/issues/649
                 pytest.mark.xfail(reason='Tk version mismatch on Azure macOS CI'))
         envs.append(
@@ -272,7 +272,7 @@ def _test_thread_impl():
                        'https://foss.heptapod.net/pypy/pypy/-/issues/1929',
                 strict=True))
     elif (backend == 'tkagg' and 'TF_BUILD' in os.environ and
-          sys.platform == 'darwin' and sys.version_info[:2] == (3, 10)):
+          sys.platform == 'darwin' and sys.version_info[:2] < (3, 11)):
         param.marks.append(  # https://github.com/actions/setup-python/issues/649
             pytest.mark.xfail('Tk version mismatch on Azure macOS CI'))
 
@@ -553,7 +553,7 @@ def _test_number_of_draws_script():
         param.marks.append(
             pytest.mark.skip("wx does not support blitting"))
     elif (backend == 'tkagg' and 'TF_BUILD' in os.environ and
-          sys.platform == 'darwin' and sys.version_info[:2] == (3, 10)):
+          sys.platform == 'darwin' and sys.version_info[:2] < (3, 11)):
         param.marks.append(  # https://github.com/actions/setup-python/issues/649
             pytest.mark.xfail('Tk version mismatch on Azure macOS CI')
         )

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ def _isolated_tk_test(success_count, func=None):`
`40`	`40`	`)`
`41`	`41`	`@pytest.mark.xfail( # https://github.com/actions/setup-python/issues/649`
`42`	`42`	`'TF_BUILD' in os.environ and sys.platform == 'darwin' and`
`43`		`- sys.version_info[:2] == (3, 10),`
	`43`	`+ sys.version_info[:2] < (3, 11),`
`44`	`44`	`reason='Tk version mismatch on Azure macOS CI'`
`45`	`45`	`)`
`46`	`46`	`@functools.wraps(func)`