Tweak pbr conf
Mainly, remove the pin in setup.py and remove the hook entry in setup.cfg. Update from requirements while we're at it. Change-Id: I34a05229b9ea0bdfd99dc16d09713c9494c1cb78
This commit is contained in:
parent
fd43cbd73b
commit
42db0cf585
|
@ -1,4 +1,4 @@
|
|||
pbr>=0.5.16,<0.6
|
||||
pbr>=0.5.21,<1.0
|
||||
argparse
|
||||
lxml>=2.3
|
||||
PrettyTable>=0.6,<0.8
|
||||
|
|
|
@ -17,10 +17,6 @@ classifier =
|
|||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 2.6
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
pbr.hooks.setup_hook
|
||||
|
||||
[files]
|
||||
packages =
|
||||
troveclient
|
||||
|
@ -35,4 +31,4 @@ source-dir = doc/source
|
|||
build-dir = doc/build
|
||||
|
||||
[upload_sphinx]
|
||||
upload-dir = doc/build/html
|
||||
upload-dir = doc/build/html
|
||||
|
|
2
setup.py
2
setup.py
|
@ -18,5 +18,5 @@
|
|||
import setuptools
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['pbr>=0.5.21,<1.0'],
|
||||
setup_requires=['pbr'],
|
||||
pbr=True)
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
# Install bounded pep8/pyflakes first, then let flake8 install
|
||||
pep8==1.4.5
|
||||
pyflakes==0.7.2
|
||||
flake8==2.0
|
||||
hacking>=0.5.6,<0.7
|
||||
hacking>=0.5.6,<0.8
|
||||
discover
|
||||
sphinx>=1.1.2
|
||||
testrepository>=0.0.17
|
||||
testtools>=0.9.32
|
||||
mock>=0.8.0
|
||||
mock>=1.0
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -32,6 +32,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|||
sphinx-build -b html {toxinidir}/docs/source {envtmpdir}/html
|
||||
|
||||
[flake8]
|
||||
ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H23,H301,H306,H401,H402,H403,H404,H702,H703
|
||||
ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H202,H23,H301,H306,H401,H402,H403,H404,H702,H703
|
||||
show-source = True
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
||||
|
|
Loading…
Reference in New Issue