From f62be359667ee9bcc8413d0f04a58100126b72b4 Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Mon, 30 Sep 2019 23:40:23 -0700 Subject: [PATCH] use VERSION file to avoid importing gridlock before its installed --- MANIFEST.in | 1 + gridlock/VERSION | 1 + gridlock/__init__.py | 6 +++++- setup.py | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 gridlock/VERSION diff --git a/MANIFEST.in b/MANIFEST.in index c28ab72..964c8e4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,3 @@ include README.md include LICENSE.md +include gridlock/VERSION diff --git a/gridlock/VERSION b/gridlock/VERSION new file mode 100644 index 0000000..be58634 --- /dev/null +++ b/gridlock/VERSION @@ -0,0 +1 @@ +0.3 diff --git a/gridlock/__init__.py b/gridlock/__init__.py index b1b7f37..5d681da 100644 --- a/gridlock/__init__.py +++ b/gridlock/__init__.py @@ -16,10 +16,14 @@ Dependencies: - skimage [Grid.visualize_isosurface()] """ +import pathlib + from .error import GridError from .direction import Direction from .grid import Grid __author__ = 'Jan Petykiewicz' -version = '0.3' +with open(pathlib.Path(__file__).parent / 'VERSION', 'r') as f: + __version__ = f.read().strip() +version = __version__ diff --git a/setup.py b/setup.py index 56775aa..6f89c44 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,15 @@ #!/usr/bin/env python3 from setuptools import setup, find_packages -import gridlock with open('README.md', 'r') as f: long_description = f.read() +with open('gridlock/VERSION', 'r') as f: + version = f.read().strip() + setup(name='gridlock', - version=gridlock.version, + version=version, description='Coupled gridding library', long_description=long_description, long_description_content_type='text/markdown', @@ -15,6 +17,9 @@ setup(name='gridlock', author_email='anewusername@gmail.com', url='https://mpxd.net/code/jan/gridlock', packages=find_packages(), + package_data={ + 'gridlock': ['VERSION'] + }, install_requires=[ 'numpy', 'float_raster',