Merge branch 'develop'

docs/conf.py

@@ -22,6 +22,7 @@
 # sys.path.insert(0, os.path.abspath('.'))
 
 import os
+import re
 import sys
 sys.path.insert(0, os.path.abspath('../'))
 
@@ -39,8 +40,9 @@ def __getattr__(cls, name):
 
 
 def get_version():
-    version_file = open('../VERSION')
-    return version_file.read().strip()
+    with open('../pyutils_sh/version.py') as f:
+        p = re.compile(r"'.*'$")
+        return re.findall(p, f.read().strip())[0]
 
 # -- General configuration ------------------------------------------------
 

pyutils_sh/__init__.py

@@ -49,3 +49,4 @@
 import pyutils_sh.stats
 import pyutils_sh.survey
 import pyutils_sh.utils
+from .version import __version__

pyutils_sh/version.py

@@ -0,0 +1 @@
+__version__ = '1.5.1'

setup.py

@@ -1,34 +1,36 @@
 from setuptools import setup, find_packages
-
-
-def get_version():
-    version_file = open('VERSION')
-    return version_file.read().strip()
+from distutils.util import convert_path
 
 
 def readme():
-    with open('README.rst') as f:
+    with open("README.rst") as f:
         return f.read()
 
 
-setup(name='pyutils_sh',
-      version=get_version(),
-      description='Assortment of Python utilities for my personal projects',
-      long_description=readme(),
-      url='https://github.com/sho-87/pyutils_sh',
-      author='Simon Ho',
-      author_email='simonho213@gmail.com',
-      license='MIT',
-      packages=find_packages(),
-      python_requires='>=3',
-      install_requires=['numpy', 'pandas', 'matplotlib'],
-      classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Science/Research',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3',
-        'Topic :: Scientific/Engineering',
-      ],
-      keywords='python utilities survey exam gaze spss data research statistics',
-      zip_safe=True)
+meta = {}
+with open(convert_path("pyutils_sh/version.py")) as f:
+    exec(f.read(), meta)
+
+setup(
+    name="pyutils_sh",
+    version=meta["__version__"],
+    description="Assortment of Python utilities for my personal projects",
+    long_description=readme(),
+    url="https://github.com/sho-87/pyutils_sh",
+    author="Simon Ho",
+    author_email="simonho213@gmail.com",
+    license="MIT",
+    packages=find_packages(),
+    python_requires=">=3",
+    install_requires=["numpy", "pandas", "matplotlib"],
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Science/Research",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
+        "Topic :: Scientific/Engineering",
+    ],
+    keywords="python utilities survey exam gaze spss data research statistics",
+    zip_safe=True,
+)