Merge pull request #100 from yangyubo/master

Fix versioning: import __version__ at setup.py directly is error-pron…
This commit is contained in:
Yang.Y 2015-12-14 10:58:46 +08:00
commit fa3902d391
3 changed files with 23 additions and 44 deletions

View file

@ -1,3 +1,15 @@
# -*- coding: utf-8 -*-
"""
django-notifications
~~~~~
A GitHub notification alike app for Django.
:copyright: (c) 2015 by django-notifications team.
:license: BSD, see LICENSE.txt for more details.
"""
# PEP 386-compliant version number: N.N[.N]+[{a|b|c|rc}N[.N]+][.postN][.devN]
__version__ = '0.8.0'
try:
from notifications.signals import notify
except ImportError:
@ -8,25 +20,3 @@ try:
urls = (urlpatterns, 'notifications', 'notifications')
except ImportError:
pass
__version_info__ = {
'major': 0,
'minor': 8,
'micro': 0,
'releaselevel': 'final',
'serial': 0
}
def get_version(release_level=True):
"""
Return the formatted version information
"""
vers = ["%(major)i.%(minor)i.%(micro)i" % __version_info__]
if release_level and __version_info__['releaselevel'] != 'final':
vers.append('%(releaselevel)s%(serial)i' % __version_info__)
return ''.join(vers)
__version__ = get_version()

View file

@ -1,11 +1,20 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import re
import ast
from distutils.core import setup
from version import __version__
_version_re = re.compile(r'__version__\s+=\s+(.*)')
with open('notifications/__init__.py', 'rb') as f:
version = str(ast.literal_eval(_version_re.search(
f.read().decode('utf-8')).group(1)))
setup(name='django-notifications-hq',
version=__version__,
version=version,
description='GitHub notifications alike app for Django.',

View file

@ -1,20 +0,0 @@
__version_info__ = {
'major': 0,
'minor': 7,
'micro': 1,
'releaselevel': 'final',
'serial': 0
}
def get_version(release_level=True):
"""
Return the formatted version information
"""
vers = ["%(major)i.%(minor)i.%(micro)i" % __version_info__]
if release_level and __version_info__['releaselevel'] != 'final':
vers.append('%(releaselevel)s%(serial)i' % __version_info__)
return ''.join(vers)
__version__ = get_version()