Bump hacking to 0.9.x series
Ignore H904 because it's a deprecated hacking check. Ignore H405 because it should be fixed with a separate patch. Change-Id: I2e3bf41474cead1a860810886791e025139cca3b
This commit is contained in:
parent
ee94082d48
commit
b077c056e3
|
@ -16,6 +16,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,16 +22,20 @@ Utilities with minimum-depends for use in setup.py
|
||||||
|
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from distutils.command import install as du_install
|
||||||
|
import distutils.errors
|
||||||
|
from distutils import log
|
||||||
import email
|
import email
|
||||||
import io
|
import io
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
try:
|
||||||
|
import cStringIO
|
||||||
|
except ImportError:
|
||||||
|
import io as cStringIO
|
||||||
|
|
||||||
from distutils.command import install as du_install
|
|
||||||
import distutils.errors
|
|
||||||
from distutils import log
|
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
from setuptools.command import easy_install
|
from setuptools.command import easy_install
|
||||||
from setuptools.command import egg_info
|
from setuptools.command import egg_info
|
||||||
|
@ -39,11 +43,6 @@ from setuptools.command import install
|
||||||
from setuptools.command import install_scripts
|
from setuptools.command import install_scripts
|
||||||
from setuptools.command import sdist
|
from setuptools.command import sdist
|
||||||
|
|
||||||
try:
|
|
||||||
import cStringIO
|
|
||||||
except ImportError:
|
|
||||||
import io as cStringIO
|
|
||||||
|
|
||||||
from pbr import extra_files
|
from pbr import extra_files
|
||||||
|
|
||||||
TRUE_VALUES = ('true', '1', 'yes')
|
TRUE_VALUES = ('true', '1', 'yes')
|
||||||
|
@ -737,7 +736,7 @@ try:
|
||||||
'autodoc_index_modules',
|
'autodoc_index_modules',
|
||||||
'AUTODOC_INDEX_MODULES')
|
'AUTODOC_INDEX_MODULES')
|
||||||
if not os.getenv('SPHINX_DEBUG'):
|
if not os.getenv('SPHINX_DEBUG'):
|
||||||
#NOTE(afazekas): These options can be used together,
|
# NOTE(afazekas): These options can be used together,
|
||||||
# but they do a very similar thing in a difffernet way
|
# but they do a very similar thing in a difffernet way
|
||||||
if tree_index:
|
if tree_index:
|
||||||
self._sphinx_tree()
|
self._sphinx_tree()
|
||||||
|
|
|
@ -96,7 +96,7 @@ class Testr(cmd.Command):
|
||||||
logger.debug("finalize_options: self.__dict__ = %r", self.__dict__)
|
logger.debug("finalize_options: self.__dict__ = %r", self.__dict__)
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
"""Set up testr repo, then run testr"""
|
"""Set up testr repo, then run testr."""
|
||||||
logger.debug("run called")
|
logger.debug("run called")
|
||||||
if not os.path.isdir(".testrepository"):
|
if not os.path.isdir(".testrepository"):
|
||||||
self._run_testr("init")
|
self._run_testr("init")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
discover
|
discover
|
||||||
fixtures>=0.3.14
|
fixtures>=0.3.14
|
||||||
hacking>=0.8,<0.9
|
hacking>=0.9.2,<0.10
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
python-subunit>=0.0.18
|
python-subunit>=0.0.18
|
||||||
sphinx>=1.1.2,<1.2
|
sphinx>=1.1.2,<1.2
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -30,6 +30,9 @@ commands =
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
ignore = H803
|
# H405 multi line docstring summary not separated with an empty line
|
||||||
|
# H904 "Wrap lines in parentheses and not a backslash for line continuation
|
||||||
|
# Removed in current hacking (https://review.openstack.org/#/c/101701/).
|
||||||
|
ignore = H405,H803,H904
|
||||||
exclude = .venv,.tox,dist,doc,*.egg,build
|
exclude = .venv,.tox,dist,doc,*.egg,build
|
||||||
show-source = true
|
show-source = true
|
||||||
|
|
Loading…
Reference in New Issue