Merge "Uncap hacking"

diskimage_builder/block_device/cmd.py

@@ -119,5 +119,6 @@ def main():
     bdc = BlockDeviceCmd()
     return bdc.main()
 
+
 if __name__ == "__main__":
     sys.exit(main())

diskimage_builder/block_device/config.py

@@ -52,9 +52,9 @@ def recurse_config(config, parent_base=None):
 
     # We should only have one key, with multiple values, being the
     # config entries.  e.g. (this was checked by config_tree_to_graph)
-    #  mkfs:
+    # # mkfs:
-    #    type: ext4
+    # #  type: ext4
-    #    label: 1234
+    # #  label: 1234
     assert len(config.items()) == 1
     for k, v in config.items():
         key = k
@@ -248,31 +248,31 @@ def create_graph(config, default_config, state):
 #
 # To be concrete --
 #
-# partitioning:
+# # partitioning:
-#   base: loop0
+# #  base: loop0
-#   name: mbr
+# #  name: mbr
-#   partitions:
+# #   partitions:
-#     - name: partition1
+# #    - name: partition1
-#       foo: bar
+# #      foo: bar
-#       mkfs:
+# #      mkfs:
-#         type: xfs
+# #        type: xfs
-#         mount:
+# #        mount:
-#           mount_point: /
+# #          mount_point: /
 #
 # gets turned into the following graph:
 #
-# partitioning:
+# # partitioning:
-#   partitions:
+# #  partitions:
-#     - name: partition1
+# #    - name: partition1
-#       base: image0
+# #      base: image0
-#       foo: bar
+# #      foo: bar
 #
-# mkfs:
+# # mkfs:
-#   base: partition1
+# #  base: partition1
-#   name: mkfs_partition1
+# #  name: mkfs_partition1
-#   type: xfs
+# #  type: xfs
 #
-# mount:
+# # mount:
-#   base: mkfs_partition1
+# #  base: mkfs_partition1
-#   name: mount_mkfs_partition1
+# #  name: mount_mkfs_partition1
-#   mount_point: /
+# #  mount_point: /

diskimage_builder/block_device/tests/test_lvm.py

@@ -55,8 +55,8 @@ class TestLVM(tc.TestGraphGeneration):
         bad_config = copy.deepcopy(lvm_config)
         bad_config['lvs'][0]['base'] = ['invalid_vg']
         self.assertRaisesRegex(BlockDeviceSetupException,
-                               "base:\['invalid_vg'\] in lvs does not match "
+                               r"base:\['invalid_vg'\] in lvs does not match "
-                               "a valid vg",
+                               r"a valid vg",
                                LVMPlugin, bad_config, {}, {})
 
         bad_config = copy.deepcopy(lvm_config)

diskimage_builder/block_device/utils.py

@@ -42,7 +42,7 @@ SIZE_UNIT_SPECS = [
 
 # Basic RE to check and split floats (without exponent)
 # and a given unit specification (which must be non-numerical).
-size_unit_spec_re = re.compile("^([\d\.]*) ?([a-zA-Z0-9_]*)$")
+size_unit_spec_re = re.compile(r"^([\d\.]*) ?([a-zA-Z0-9_]*)$")
 
 
 def _split_size_unit_spec(size_unit_spec):

diskimage_builder/element_dependencies.py

@@ -350,5 +350,6 @@ def main():
 
     return 0
 
+
 if __name__ == "__main__":
     main()

diskimage_builder/elements/package-installs/bin/package-installs-squash

@@ -191,5 +191,6 @@ def main():
             final_dict, outfile,
             indent=True, separators=(',', ': '), sort_keys=False)
 
+
 if __name__ == '__main__':
     main()

diskimage_builder/elements/pkg-map/bin/pkg-map

@@ -190,6 +190,7 @@ def main():
 
     sys.exit(0)
 
+
 if __name__ == '__main__':
     main()
 

diskimage_builder/tests/test_elementdeps.py

@@ -173,7 +173,7 @@ class TestElementDeps(testtools.TestCase):
                  self._e('provides_new_virtual')], result)
 
     def test_elements_provide_same(self):
-        msg = "virtual: already provided by \['provides_virtual'\]"
+        msg = r"virtual: already provided by \['provides_virtual'\]"
         self.assertRaisesRegex(element_dependencies.AlreadyProvidedException,
                                msg,
                                element_dependencies.get_elements,

requirements.txt

@@ -10,4 +10,4 @@ PyYAML>=3.12 # MIT
 six>=1.10.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
 # NOTE(ianw) in here because dib-lint uses flake8
-hacking<1.2.0,>=1.1.0
+hacking>=1.1.0

tox.ini

@@ -59,7 +59,7 @@ basepython = python3
 commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]
-ignore = E125,E126,E127,H202,H803
+ignore = E125,E126,E127,H202,H803,W503,W504
 exclude =  .venv,.git,.tox,dist,doc/build,doc/source,*lib/python*,*egg,build,conf.py
 
 [testenv:lower-constraints]