Merge pull request astropy#3184 from bsipocz/MAINT_reorder_filters

MAINT: temporary measure to reorder filters

setup.cfg

@@ -46,11 +46,12 @@ remote_data_strict = true
 addopts = --color=yes --doctest-rst --doctest-continue-on-failure
 filterwarnings =
     error
+# Remove along with astropy-helpers, once we switch to a new versioning scheme
+    ignore:Use setlocale:DeprecationWarning
+    ignore: 'locale.getdefaultlocale' is deprecated and slated for removal:DeprecationWarning
 #   These are temporary measures, all of these should be fixed:
 #   -----------------------------------------------------------
     ignore:distutils Version classes are deprecated:DeprecationWarning
-# Remove along with astropy-helpers, once we switch to a new versioning scheme
-    ignore:Use setlocale:DeprecationWarning
 # Upstream issues in many packages, not clear whether we can do anything about these in astroquery
     ignore:unclosed <socket.socket:ResourceWarning
     ignore:unclosed <ssl.SSLSocket:ResourceWarning
@@ -85,7 +86,6 @@ filterwarnings =
 # SHA module deprecation/defunct
     ignore:The upstream SHA API has been changed:UserWarning
 
-
 markers =
     bigdata: marks tests that are expected to trigger a large download (deselect with '-m "not bigdata"')
     noautofixt: disabling fixture autouse