From 28ebd2484466134ab8ba57cb13095910091c00b8 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Sun, 23 Feb 2020 10:25:38 +1100 Subject: [PATCH] Uncap hacking This causes problems for other projects incorporating dib; we don't have a specific need for a cap. Fix a few issues, mostly spacing or regex matches. No functional changes. W503 and W504 relate to leaving artithmetic operators at the start or end of lines, and are mutually exclusive and, due to "ignore" overriding the defaults both get enabled. It seems everyone gets this wrong (https://gitlab.com/pycqa/flake8/issues/466). Don't take a position on this and ignore both. Use double # around comments including YAML snippets using "# type: " which now gets detected as PEP484/mypy type hints. Change-Id: I8b7ce6dee02dcce31c82427a2441c931d136ef57 --- diskimage_builder/block_device/cmd.py | 1 + diskimage_builder/block_device/config.py | 52 +++++++++---------- .../block_device/tests/test_lvm.py | 4 +- diskimage_builder/block_device/utils.py | 2 +- diskimage_builder/element_dependencies.py | 1 + .../bin/package-installs-squash | 1 + .../elements/pkg-map/bin/pkg-map | 1 + diskimage_builder/tests/test_elementdeps.py | 2 +- requirements.txt | 2 +- tox.ini | 2 +- 10 files changed, 36 insertions(+), 32 deletions(-) diff --git a/diskimage_builder/block_device/cmd.py b/diskimage_builder/block_device/cmd.py index c7054249d..de724caea 100644 --- a/diskimage_builder/block_device/cmd.py +++ b/diskimage_builder/block_device/cmd.py @@ -119,5 +119,6 @@ def main(): bdc = BlockDeviceCmd() return bdc.main() + if __name__ == "__main__": sys.exit(main()) diff --git a/diskimage_builder/block_device/config.py b/diskimage_builder/block_device/config.py index 8d71e7d5e..271b6dc4e 100644 --- a/diskimage_builder/block_device/config.py +++ b/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: - # type: ext4 - # label: 1234 + # # mkfs: + # # type: ext4 + # # 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: -# base: loop0 -# name: mbr -# partitions: -# - name: partition1 -# foo: bar -# mkfs: -# type: xfs -# mount: -# mount_point: / +# # partitioning: +# # base: loop0 +# # name: mbr +# # partitions: +# # - name: partition1 +# # foo: bar +# # mkfs: +# # type: xfs +# # mount: +# # mount_point: / # # gets turned into the following graph: # -# partitioning: -# partitions: -# - name: partition1 -# base: image0 -# foo: bar +# # partitioning: +# # partitions: +# # - name: partition1 +# # base: image0 +# # foo: bar # -# mkfs: -# base: partition1 -# name: mkfs_partition1 -# type: xfs +# # mkfs: +# # base: partition1 +# # name: mkfs_partition1 +# # type: xfs # -# mount: -# base: mkfs_partition1 -# name: mount_mkfs_partition1 -# mount_point: / +# # mount: +# # base: mkfs_partition1 +# # name: mount_mkfs_partition1 +# # mount_point: / diff --git a/diskimage_builder/block_device/tests/test_lvm.py b/diskimage_builder/block_device/tests/test_lvm.py index df20d0cad..fd45f1701 100644 --- a/diskimage_builder/block_device/tests/test_lvm.py +++ b/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 " - "a valid vg", + r"base:\['invalid_vg'\] in lvs does not match " + r"a valid vg", LVMPlugin, bad_config, {}, {}) bad_config = copy.deepcopy(lvm_config) diff --git a/diskimage_builder/block_device/utils.py b/diskimage_builder/block_device/utils.py index 19047818a..ad4ab95c5 100644 --- a/diskimage_builder/block_device/utils.py +++ b/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): diff --git a/diskimage_builder/element_dependencies.py b/diskimage_builder/element_dependencies.py index b794256e9..a5e8b7380 100644 --- a/diskimage_builder/element_dependencies.py +++ b/diskimage_builder/element_dependencies.py @@ -350,5 +350,6 @@ def main(): return 0 + if __name__ == "__main__": main() diff --git a/diskimage_builder/elements/package-installs/bin/package-installs-squash b/diskimage_builder/elements/package-installs/bin/package-installs-squash index 36f1ddc1a..04c31a4cf 100755 --- a/diskimage_builder/elements/package-installs/bin/package-installs-squash +++ b/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() diff --git a/diskimage_builder/elements/pkg-map/bin/pkg-map b/diskimage_builder/elements/pkg-map/bin/pkg-map index d33f52b12..634daec7f 100755 --- a/diskimage_builder/elements/pkg-map/bin/pkg-map +++ b/diskimage_builder/elements/pkg-map/bin/pkg-map @@ -190,6 +190,7 @@ def main(): sys.exit(0) + if __name__ == '__main__': main() diff --git a/diskimage_builder/tests/test_elementdeps.py b/diskimage_builder/tests/test_elementdeps.py index 13e88af01..d4ac1748e 100644 --- a/diskimage_builder/tests/test_elementdeps.py +++ b/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, diff --git a/requirements.txt b/requirements.txt index 3bf13a738..9f4224165 100644 --- a/requirements.txt +++ b/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 diff --git a/tox.ini b/tox.ini index ed8d7c49d..2c92940f1 100644 --- a/tox.ini +++ b/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]