From a6308516967266d2b2d0bc91dc28f2d4f5129e1f Mon Sep 17 00:00:00 2001 From: Daniel Seiller Date: Sat, 28 Sep 2019 15:43:48 +0200 Subject: [PATCH] misc(setup.py): Pull version info from git, unify scripts (one script for GUI and CLI) --- setup.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index af29aac..2269e28 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ with open("README.md", "r") as fh: setup( name="ed_lrr_gui", - version="0.1.0", + version_format='{tag}.dev{commitcount}+{gitsha}', author="Daniel Seiller", author_email="earthnuker@gmail.com", description="Elite: Dangerous long range route plotter", @@ -22,17 +22,15 @@ setup( "_ed_lrr", path="rust/Cargo.toml", binding=Binding.PyO3, - strip=Strip.All, + strip=Strip.No, native=True, ) ], packages=find_packages(), entry_points={ "console_scripts": [ - "ed_lrr_gui_console = ed_lrr_gui.gui.__main__:main", "ed_lrr = ed_lrr_gui.__main__:main", ], - "gui_scripts": ["ed_lrr_gui = ed_lrr_gui.gui.__main__:main"], }, install_requires=[ "appdirs", @@ -41,8 +39,11 @@ setup( "python-dateutil", "pyperclip", "click", + "tqdm", "PyQt5", - "click-default-group" + "click-default-group", + "profig", + "colorama" ], setup_requires=[ "setuptools", @@ -50,6 +51,7 @@ setup( "wheel", "pyinstaller", "pytest-runner", + "setuptools-git-version" ], tests_require=["pytest", "pytest-pep8", "pytest-cov"], extras_require={