From b4e7e775ba2f2533b268ce8a28115e1830d64a61 Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Tue, 17 Jul 2018 21:35:34 +0200
Subject: [PATCH] better handle import and move version to its own file

---
 dotdrop/__init__.py |  2 --
 dotdrop/dotdrop.py  | 24 +++++++-----------------
 dotdrop/version.py  |  6 ++++++
 setup.py            |  5 ++++-
 4 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 dotdrop/version.py

diff --git a/dotdrop/__init__.py b/dotdrop/__init__.py
index 136b2e0..e267a8d 100644
--- a/dotdrop/__init__.py
+++ b/dotdrop/__init__.py
@@ -5,8 +5,6 @@ Copyright (c) 2017, deadc0de6
 
 import sys
 
-__version__ = '0.17.1'
-
 
 def main():
     import dotdrop.dotdrop
diff --git a/dotdrop/dotdrop.py b/dotdrop/dotdrop.py
index dd1c9bd..c605db0 100644
--- a/dotdrop/dotdrop.py
+++ b/dotdrop/dotdrop.py
@@ -11,23 +11,13 @@ import subprocess
 from docopt import docopt
 
 # local imports
-try:
-    from . import __version__ as VERSION
-except ImportError:
-    errmsg = '''
-Dotdrop has been updated to be included in pypi and
-the way it needs to be called has slightly changed.
-
-See https://github.com/deadc0de6/dotdrop/wiki/migrate-from-submodule
-'''
-    print(errmsg)
-    sys.exit(1)
-from .logger import Logger
-from .templategen import Templategen
-from .installer import Installer
-from .dotfile import Dotfile
-from .config import Cfg
-from .utils import *
+from dotdrop.version import __version__ as VERSION
+from dotdrop.logger import Logger
+from dotdrop.templategen import Templategen
+from dotdrop.installer import Installer
+from dotdrop.dotfile import Dotfile
+from dotdrop.config import Cfg
+from dotdrop.utils import *
 
 CUR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 LOG = Logger()
diff --git a/dotdrop/version.py b/dotdrop/version.py
new file mode 100644
index 0000000..944de7f
--- /dev/null
+++ b/dotdrop/version.py
@@ -0,0 +1,6 @@
+"""
+author: deadc0de6 (https://github.com/deadc0de6)
+Copyright (c) 2018, deadc0de6
+"""
+
+__version__ = '0.17.1'
diff --git a/setup.py b/setup.py
index 948aa51..73e80be 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,10 @@ except ImportError:
     print('\n[WARNING] pypandoc not found, could not convert \"{}\"\n'.format(readme))
     read_readme = lambda f: open(f, 'r').read()
 
-VERSION = dotdrop.__version__
+try:
+    VERSION = open('dotdrop/version.py', "rt").read()
+except:
+    raise('cannot find version module')
 REQUIRES_PYTHON = '>=3'
 
 setup(