From 5159adae93b7af821ce2aa5726cbd727f4dfb597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Bryon?= Date: Wed, 6 Feb 2013 08:59:03 +0100 Subject: [PATCH] Minor review of packaging. Added dependency to setuptools. --- setup.py | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/setup.py b/setup.py index 1fd4c73..420945d 100644 --- a/setup.py +++ b/setup.py @@ -8,34 +8,35 @@ def read_relative_file(filename): """Returns contents of the given file, which path is supposed relative to this module.""" with open(os.path.join(os.path.dirname(__file__), filename)) as f: - return f.read() + return f.read().strip() NAME = 'django-downloadview' README = read_relative_file('README') -VERSION = read_relative_file('VERSION').strip() +VERSION = read_relative_file('VERSION') PACKAGES = ['django_downloadview'] -REQUIRES = ['django>=1.4'] +REQUIRES = ['setuptools', 'django>=1.4'] -setup(name=NAME, - version=VERSION, - description='Generic download views for Django.', - long_description=README, - classifiers=['Development Status :: 4 - Beta', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 2.6', - 'Framework :: Django', - ], - keywords='class-based view, generic view, download, file, FileField, ' \ - 'ImageField, nginx, x-accel, x-sendfile', - author='Benoit Bryon', - author_email='benoit@marmelune.net', - url='https://github.com/benoitbryon/%s' % NAME, - license='BSD', - packages=PACKAGES, - include_package_data=True, - zip_safe=False, - install_requires=REQUIRES, - ) +if __name__ == '__main__': # Don't run setup() when we import this module. + setup(name=NAME, + version=VERSION, + description='Generic download views for Django.', + long_description=README, + classifiers=['Development Status :: 4 - Beta', + 'License :: OSI Approved :: BSD License', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 2.6', + 'Framework :: Django', + ], + keywords='class-based view, generic view, download, file, ' + 'FileField, ImageField, nginx, x-accel, x-sendfile', + author='Benoît Bryon', + author_email='benoit@marmelune.net', + url='https://github.com/benoitbryon/%s' % NAME, + license='BSD', + packages=PACKAGES, + include_package_data=True, + zip_safe=False, + install_requires=REQUIRES, + )