Update hacking version >1.1.0
Updated hacking version to >1.1.0 and <1.2.0. Change-Id: I77ff4723fd420fc2f9afe0ca6c3d85d7ae1a28ba
This commit is contained in:
parent
1a18e940a0
commit
d471b824ea
|
@ -30,6 +30,9 @@ import warnings
|
|||
|
||||
import openstackdocstheme
|
||||
|
||||
from masakari.version import version_info
|
||||
|
||||
|
||||
extensions = [
|
||||
'os_api_ref',
|
||||
]
|
||||
|
@ -75,7 +78,6 @@ copyright = u'2017-present, OpenStack Foundation'
|
|||
# |version| and |release|, also used in various other places throughout the
|
||||
# built documents.
|
||||
#
|
||||
from masakari.version import version_info
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = version_info.release_string()
|
||||
# The short X.Y version.
|
||||
|
|
|
@ -18,9 +18,9 @@ from oslo_log import log as logging
|
|||
import paste.urlmap
|
||||
import six
|
||||
|
||||
if six.PY2:
|
||||
if six.PY2: # noqa
|
||||
import urllib2
|
||||
else:
|
||||
else: # noqa
|
||||
from urllib import request as urllib2
|
||||
|
||||
from masakari.api.openstack import wsgi
|
||||
|
@ -165,8 +165,8 @@ class URLMap(paste.urlmap.URLMap):
|
|||
for (domain, app_url), app in self.applications:
|
||||
if domain and domain != host and domain != host + ':' + port:
|
||||
continue
|
||||
if (path_info == app_url
|
||||
or path_info.startswith(app_url + '/')):
|
||||
if (path_info == app_url or
|
||||
path_info.startswith(app_url + '/')):
|
||||
return app, app_url
|
||||
|
||||
return None, None
|
||||
|
|
|
@ -12,6 +12,14 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import oslo_messaging as messaging
|
||||
from oslo_messaging.rpc import dispatcher
|
||||
|
||||
import masakari.context
|
||||
import masakari.exception
|
||||
from masakari.objects import base
|
||||
|
||||
|
||||
__all__ = [
|
||||
'init',
|
||||
'cleanup',
|
||||
|
@ -24,13 +32,6 @@ __all__ = [
|
|||
'get_server',
|
||||
]
|
||||
|
||||
import oslo_messaging as messaging
|
||||
from oslo_messaging.rpc import dispatcher
|
||||
|
||||
import masakari.context
|
||||
import masakari.exception
|
||||
from masakari.objects import base
|
||||
|
||||
TRANSPORT = None
|
||||
|
||||
ALLOWED_EXMODS = [
|
||||
|
|
|
@ -20,9 +20,8 @@ inline callbacks.
|
|||
|
||||
"""
|
||||
import contextlib
|
||||
|
||||
import eventlet
|
||||
eventlet.monkey_patch(os=False)
|
||||
eventlet.monkey_patch(os=False) # noqa
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
|
|
|
@ -58,8 +58,8 @@ class MonkeyPatchTestCase(test.NoDBTestCase):
|
|||
self.example_package = 'masakari.tests.unit.monkey_patch_example.'
|
||||
self.flags(
|
||||
monkey_patch=True,
|
||||
monkey_patch_modules=[self.example_package + 'example_a' + ':'
|
||||
+ self.example_package + 'example_decorator'])
|
||||
monkey_patch_modules=[self.example_package + 'example_a' + ':' +
|
||||
self.example_package + 'example_decorator'])
|
||||
|
||||
def test_monkey_patch(self):
|
||||
utils.monkey_patch()
|
||||
|
|
|
@ -2,10 +2,11 @@
|
|||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
||||
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
ddt>=1.0.1 # MIT
|
||||
pep8>=1.5.7
|
||||
psycopg2>=2.6.2 # LGPL/ZPL
|
||||
PyMySQL>=0.7.6 # MIT License
|
||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||
|
@ -19,6 +20,5 @@ requests-mock>=1.2.0 # Apache-2.0
|
|||
testresources>=2.0.0 # Apache-2.0/BSD
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
|
||||
# releasenotes
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -92,7 +92,7 @@ show-source = True
|
|||
# [H203] Use assertIs(Not)None to check for None.
|
||||
# [H904] Delay string interpolations at logging calls.
|
||||
enable-extensions = H106,H203,H904
|
||||
ignore = E123,E125,E128,H405
|
||||
ignore = E123,E125,E128,E731,H405
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
||||
|
||||
|
|
Loading…
Reference in New Issue