From 91e1bf3981a94038098a8832b0714f546cab3a5a Mon Sep 17 00:00:00 2001 From: Sean Roberts Date: Fri, 8 May 2015 23:47:38 -0700 Subject: [PATCH] getting ready for release updated setup.cfg with sections and setup.py with packaging pbr Partialy Implements: blueprint ci-updates Change-Id: Ie4707c1bba741cbeb16f02312d5db8cc0c134b6a --- requirements.txt | 1 - setup.cfg | 43 +++++++++++++++++++++++++++++++++++++++++++ setup.py | 35 ++++------------------------------- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4f294d0..feb07fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,3 @@ netaddr>=0.7.7 eventlet>=0.9.17 requests>=0.14.1,<=1.2.0 greenlet>=0.4.0 - diff --git a/setup.cfg b/setup.cfg index 1fb7f5d..3adc851 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,46 @@ +[metadata] +name = akanda-appliance +version = 2015.1 +summary = Akanda Linux-based L3 software router +description-file = + README.md +author = OpenStack +author-email = openstack-dev@lists.openstack.org +home-page = http://github.com/stackforge/akanda-rug +classifier = + Environment :: OpenStack + Intended Audience :: Developers + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 2.6 + +[files] +packages = + akanda + akanda.appliance +namespace_packages = + akanda + +[global] +setup-hooks = + pbr.hooks.setup_hook + +[entry-points] +console_scripts = + akanda-configure-management=akanda.router.commands.management:configure_management + akanda-api-dev-server=akanda.router.api.server:main + akanda-metadata-proxy=akanda.router.metadata_proxy:main + +[build_sphinx] +all_files = 1 +build-dir = doc/build +source-dir = doc/source + [nosetests] where = test verbosity = 2 diff --git a/setup.py b/setup.py index 0822ae8..650f464 100644 --- a/setup.py +++ b/setup.py @@ -14,35 +14,8 @@ # under the License. -from setuptools import setup, find_packages +import setuptools - -setup( - name='akanda-router', - version='0.3.0', - description='A packet filter based router appliance', - author='Akanda', - author_email='dev-community@akanda.io', - url='http://github.com/akanda/akanda', - license='Apache2', - install_requires=[ - 'flask>=0.9', - 'dogpile.cache>=0.5.4', - 'gunicorn>=0.14.6,<19', - 'netaddr>=0.7.7', - 'eventlet>=0.9.17', - 'requests>=0.14.1,<=1.2.0', - ], - namespace_packages=['akanda'], - packages=find_packages(), - include_package_data=True, - zip_safe=False, - entry_points={ - 'console_scripts': [ - 'akanda-configure-management =' - 'akanda.router.commands.management:configure_management', - 'akanda-api-dev-server = akanda.router.api.server:main', - 'akanda-metadata-proxy = akanda.router.metadata_proxy:main', - ] - }, -) +setuptools.setup( + setup_requires=['pbr'], + pbr=True)