Move version string into a python script

HexDecimal · HexDecimal · commit f8ecfea97fee · 2017-02-10T20:25:29.000-08:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -60,12 +60,11 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-from tcod import __version__
-version = '.'.join(__version__)
 # The full version, including alpha/beta/rc tags.
-with open('../tcod/version.txt', 'r') as f:
-    release = f.read()
+from tcod import __version__ as release
+# The short X.Y version.
+import re
+version = re.match(r'([0-9]+\.[0-9]+).*?', release).group()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -8,13 +8,12 @@
 
 from setuptools import setup, Command
 
-with open('tcod/version.txt', 'r') as f:
-    version = f.read()
+exec(open('tcod/version.py').read()) # get __version__
 
 def get_package_data():
     '''get data files which will be included in the main tcod/ directory'''
     BITSIZE, LINKAGE = platform.architecture()
-    files = ['version.txt',
+    files = [
              'lib/LIBTCOD-CREDITS.txt',
              'lib/LIBTCOD-LICENSE.txt',
              'lib/README-SDL.txt']
@@ -32,7 +31,7 @@ def get_package_data():
 
 setup(
     name='libtcod-cffi',
-    version=version,
+    version=__version__,
     author='Kyle Stewart',
     author_email='4B796C65+tcod@gmail.com',
     description='A Python cffi port of libtcod.',
diff --git a/tcod/__init__.py b/tcod/__init__.py
@@ -17,15 +17,7 @@
 """
 from __future__ import absolute_import as _
 
-import os as _os
-
-import re as _re
-
 from tcod.libtcodpy import *
 from tcod.tcod import *
 from tcod import path
-
-with open(_os.path.join(__path__[0], 'version.txt'), 'r') as _f:
-    # exclude the git commit number (PEP 396)
-    __version__ = _re.match(r'([0-9]+)\.([0-9]+).*?', _f.read()).groups()
-    assert __version__, 'version.txt parse error'
+from tcod.version import __version__
diff --git a/tcod/version.py b/tcod/version.py
@@ -0,0 +1 @@
+__version__ = '2.0a5'
diff --git a/tcod/version.txt b/tcod/version.txt
