mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-07 12:48:32 +00:00
better handle import and move version to its own file
This commit is contained in:
@@ -5,8 +5,6 @@ Copyright (c) 2017, deadc0de6
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
__version__ = '0.17.1'
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
import dotdrop.dotdrop
|
import dotdrop.dotdrop
|
||||||
|
|||||||
@@ -11,23 +11,13 @@ import subprocess
|
|||||||
from docopt import docopt
|
from docopt import docopt
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
try:
|
from dotdrop.version import __version__ as VERSION
|
||||||
from . import __version__ as VERSION
|
from dotdrop.logger import Logger
|
||||||
except ImportError:
|
from dotdrop.templategen import Templategen
|
||||||
errmsg = '''
|
from dotdrop.installer import Installer
|
||||||
Dotdrop has been updated to be included in pypi and
|
from dotdrop.dotfile import Dotfile
|
||||||
the way it needs to be called has slightly changed.
|
from dotdrop.config import Cfg
|
||||||
|
from dotdrop.utils import *
|
||||||
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 *
|
|
||||||
|
|
||||||
CUR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
CUR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
LOG = Logger()
|
LOG = Logger()
|
||||||
|
|||||||
6
dotdrop/version.py
Normal file
6
dotdrop/version.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
"""
|
||||||
|
author: deadc0de6 (https://github.com/deadc0de6)
|
||||||
|
Copyright (c) 2018, deadc0de6
|
||||||
|
"""
|
||||||
|
|
||||||
|
__version__ = '0.17.1'
|
||||||
5
setup.py
5
setup.py
@@ -13,7 +13,10 @@ except ImportError:
|
|||||||
print('\n[WARNING] pypandoc not found, could not convert \"{}\"\n'.format(readme))
|
print('\n[WARNING] pypandoc not found, could not convert \"{}\"\n'.format(readme))
|
||||||
read_readme = lambda f: open(f, 'r').read()
|
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'
|
REQUIRES_PYTHON = '>=3'
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
|
|||||||
Reference in New Issue
Block a user