From cd31090f22e5f34f2ab5b62d6c120174e7aca7cd Mon Sep 17 00:00:00 2001 From: AD Date: Fri, 14 Dec 2018 09:49:51 +0100 Subject: [PATCH] Added Version File, Manifest.in; updated setup.py --- MANIFEST.in | 4 ++++ VERSION | 1 + cx_setup.py | 7 ++++++- setup.py | 11 +++++++++-- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 MANIFEST.in create mode 100644 VERSION diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..591ca9c --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include README.md +include VERSION +include tagmaps/classes/* +include tagmaps/tests/* \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..425d81a --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.9.31 \ No newline at end of file diff --git a/cx_setup.py b/cx_setup.py index 05ae4ab..6d53d7e 100644 --- a/cx_setup.py +++ b/cx_setup.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import sys from cx_Freeze import setup, Executable @@ -7,6 +9,9 @@ os.environ['TCL_LIBRARY'] = os.path.join(PYTHON_INSTALL_DIR, 'tcl', 'tcl8.6') os.environ['TK_LIBRARY'] = os.path.join(PYTHON_INSTALL_DIR, 'tcl', 'tk8.6') +with open('VERSION') as version_file: + version_var = version_file.read().strip() + # Dependencies are automatically detected, but it might need fine tuning. #build_exe_options = {"packages": ["os"], "excludes": []} includes_mod = ["tkinter.filedialog", @@ -46,7 +51,7 @@ ] setup( name = "tagmaps", - version = "0.9.3", + version = version_var, description = "Tag Clustering for Tag Maps", options = {'build_exe': {'includes': includes_mod, 'include_files': include_folders_files,'packages':packages_mod,'excludes':excludes_mod}}, executables = executables) \ No newline at end of file diff --git a/setup.py b/setup.py index 0bb5f4c..60417e0 100644 --- a/setup.py +++ b/setup.py @@ -5,11 +5,13 @@ with open('README.md') as f: long_description = f.read() - + +with open('VERSION') as version_file: + version_var = version_file.read().strip() ## setuptools dev setup( name = "tagmaps", - version = "0.9.3", + version = version_var, description = "Tag Clustering for Tag Maps", long_description=long_description, long_description_content_type='text/markdown', @@ -18,7 +20,12 @@ url='https://gitlab.vgiscience.de/ad/TagCluster', license='GNU GPLv3 or any higher', packages=['tagmaps'], + include_package_data=True, install_requires=[ + 'shapely', + 'emoji', + 'tkinter', + 'hdbscan' ], entry_points={ 'console_scripts': [