Convert to pbr
Use pbr for packaging instead of manual setup tools. This allows us to take advantage of a number of features provided by pbr, such as automated generation of AUTHORS, HISTORY and MANIFEST files. This removes two doc files due to reliance on the removed AUTHORS and HISTORY files. Finally, the 'full' tox target is removed and the 'pyN' targets are stubbed out. These are broken by the move to pbr and will be rendered irrelevant by a follow-up change. Change-Id: I098979a6033afcff9abfbf60de63825f073dc15b Partial-Bug: #1535772
This commit is contained in:
Stephen Finucane
parent
6f2bed176c
commit
14cc8e7d71
|
|
@ -41,3 +41,8 @@ output/*/index.html
|
|||
|
||||
# Sphinx
|
||||
docs/_build
|
||||
|
||||
# pbr
|
||||
AUTHORS
|
||||
Authors
|
||||
ChangeLog
|
||||
|
|
|
|||
13
AUTHORS.rst
13
AUTHORS.rst
|
|
@ -1,13 +0,0 @@
|
|||
=======
|
||||
Credits
|
||||
=======
|
||||
|
||||
Development Lead
|
||||
----------------
|
||||
|
||||
* Waldemar Znoinski <waldemar.znoinski@intel.com>
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
||||
None yet. Why not be the first?
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
.. :changelog:
|
||||
|
||||
History
|
||||
-------
|
||||
|
||||
0.1.0 (2015-06-15)
|
||||
------------------
|
||||
|
||||
* First release on PyPI.
|
||||
11
MANIFEST.in
11
MANIFEST.in
|
|
@ -1,11 +0,0 @@
|
|||
include AUTHORS.rst
|
||||
include CONTRIBUTING.rst
|
||||
include HISTORY.rst
|
||||
include LICENSE
|
||||
include README.rst
|
||||
|
||||
recursive-include tests *
|
||||
recursive-exclude * __pycache__
|
||||
recursive-exclude * *.py[co]
|
||||
|
||||
recursive-include docs *.rst conf.py Makefile make.bat
|
||||
|
|
@ -1 +0,0 @@
|
|||
.. include:: ../AUTHORS.rst
|
||||
|
|
@ -1 +0,0 @@
|
|||
.. include:: ../HISTORY.rst
|
||||
|
|
@ -15,8 +15,6 @@ Contents:
|
|||
installation
|
||||
usage
|
||||
contributing
|
||||
authors
|
||||
history
|
||||
|
||||
Indices and tables
|
||||
==================
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
wheel==0.23.0
|
||||
-e git+https://github.com/openstack/neutron.git@master#egg=neutron
|
||||
tempest-lib>=0.7.0
|
||||
oslo.concurrency>=2.3.0 # Apache-2.0
|
||||
oslo.log>=1.6.0 # Apache-2.0
|
||||
|
||||
tempest-lib>=0.13.0
|
||||
oslo.concurrency>=2.3.0
|
||||
oslo.log>=1.6.0
|
||||
|
|
|
|||
19
setup.cfg
19
setup.cfg
|
|
@ -1,2 +1,21 @@
|
|||
[metadata]
|
||||
name = intel_nfv_ci_tests
|
||||
summary = Repository containing tests for Intel NFV 3rd party CI
|
||||
description-file = README.rst
|
||||
classifier =
|
||||
Programming Language :: Python :: 2
|
||||
Development Status :: 2 - Pre-Alpha
|
||||
Environment :: Console
|
||||
Intended Audience :: Developers
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Natural Language :: English
|
||||
keywords = intel nfv epa nova openstack
|
||||
author = Intel Corporation
|
||||
author-email = waldemar.znoinski@intel.com
|
||||
project-url = https://github.com/openstack/intel-nfv-ci-tests
|
||||
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
||||
[pbr]
|
||||
warnerrors = True
|
||||
|
|
|
|||
|
|
@ -1,68 +1,20 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright 2015 Intel Corporation
|
||||
# All Rights Reserved.
|
||||
# Copyright (c) 2015 Intel Corporation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import setuptools
|
||||
|
||||
try:
|
||||
from setuptools import setup
|
||||
except ImportError:
|
||||
from distutils.core import setup
|
||||
|
||||
|
||||
with open('README.rst') as readme_file:
|
||||
readme = readme_file.read()
|
||||
|
||||
with open('HISTORY.rst') as history_file:
|
||||
history = history_file.read().replace('.. :changelog:', '')
|
||||
|
||||
requirements = [
|
||||
# TODO(requirements): put package requirements here
|
||||
]
|
||||
|
||||
test_requirements = [
|
||||
# TODO(test-requirements): put package test requirements here
|
||||
]
|
||||
|
||||
setup(
|
||||
name='intel_nfv_ci_tests',
|
||||
version='0.1.0',
|
||||
description="Repository containing tests for Intel NFV 3rd party CI",
|
||||
long_description=readme + '\n\n' + history,
|
||||
author="Intel Corporation",
|
||||
author_email='waldemar.znoinski@intel.com',
|
||||
url='https://github.com/openstack/intel-nfv-ci-tests',
|
||||
packages=[
|
||||
'intel_nfv_ci_tests',
|
||||
],
|
||||
package_dir={'intel_nfv_ci_tests':
|
||||
'intel_nfv_ci_tests'},
|
||||
include_package_data=True,
|
||||
install_requires=requirements,
|
||||
license="Apache",
|
||||
zip_safe=False,
|
||||
keywords='intel_nfv_ci_tests',
|
||||
classifiers=[
|
||||
'Development Status :: 2 - Pre-Alpha',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: Apache Software License',
|
||||
'Natural Language :: English',
|
||||
"Programming Language :: Python :: 2",
|
||||
'Programming Language :: Python :: 2.7',
|
||||
],
|
||||
test_suite='tests',
|
||||
tests_require=test_requirements
|
||||
)
|
||||
setuptools.setup(
|
||||
setup_requires=['pbr>=1.8'],
|
||||
pbr=True)
|
||||
|
|
|
|||
20
tox.ini
20
tox.ini
|
|
@ -1,12 +1,15 @@
|
|||
[tox]
|
||||
minversion = 2.0
|
||||
envlist = py34,py27,pep8
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
usedevelop = True
|
||||
setenv =
|
||||
PYTHONPATH = {toxinidir}:{toxinidir}/intel_nfv_ci_tests
|
||||
commands = python setup.py test
|
||||
deps =
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
||||
|
||||
[testenv:pep8]
|
||||
commands = flake8
|
||||
|
|
@ -14,9 +17,6 @@ commands = flake8
|
|||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
commands = python setup.py testr --coverage --testr-args='{posargs}'
|
||||
|
||||
[testenv:docs]
|
||||
commands = python setup.py build_sphinx
|
||||
|
||||
|
|
@ -39,15 +39,3 @@ ignore = E123,E125,E126,E128,E129,E265,H301,H305,H307,H402,H404,H405,H904,H803
|
|||
show-source = True
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,docs,*openstack/common*,*lib/python*,*egg,build
|
||||
|
||||
[testenv:full]
|
||||
sitepackages = False
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
OS_TEST_PATH=./intel_nfv_ci_tests/integration
|
||||
deps = setuptools
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
commands =
|
||||
find . -type f -name "*.pyc" -delete
|
||||
bash tools/pretty_tox.sh '(^intel_nfv_ci_tests/integration) {posargs}'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue