Bump hacking to >=0.10.0,<0.11 to fix failure of gate pep8
pbr 1.0.1 released in 2015-05-19 requires the newer hacking module >=0.10.0,<0.11 than the versions specified in the test-requirement.txt file, which causes failure in gate-python-cinderclient-pep8. This patch bumps the pbr version in test-requirement.txt to make it consistent with requirements repository, and adds some fixups to avoid some new hacking rules. Change-Id: I7de6e04e30a475ec1c26224461faf0c708178a40 Closes-Bug: #1460774
This commit is contained in:
		@@ -591,13 +591,13 @@ class OpenStackCinderShell(object):
 | 
			
		||||
            return 0
 | 
			
		||||
 | 
			
		||||
        (os_username, os_password, os_tenant_name, os_auth_url,
 | 
			
		||||
         os_region_name, os_tenant_id, endpoint_type, insecure,
 | 
			
		||||
         os_region_name, os_tenant_id, endpoint_type,
 | 
			
		||||
         service_type, service_name, volume_service_name, bypass_url,
 | 
			
		||||
         cacert, os_auth_system) = (
 | 
			
		||||
             args.os_username, args.os_password,
 | 
			
		||||
             args.os_tenant_name, args.os_auth_url,
 | 
			
		||||
             args.os_region_name, args.os_tenant_id,
 | 
			
		||||
             args.os_endpoint_type, args.insecure,
 | 
			
		||||
             args.os_endpoint_type,
 | 
			
		||||
             args.service_type, args.service_name,
 | 
			
		||||
             args.volume_service_name,
 | 
			
		||||
             args.bypass_url, args.os_cacert,
 | 
			
		||||
 
 | 
			
		||||
@@ -92,7 +92,7 @@ class ShellTest(utils.TestCase):
 | 
			
		||||
 | 
			
		||||
    def test_extract_metadata(self):
 | 
			
		||||
        # mimic the result of argparse's parse_args() method
 | 
			
		||||
        class Arguments:
 | 
			
		||||
        class Arguments(object):
 | 
			
		||||
 | 
			
		||||
            def __init__(self, metadata=None):
 | 
			
		||||
                self.metadata = metadata or []
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
# of appearance. Changing the order has an impact on the overall integration
 | 
			
		||||
# process, which may cause wedges in the gate later.
 | 
			
		||||
# Hacking already pins down pep8, pyflakes and flake8
 | 
			
		||||
hacking>=0.8.0,<0.9
 | 
			
		||||
hacking>=0.10.0,<0.11
 | 
			
		||||
coverage>=3.6
 | 
			
		||||
discover
 | 
			
		||||
fixtures>=0.3.14
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user