Merge pull request #59 from mr-c/version_importlib_metadata_dep

Only require importlib_metadata for Python<3.8

bdbag/__init__.py

@@ -22,7 +22,10 @@
 import shutil
 from datetime import datetime
 from distutils.util import strtobool
-from importlib_metadata import distribution, PackageNotFoundError
+if sys.version_info >= (3,8):
+    from importlib.metadata import distribution, PackageNotFoundError
+else:
+    from importlib_metadata import distribution, PackageNotFoundError
 
 logger = logging.getLogger(__name__)
 

bdbag/bdbag_config.py

@@ -14,12 +14,16 @@
 # limitations under the License.
 #
 import os
+import sys
 import errno
 import logging
 import json
 from collections import OrderedDict
 from packaging.version import parse as parse_version
-from importlib_metadata import distribution, PackageNotFoundError
+if sys.version_info >= (3,8):
+    from importlib.metadata import distribution, PackageNotFoundError
+else:
+    from importlib_metadata import distribution, PackageNotFoundError
 from bdbag import get_typed_exception, safe_move, \
     DEFAULT_CONFIG_PATH, BAG_PROFILE_TAG, BDBAG_PROFILE_ID, VERSION, __version__
 from bdbag.fetch import Megabyte

setup.py

@@ -63,7 +63,7 @@
                       'tzlocal',
                       'certifi',
                       'packaging',
-                      'importlib-metadata',
+                      'importlib_metadata;python_version<"3.8"',
                       'requests>=2.7.0',
                       'setuptools_scm<6.0',  # for bagit which does not properly include it in install_requires
                       'bagit==1.8.1',