From: Thanh Ha Date: Fri, 17 Aug 2018 18:46:33 +0000 (-0400) Subject: Setup PBR for lftools X-Git-Tag: v0.16.0~7 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F12307%2F3;p=releng%2Flftools.git Setup PBR for lftools Change-Id: I028540301560b76af1cb31f2d9c40612b3b3480f Signed-off-by: Thanh Ha --- diff --git a/.gitignore b/.gitignore index 47354edf..9785028e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,7 @@ __pycache__/ docs/_build/ dist/ MANIFEST + +# PBR +AUTHORS +ChangeLog diff --git a/requirements-openstack.txt b/requirements-openstack.txt deleted file mode 100644 index 5bb77846..00000000 --- a/requirements-openstack.txt +++ /dev/null @@ -1 +0,0 @@ -shade~=1.27.1 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..4c3a91c4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,42 @@ +[metadata] +name = lftools +author = LF Releng +author-email = releng@linuxfoundation.org +summary = Linux Foundation Release Engineering Tools +description-file = README.md +description-content-type = text/x-rst; charset=UTF-8 +home-page = https://docs.releng.linuxfoundation.org/projects/lftools +project_urls = + Bug Tracker = https://jira.linuxfoundation.org + Documentation = https://docs.releng.linuxfoundation.org/projects/lftools + Source Code = https://github.com/lfit/releng-lftools +license = EPL-1.0 +classifier = + Intended Audience :: Developers + Intended Audience :: Information Technology + License :: OSI Approved :: Eclipse Public License 1.0 (EPL-1.0) + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + +[extras] +openstack = + shade~=1.27.1 + +[files] +packages = lftools +data_files = + etc = + etc/logging.ini +scripts = + shell/dco + shell/deploy + shell/sign + shell/version + +[entry_points] +console_scripts = + lftools = lftools.cli:main diff --git a/setup.py b/setup.py index afbb0da0..85cab01b 100644 --- a/setup.py +++ b/setup.py @@ -19,46 +19,15 @@ from lftools import __version__ with open('requirements.txt') as f: install_reqs = f.read().splitlines() -with open('requirements-openstack.txt') as f: - openstack_reqs = f.read().splitlines() - setup( - name='lftools', - version=__version__, - author='Thanh Ha', - author_email='releng@linuxfoundation.org', - url='https://lf-releng-tools.readthedocs.io', - description=__summary__, - long_description=open("README.md").read(), - license='EPL', - classifiers=[ - 'Development Status :: 1 - Planning', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.5', - ], + setup_requires=['pbr', 'pytest-runner'], + pbr=True, install_requires=install_reqs, - extras_require={ - 'openstack': openstack_reqs, - }, packages=find_packages(exclude=[ '*.tests', '*.tests.*', 'tests.*', 'tests' ]), - setup_requires=['pytest-runner'], tests_require=['pytest'], - entry_points=''' - [console_scripts] - lftools=lftools.cli:main - ''', - scripts=[ - 'shell/dco', - 'shell/deploy', - 'shell/sign', - 'shell/version' - ], - data_files=[('etc', ['etc/logging.ini'])], ) diff --git a/tox.ini b/tox.ini index 3f38e355..2555c624 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,6 @@ envlist = [testenv] deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/requirements-openstack.txt -r{toxinidir}/requirements-test.txt pytest pytest-click