From b223a5d99e1a2072d5dec9e498e9ae6d63692f76 Mon Sep 17 00:00:00 2001 From: Martin Bauer <martin.bauer@fau.de> Date: Fri, 31 Jan 2020 14:50:12 +0100 Subject: [PATCH] Bugfix - determine version number from file when no git repo is available --- MANIFEST.in | 1 + setup.py | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index ff301d68..f32d4f3d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,3 @@ include README.md include COPYING.txt +include RELEASE-VERSION diff --git a/setup.py b/setup.py index 2c67c669..555215a5 100644 --- a/setup.py +++ b/setup.py @@ -45,8 +45,24 @@ class SimpleTestRunner(distutils.cmd.Command): self._run_tests_in_module(test) +def readme(): + with open('README.md') as f: + return f.read() + +try: + sys.path.insert(0, os.path.abspath('doc')) + from version_from_git import version_number_from_git + + version = version_number_from_git() + with open("RELEASE-VERSION", "w") as f: + f.write(version) +except ImportError: + version = open('RELEASE-VERSION', 'r').read() + + setup(name='lbmpy', - version=version_number_from_git(), + version=version, + long_description=readme(), description='Code Generation for Lattice Boltzmann Methods', author='Martin Bauer', license='AGPLv3', -- GitLab