From: whitequark <whitequark@whitequark.org>
Date: Tue, 30 Jun 2020 22:08:59 +0000 (+0000)
Subject: Don't use pkg_resources.
X-Git-Tag: 24jan2021_ls180~75
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8dacbbb2b25c145fe8806292acf3f340d7d6eb3d;p=nmigen.git

Don't use pkg_resources.

This package is deprecated and introduces a massive amount of startup
latency. On my machine with 264 installed Python packages, it reduces
the time required to `import nmigen` from ~100ms to ~200ms.
---

diff --git a/nmigen/__init__.py b/nmigen/__init__.py
index 5646c6d..78a8dec 100644
--- a/nmigen/__init__.py
+++ b/nmigen/__init__.py
@@ -1,8 +1,8 @@
-import pkg_resources
 try:
-    __version__ = pkg_resources.get_distribution(__name__).version
-except pkg_resources.DistributionNotFound:
-    pass
+    from importlib import metadata as importlib_metadata # py3.8+ stdlib
+except ImportError:
+    import importlib_metadata # py3.7- shim
+__version__ = importlib_metadata.version(__package__)
 
 
 from .hdl import *
diff --git a/setup.py b/setup.py
index fe6bd49..4d436d8 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ setup(
     python_requires="~=3.6",
     setup_requires=["setuptools", "setuptools_scm"],
     install_requires=[
-        "importlib_metadata; python_version<'3.8'",  # for nmigen._yosys
+        "importlib_metadata; python_version<'3.8'",  # for __version__ and nmigen._yosys
         "importlib_resources; python_version<'3.9'", # for nmigen._yosys
         "pyvcd~=0.2.0", # for nmigen.pysim
         "Jinja2~=2.11", # for nmigen.build