Merge remote-tracking branch 'upstream/master' into always_compare

Author: Cadair

pyproject.toml

@@ -0,0 +1,5 @@
+[build-system]
+requires = ["setuptools>=30.3.0",
+            "setuptools_scm",
+            "wheel"]
+build-backend = 'setuptools.build_meta'

pytest_mpl/plugin.py

@@ -443,7 +443,7 @@ def compare_image_to_baseline(self, item, fig, result_dir):
                     "Generated Image: \n\t"
                     f"{test_image}")
 
-        # distutils may put the baseline images in non-accessible places,
+        # setuptools may put the baseline images in non-accessible places,
         # copy to our tmpdir to be sure to keep them in case of failure
         baseline_image = (result_dir / "baseline.png").absolute()
         shutil.copyfile(baseline_image_ref, baseline_image)

setup.py

@@ -1,15 +1,5 @@
 #!/usr/bin/env python
 
-import sys
-from distutils.version import LooseVersion
-
-try:
-    import setuptools
-    assert LooseVersion(setuptools.__version__) >= LooseVersion('30.3')
-except (ImportError, AssertionError):
-    sys.stderr.write("ERROR: setuptools 30.3 or later is required\n")
-    sys.exit(1)
-
 from setuptools import setup
 
 setup(use_scm_version=True)