parent
c48dcd4cb8
commit
92aecf935f
|
@ -0,0 +1 @@
|
|||
__version__ = "0.8"
|
|
@ -111,6 +111,8 @@ MIDDLEWARE_CLASSES = (
|
|||
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
'django.middleware.transaction.TransactionMiddleware',
|
||||
'reversion.middleware.RevisionMiddleware',
|
||||
# Entr'ouvert wsgi middleware to expose version
|
||||
'entrouvert.djommon.middleware.VersionMiddleware',
|
||||
)
|
||||
|
||||
ROOT_URLCONF = 'calebasse.urls'
|
||||
|
|
|
@ -11,3 +11,4 @@ django-debug-toolbar
|
|||
m2crypto
|
||||
python-ldap
|
||||
xhtml2pdf
|
||||
git+git://repos.entrouvert.org/python-entrouvert.git
|
||||
|
|
36
setup.py
36
setup.py
|
@ -2,8 +2,39 @@
|
|||
from setuptools import setup, find_packages
|
||||
import os
|
||||
|
||||
def get_version():
|
||||
import glob
|
||||
import re
|
||||
import os
|
||||
|
||||
version = None
|
||||
for d in glob.glob('*'):
|
||||
if not os.path.isdir(d):
|
||||
continue
|
||||
module_file = os.path.join(d, '__init__.py')
|
||||
if not os.path.exists(module_file):
|
||||
continue
|
||||
for v in re.findall("""__version__ *= *['"](.*)['"]""",
|
||||
open(module_file).read()):
|
||||
assert version is None
|
||||
version = v
|
||||
if version:
|
||||
break
|
||||
assert version is not None
|
||||
if os.path.exists('.git'):
|
||||
import subprocess
|
||||
p = subprocess.Popen(['git','describe','--dirty','--match=v*'],
|
||||
stdout=subprocess.PIPE)
|
||||
result = p.communicate()[0]
|
||||
assert p.returncode == 0, 'git returned non-zero'
|
||||
new_version = result.split()[0][1:]
|
||||
assert new_version.split('-')[0] == version, '__version__ must match the last git annotated tag'
|
||||
version = new_version.replace('-', '.')
|
||||
return version
|
||||
|
||||
|
||||
setup(name='calebasse',
|
||||
version='0.1',
|
||||
version=get_version(),
|
||||
license='AGPLv3',
|
||||
description='',
|
||||
url='http://dev.entrouvert.org/projects/calebasse/',
|
||||
|
@ -19,8 +50,9 @@ setup(name='calebasse',
|
|||
'django-model-utils < 1.2.0',
|
||||
'django-ajax-selects < 1.3.0',
|
||||
'django-widget-tweaks < 1.2.0',
|
||||
'django-tastypie>=0.9, < 1.0',
|
||||
'django-tastypie >= 0.9, < 1.0',
|
||||
'interval == 1.0.0',
|
||||
'python-entrouvert >= 1.3'
|
||||
'django-debug-toolbar',
|
||||
],
|
||||
dependency_links = [
|
||||
|
|
Reference in New Issue