TST: remove workarounds now that contourpy has unpinned nightlies (as…

…tropy#16122)

* TST: remove workarounds now that contourpy has unpinned nightlies

* TST: Recombine mpldev into devdeps CI job while retaining mpldev for image tests.

---------

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

.github/workflows/ci_workflows.yml

@@ -109,8 +109,3 @@ jobs:
         - name: (Allowed Failure) Python 3.12 with remote data and dev version of key dependencies
           linux: py312-test-devdeps
           posargs: --remote-data=any --verbose
-
-        # https://github.com/matplotlib/matplotlib/issues/26847
-        - name: (Allowed Failure) Python 3.12 with dev version of matplotlib
-          linux: py312-test-mpldev
-          posargs: --verbose

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{310,311,312,dev}-test{,-recdeps,-alldeps,-oldestdeps,-devdeps,-mpldev,-devinfra,-predeps,-numpy123,-numpy124,-numpy125,-mpl334}{,-cov}{,-clocale}{,-fitsio}{,-noscipy}
+    py{310,311,312,dev}-test{,-recdeps,-alldeps,-oldestdeps,-devdeps,-devinfra,-predeps,-numpy123,-numpy124,-numpy125,-mpl334}{,-cov}{,-clocale}{,-fitsio}{,-noscipy}
     # Only these two exact tox environments have corresponding figure hash files.
     py310-test-image-mpl334-cov
     py310-test-image-mpldev-cov
@@ -85,10 +85,9 @@ deps =
     # or nightly wheel of key dependencies.
     devdeps-!noscipy: scipy>=0.0.dev0
     devdeps: numpy>=0.0.dev0
+    devdeps-!noscipy: matplotlib>=0.0.dev0
     devdeps: pyerfa>=0.0.dev0
 
-    # We separate out mpldev from devdeps because it pulls in contourpy
-    # that pins numpy<2 (https://github.com/matplotlib/matplotlib/issues/26847)
     mpldev: matplotlib>=0.0.dev0
 
     # Latest developer version of infrastructure packages.