Late import distro to fix calling salt/version.py from setup.py

saltstack · May 14, 2020 · 9673de4 · 9673de4
1 parent 48e7e20
commit 9673de4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/salt/version.py b/salt/version.py
@@ -8,8 +8,6 @@
 import re
 import sys
 
-from distro import linux_distribution
-
 MAX_SIZE = sys.maxsize
 VERSION_LIMIT = MAX_SIZE - 200
 
@@ -668,11 +666,14 @@ def system_information():
     """
     Report system versions.
     """
+    # Late import so that when getting called from setup.py does not break
+    from distro import linux_distribution
 
     def system_version():
         """
         Return host system version.
         """
+
         lin_ver = linux_distribution()
         mac_ver = platform.mac_ver()
         win_ver = platform.win32_ver()