change distutils import order

.github/workflows/python-package.yml

@@ -20,6 +20,9 @@ jobs:
                 python-version: [3.6, 3.7, 3.8]
                 astropy-version: ['==4.0.1.post1', '<4.1', '<5.0']
 
+        env:
+            SETUPTOOLS_USE_DISTUTILS: stdlib
+
         steps:
             - name: Checkout code
               uses: actions/checkout@v2

py/desiutil/test/test_setup.py

@@ -8,8 +8,10 @@
 import unittest
 from unittest.mock import call, patch
 from tempfile import mkdtemp
-from distutils import log
+from packaging import version
+from setuptools import __version__ as setuptools_version
 from setuptools import sandbox
+from distutils import log
 from ..setup import find_version_directory, get_version, update_version
 from .. import __version__ as desiutil_version
 
@@ -26,6 +28,7 @@ def setUpClass(cls):
         if hasattr(sandbox, 'hide_setuptools'):
             sandbox.hide_setuptools = lambda: None
         cls.old_threshold = log.set_threshold(log.WARN)
+        cls.distutils_log = 'distutils.log.Log._log'
 
     @classmethod
     def tearDownClass(cls):
@@ -85,13 +88,13 @@ def test_version(self):
             i.write(init)
         os.chdir(package_dir)
         v_file = os.path.join(package_dir, self.fake_name, '_version.py')
-        with patch('distutils.log.Log._log') as mock_log:
+        with patch(self.distutils_log) as mock_log:
             self.run_setup('setup.py', ['version'])
             self.assertTrue(os.path.exists(v_file))
             self.assertListEqual(mock_log.mock_calls,
                                  [call(2, 'running %s', ('version',)),
                                   call(2, 'Version is now 0.0.1.dev0.', ())])
-        with patch('distutils.log.Log._log') as mock_log:
+        with patch(self.distutils_log) as mock_log:
             self.run_setup('setup.py', ['version', '--tag', '1.2.3'])
             with open(v_file) as v:
                 data = v.read()