From ade904e1d6e596874f54ae6cc0cb522296983edc Mon Sep 17 00:00:00 2001 From: Nathaniel Saul Date: Mon, 10 Sep 2018 16:00:06 -0700 Subject: [PATCH] move version location to code instead of setup --- ripser/__init__.py | 4 +--- ripser/_version.py | 1 + setup.py | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 ripser/_version.py diff --git a/ripser/__init__.py b/ripser/__init__.py index 34b09fd..df3fdd1 100644 --- a/ripser/__init__.py +++ b/ripser/__init__.py @@ -1,5 +1,3 @@ from .ripser import * -# Enable access to version number -import pkg_resources -__version__ = pkg_resources.get_distribution('ripser').version +from ._version import __version__ diff --git a/ripser/_version.py b/ripser/_version.py new file mode 100644 index 0000000..f2b3589 --- /dev/null +++ b/ripser/_version.py @@ -0,0 +1 @@ +__version__ = "0.3.0" \ No newline at end of file diff --git a/setup.py b/setup.py index 4d67668..a633b53 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,19 @@ sys.exit(1) +import re +VERSIONFILE="persim/_version.py" +verstrline = open(VERSIONFILE, "rt").read() +VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]" +mo = re.search(VSRE, verstrline, re.M) +if mo: + verstr = mo.group(1) +else: + raise RuntimeError("Unable to find version string in %s." % (VERSIONFILE,)) + + + + with open('README.md') as f: long_description = f.read() @@ -37,7 +50,7 @@ def run(self): setup(name="ripser", - version='0.3.0', + version=verstr, description="A Lean Persistent Homology Library for Python", long_description=long_description, long_description_content_type="text/markdown",