Merge "Update hacking version to 1.1"

This commit is contained in:
Zuul
2019-02-07 17:56:55 +00:00
committed by Gerrit Code Review
6 changed files with 50 additions and 52 deletions

View File

@@ -25,7 +25,7 @@ flake8==2.5.5
future==0.16.0 future==0.16.0
futurist==1.2.0 futurist==1.2.0
greenlet==0.4.10 greenlet==0.4.10
hacking==0.12.0 hacking==1.1.0
idna==2.6 idna==2.6
imagesize==0.7.1 imagesize==0.7.1
iso8601==0.1.11 iso8601==0.1.11
@@ -68,7 +68,6 @@ paramiko==2.0.0
Paste==2.0.2 Paste==2.0.2
PasteDeploy==1.5.0 PasteDeploy==1.5.0
pbr==2.0.0 pbr==2.0.0
pep8==1.5.7
pika-pool==0.1.3 pika-pool==0.1.3
pika==0.10.0 pika==0.10.0
positional==1.2.1 positional==1.2.1

View File

@@ -47,8 +47,7 @@ def _add_common_args(parser):
def _parse_common_args(body, parsed_args): def _parse_common_args(body, parsed_args):
neutronV20.update_dict(parsed_args, body, neutronV20.update_dict(parsed_args, body, ['weight', 'name'])
['weight', 'name'])
class ListMember(LbaasMemberMixin, neutronV20.ListCommand): class ListMember(LbaasMemberMixin, neutronV20.ListCommand):

View File

@@ -110,7 +110,7 @@ class SimpleReadOnlyNeutronClientTest(base.ClientTestBase):
commands = [] commands = []
cmds_start = lines.index('Commands for API v2.0:') cmds_start = lines.index('Commands for API v2.0:')
command_pattern = re.compile('^ {2}([a-z0-9\-\_]+)') command_pattern = re.compile(r'^ {2}([a-z0-9\-\_]+)')
for line in lines[cmds_start:]: for line in lines[cmds_start:]:
match = command_pattern.match(line) match = command_pattern.match(line)
if match: if match:

View File

@@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # 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 # Apache-2.0
bandit>=1.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0