Merge pull request #58 from mcmtroffaes/feature/fix-main

Fix __main__ imports.

2 files changed, 12 insertions, 2 deletions

diff --git a/setuptools_scm/__main__.py b/setuptools_scm/__main__.py
index 3f772ab..b495aeb 100644
--- a/setuptools_scm/__main__.py
+++ b/setuptools_scm/__main__.py
@@ -1,7 +1,8 @@
 from __future__ import print_function
 import sys
-from setuptools_scm import get_version, find_files, \
-    _warn_if_setuptools_outdated
+from setuptools_scm import get_version
+from setuptools_scm.integration import find_files
+from setuptools_scm.version import _warn_if_setuptools_outdated
 
 if __name__ == '__main__':
     _warn_if_setuptools_outdated()
diff --git a/testing/test_main.py b/testing/test_main.py
new file mode 100644
index 0000000..a7cbd75
--- /dev/null
+++ b/testing/test_main.py
@@ -0,0 +1,9 @@
+import os.path
+
+
+def test_main():
+    mainfile = os.path.join(
+        os.path.dirname(__file__), "..", "setuptools_scm", "__main__.py")
+    with open(mainfile) as f:
+        code = compile(f.read(), "__main__.py", 'exec')
+        exec(code)