diff --git a/VERSION b/VERSION deleted file mode 100644 index a918a2aa..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.6.0 diff --git a/docs/conf.py b/docs/conf.py index 20bfc6a3..fe93a75e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -46,9 +46,9 @@ master_doc = 'index' project = u'Jedi' copyright = u'2012 - {today.year}, Jedi contributors'.format(today=datetime.date.today()) +import jedi _path = os.path.dirname(os.path.abspath(__file__)) -with open(os.path.join(_path, '../VERSION'), 'r') as f: - VERSION = f.read().strip() +_version_strs = [str(x) for x in jedi.__version__] # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -56,10 +56,9 @@ with open(os.path.join(_path, '../VERSION'), 'r') as f: # # The short X.Y version. -import re -version = re.match('\d+\.\d+', VERSION).group(0) +version = '.'.join(_version_strs[:2]) # The full version, including alpha/beta/rc tags. -release = VERSION +release = '.'.join(_version_strs) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index d32cc781..4d291a8c 100755 --- a/setup.py +++ b/setup.py @@ -8,8 +8,8 @@ __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com' readme = open('README.rst').read() -with open('VERSION') as f: - VERSION = f.read().strip() +import jedi +VERSION = '.'.join(str(x) for x in jedi.__version__) setup(name='jedi', version=VERSION,