From 73d2df4817d94919bb0c1dba248beff3c4f8919f Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Fri, 31 Jan 2020 15:01:20 +0100
Subject: [PATCH] Bugfix - when determining version
---
MANIFEST.in | 1 +
setup.py | 20 +++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 MANIFEST.in
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..a76e662
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include RELEASE-VERSION
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2e21d20..ea2cb47 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+import os
+import sys
from setuptools import setup, find_packages
import subprocess
@@ -32,9 +34,25 @@ def version_number_from_git(tag_prefix='release/', sha_length=10, version_format
return version_string
+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_walberla',
- version=version_number_from_git(),
+ version=version,
description='Code Generation for Lattice Boltzmann Methods in the walberla framework',
+ long_description=readme(),
author='Martin Bauer',
license='AGPLv3',
author_email='martin.bauer@fau.de',
--
GitLab