From ef36e56fe7b0d0b2208928c00a54251947840f0f Mon Sep 17 00:00:00 2001 From: Bertrand Bordage Date: Mon, 11 Jan 2016 21:05:39 +0100 Subject: [PATCH] Changes __version__ for PEP 396 compliance. --- cachalot/__init__.py | 4 ++-- docs/conf.py | 4 ++-- setup.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cachalot/__init__.py b/cachalot/__init__.py index 8bf386a..7140b7d 100644 --- a/cachalot/__init__.py +++ b/cachalot/__init__.py @@ -1,4 +1,4 @@ -__version__ = (1, 1, 0) -version_string = '.'.join(str(n) for n in __version__) +VERSION = (1, 1, 0) +__version__ = '.'.join(map(str, VERSION)) default_app_config = 'cachalot.apps.CachalotConfig' diff --git a/docs/conf.py b/docs/conf.py index 1d292d7..b967d44 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,9 +65,9 @@ copyright = '2014-2015, Bertrand Bordage' # built documents. # # The short X.Y version. -version = '%s.%s' % cachalot.__version__[:2] +version = '%s.%s' % cachalot.VERSION[:2] # The full version, including alpha/beta/rc tags. -release = cachalot.version_string +release = cachalot.__version__ # 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 13cfb8a..d12adb6 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import os from setuptools import setup, find_packages -from cachalot import version_string +from cachalot import __version__ CURRENT_PATH = os.path.abspath(os.path.dirname(__file__)) @@ -13,7 +13,7 @@ with open(os.path.join(CURRENT_PATH, 'requirements.txt')) as f: setup( name='django-cachalot', - version=version_string, + version=__version__, author='Bertrand Bordage', author_email='bordage.bertrand@gmail.com', url='https://github.com/BertrandBordage/django-cachalot',