From 35d442370c3007ab18f18d66280d0d8c0b354b02 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 17 Sep 2013 14:16:32 +0200 Subject: [PATCH] Switch to pbr Resolves issue #16 --- .gitignore | 4 +++ docs/source/conf.py | 8 +++--- requirements.txt | 1 + setup.cfg | 43 ++++++++++++++++++++++++++++ setup.py | 69 +++------------------------------------------ 5 files changed, 56 insertions(+), 69 deletions(-) create mode 100644 requirements.txt create mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index c5e83ec..8530c38 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,7 @@ pip-log.txt # Editors tags + +# pbr generated files +AUTHORS +ChangeLog diff --git a/docs/source/conf.py b/docs/source/conf.py index 1d352d5..df076b4 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -220,10 +220,10 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'stevedore', u'stevedore Documentation', - [u'DreamHost'], 1) -] +# man_pages = [ +# ('index', 'stevedore', u'stevedore Documentation', +# [u'DreamHost'], 1) +# ] # If true, show URL addresses after external links. #man_show_urls = False diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..1352d5e --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +argparse diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..842a0cd --- /dev/null +++ b/setup.cfg @@ -0,0 +1,43 @@ +[metadata] +name = stevedore +version = 0.11 +description-file = README.rst +author = Doug Hellmann +author-email = doug.hellmann@dreamhost.com +summary = Manage dynamic plugins for Python applications +home-page = https://github.com/dreamhost/stevedore +classifier = + Development Status :: 3 - Alpha + License :: OSI Approved :: Apache Software License + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.2 + Programming Language :: Python :: 3.3 + Intended Audience :: Developers + Environment :: Console + +[global] +setup-hooks = + pbr.hooks.setup_hook + +[files] +packages = + stevedore + +[entry_points] +stevedore.example.formatter = + simple = stevedore.example.simple:Simple + field = stevedore.example.fields:FieldList + plain = stevedore.example.simple:Simple + +stevedore.test.extension = + t1 = stevedore.tests.test_extension:FauxExtension + t2 = stevedore.tests.test_extension:FauxExtension + + +[build_sphinx] +all_files = 1 +build-dir = docs/build +source-dir = docs/source diff --git a/setup.py b/setup.py index 70c4c24..fc53c37 100644 --- a/setup.py +++ b/setup.py @@ -1,67 +1,6 @@ #!/usr/bin/env python +import setuptools -from setuptools import setup, find_packages - -try: - long_description = open('README.rst', 'rt').read() -except IOError: - long_description = '' - -install_requires = [] - -try: - import argparse # noqa -except ImportError: - install_requires.append('argparse') - -setup( - name='stevedore', - version='0.11', - - description='Manage dynamic plugins for Python applications', - long_description=long_description, - - author='Doug Hellmann', - author_email='doug.hellmann@dreamhost.com', - - url='https://github.com/dreamhost/stevedore', - download_url='https://github.com/dreamhost/stevedore/tarball/master', - - classifiers=['Development Status :: 3 - Alpha', - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', - 'Intended Audience :: Developers', - 'Environment :: Console', - ], - - platforms=['Any'], - - scripts=[], - - provides=['stevedore', - ], - install_requires=install_requires, - - namespace_packages=[], - packages=find_packages(), - include_package_data=True, - - entry_points={ - 'stevedore.example.formatter': [ - 'simple = stevedore.example.simple:Simple', - 'field = stevedore.example.fields:FieldList', - 'plain = stevedore.example.simple:Simple', - ], - 'stevedore.test.extension': [ - 't1 = stevedore.tests.test_extension:FauxExtension', - 't2 = stevedore.tests.test_extension:FauxExtension', - ], - }, - - zip_safe=False, -) +setuptools.setup( + setup_requires=['pbr>=0.5.21,<1.0'], + pbr=True)