GlasgowEmbedded · Sep 20, 2019 · Sep 20, 2019
Showing with 4 additions and 3 deletions.

+1 −1 software/glasgow/__init__.py

+2 −2 software/glasgow/cli.py

+1 −0 software/setup.py
diff --git a/software/glasgow/__init__.py b/software/glasgow/__init__.py
@@ -2,7 +2,7 @@
 try:
     __version__ = pkg_resources.get_distribution(__name__).version
 except pkg_resources.DistributionNotFound:
-    pass
+    __version__ = 'unknown'
 
 import logging
 

diff --git a/software/glasgow/cli.py b/software/glasgow/cli.py
@@ -13,7 +13,7 @@
 from fx2 import FX2Config
 from fx2.format import input_data, diff_data
 
-from ._version import get_versions
+from . import __version__
 from .support.logging import *
 from .support.asignal import *
 from .support.pyrepl import *
@@ -63,7 +63,7 @@ def create_argparser():
 
     version = "Glasgow version {version} (Python {python_version})" \
         .format(python_version=".".join(str(n) for n in sys.version_info[:3]),
-                **get_versions())
+                version=__version__)
 
     parser.add_argument(
         "-V", "--version", action="version", version=version,

diff --git a/software/setup.py b/software/setup.py
@@ -70,6 +70,7 @@ def local_scheme(version):
     license="0-clause BSD License",
     setup_requires=["setuptools_scm"],
     install_requires=[
+        "setuptools",
         "nmigen",
         "fx2>=0.7",
         "libusb1>=1.6.6",