Merge pull request #53 from gregmuellegger/setuppy-fix

Fixing setup.py if django is not installed.
This commit is contained in:
Daniel Greenfeld 2013-05-18 07:57:52 -07:00
commit bc75454b3a

View file

@ -7,12 +7,20 @@ import os
import sys
def get_author(package):
"""
Return package version as listed in `__version__` in `init.py`.
"""
init_py = open(os.path.join(package, '__init__.py')).read()
return re.search("__author__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
def get_version(package):
"""
Return package version as listed in `__version__` in `init.py`.
"""
init_py = open(os.path.join(package, '__init__.py')).read()
return re.match("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
def get_packages(package):
@ -40,6 +48,7 @@ def get_package_data(package):
return {package: filepaths}
author = get_author('djadmin2')
version = get_version('djadmin2')
@ -50,8 +59,6 @@ if sys.argv[-1] == 'publish':
print(" git push --tags")
sys.exit()
import djadmin2
LONG_DESCRIPTION = open('README.rst').read()
setup(
@ -73,7 +80,7 @@ setup(
"Topic :: Software Development :: Libraries :: Python Modules",
],
keywords='django,admin',
author=djadmin2.__author__,
author=author,
author_email='pydanny@gmail.com',
url='http://github.com/pydanny/django-admin2',
license='MIT',