fixed linting

upgraded pep8 to pycodestlye and fixed
linting errors which now covers tests too.

Change-Id: Ib9b470a83d1882d110cdefe0755f93e7f9d69b76

Author: ssbarnea

rdopkg/actionmods/cbsbuild.py

@@ -93,7 +93,7 @@ def retrieve_sources():
         return
     try:
         specfile = spec_fn()
-    except:
+    except Exception:
         return
 
     cmd = [spectool, "-g", specfile]
@@ -113,7 +113,7 @@ def create_srpm(dist='el7'):
     try:
         specfile = spec_fn()
         spec = Spec(specfile)
-    except:
+    except Exception:
         return
 
     rpmdefines = ["--define 'dist .{}'".format(dist),

rdopkg/actionmods/rdoinfo.py

@@ -199,19 +199,19 @@ def print_releases(self):
             print(s)
             for repo in rls['repos']:
                 if 'special' in repo:
-                    print ("    {t.bold}{name}{t.normal}: "
-                           "{t.yellow}{special}{t.normal}".format(
-                               t=log.term,
-                               name=repo['name'],
-                               special=repo['special']))
+                    print("    {t.bold}{name}{t.normal}: "
+                          "{t.yellow}{special}{t.normal}".format(
+                              t=log.term,
+                              name=repo['name'],
+                              special=repo['special']))
                 else:
-                    print ("    {t.bold}{name}{t.normal} built in"
-                           " {t.bold}{bs}{t.normal} from"
-                           " {t.bold}{branch}{t.normal} branch".format(
-                               t=log.term,
-                               name=repo['name'],
-                               bs=repo.get('buildsys', '??'),
-                               branch=repo['branch']))
+                    print("    {t.bold}{name}{t.normal} built in"
+                          " {t.bold}{bs}{t.normal} from"
+                          " {t.bold}{branch}{t.normal} branch".format(
+                              t=log.term,
+                              name=repo['name'],
+                              bs=repo.get('buildsys', '??'),
+                              branch=repo['branch']))
 
     def print_pkg_summary(self):
         pkgs = self.info['packages']

rdopkg/utils/specfile.py

@@ -284,7 +284,7 @@ def get_patches_ignore_regex(self):
         regex_string = match.group(1)
         try:
             return re.compile(regex_string)
-        except:
+        except Exception:
             return None
 
     def _create_new_patches_base(self, base):

run_tests.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
-set -ex
+set -exuo pipefail
+
+# avoid possible pytest errors due to precompiled files
+export PYTHONDONTWRITEBYTECODE=1
+find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf || true
 
 PYTHONPATH=. py.test $@
-pep8 rdopkg
+python -m pycodestyle
 ./tests/test_findpkg_integration.sh

setup.cfg

@@ -0,0 +1,2 @@
+[pycodestyle]
+exclude=build,lib,.tox,third,*.egg,docs,packages,.eggs

test-requirements.txt

@@ -1,2 +1,3 @@
 pep8
 pytest
+pycodestyle

tests/test_common.py

@@ -125,6 +125,9 @@ def assert_spec_version(version, release_parts, milestone):
 def norm_changelog(count=1):
     spec = Spec()
     txt, chl = spec.txt.split('%changelog\n')
-    chl, n = re.subn(r'^\* .+\s(\d\S*)$', '* DATE AUTHOR \g<1>', chl, count=count, flags=re.M)
+    chl, n = re.subn(r'^\* .+\s(\d\S*)$',
+                     '* DATE AUTHOR \g<1>',
+                     chl, count=count,
+                     flags=re.M)
     spec._txt = txt + '%changelog\n' + chl
     spec.save()

tests/test_new_version.py

@@ -47,8 +47,10 @@ def test_new_version_basic(tmpdir):
 def test_new_version_milestone(tmpdir):
     steps = [
         ('3.4.5', '3.4.5', ('1', '', DIST_POSTFIX), None),
-        ('4.0.0.0b1', '4.0.0', ('0.1', '%{?milestone}', DIST_POSTFIX), '.0b1'),
-        ('4.0.0.0rc1', '4.0.0', ('0.2', '%{?milestone}', DIST_POSTFIX), '.0rc1'),
+        ('4.0.0.0b1',
+         '4.0.0', ('0.1', '%{?milestone}', DIST_POSTFIX), '.0b1'),
+        ('4.0.0.0rc1',
+         '4.0.0', ('0.2', '%{?milestone}', DIST_POSTFIX), '.0rc1'),
         ('4.0.0', '4.0.0', ('1', '', DIST_POSTFIX), None),
     ]
     _test_new_version('some', tmpdir, steps)

tests/test_patch.py

@@ -43,13 +43,16 @@ def _test_patch(asset, version, dir):
 
 @pytest.mark.skipif('RPM_AVAILABLE == False')
 def test_patch_milestone(tmpdir):
-    _test_patch('milestone', ('1.2.3', ('0.4', '%{?milestone}', DIST_POSTFIX), '.0rc2'), tmpdir)
+    _test_patch('milestone', ('1.2.3', ('0.4', '%{?milestone}',
+                DIST_POSTFIX), '.0rc2'), tmpdir)
 
 
 @pytest.mark.skipif('RPM_AVAILABLE == False')
 def test_patch_milestone_bug(tmpdir):
     # make sure rdopkg removes unwanted '%global milestone %{?milestone}'
-    _test_patch('milestone-bug', ('1.2.3', ('0.4', '', DIST_POSTFIX), None), tmpdir)
+    _test_patch('milestone-bug',
+                ('1.2.3', ('0.4', '', DIST_POSTFIX), None),
+                tmpdir)
 
 
 @pytest.mark.skipif('RPM_AVAILABLE == False')
@@ -126,11 +129,13 @@ def test_patch_noop(tmpdir):
 
 
 def test_patch_noop_detect(tmpdir):
-    _test_patch_noop(tmpdir, 'patched', ['patch', '-l', '--changelog', 'detect'])
+    _test_patch_noop(tmpdir,
+                     'patched', ['patch', '-l', '--changelog', 'detect'])
 
 
 def test_patch_noop_count(tmpdir):
-    _test_patch_noop(tmpdir, 'patched', ['patch', '-l', '--changelog', 'count'])
+    _test_patch_noop(tmpdir,
+                     'patched', ['patch', '-l', '--changelog', 'count'])
 
 
 def test_patch_noop_plain(tmpdir):
@@ -141,7 +146,8 @@ def test_patch_noop_no_bump(tmpdir):
     _test_patch_noop(tmpdir, 'patched', ['patch', '-l', '--no-bump'])
 
 
-def _test_patch_regen(tmpdir, distgit, distgit_after, cmd, norm_changelog=True):
+def _test_patch_regen(tmpdir, distgit, distgit_after,
+                      cmd, norm_changelog=True):
     dist_path = common.prep_spec_test(tmpdir, distgit)
     with dist_path.as_cwd():
         common.prep_patches_branch()
@@ -153,7 +159,8 @@ def _test_patch_regen(tmpdir, distgit, distgit_after, cmd, norm_changelog=True):
         if norm_changelog:
             common.norm_changelog()
     common.assert_distgit(dist_path, distgit_after)
-    assert commit_before != commit_after, "New commit not created after patch regen"
+    assert commit_before != commit_after, \
+        "New commit not created after patch regen"
     assert git_clean, "git not clean after action"
 
 
@@ -162,16 +169,20 @@ def test_patch_regen(tmpdir):
 
 
 def test_patch_regen_detect(tmpdir):
-    _test_patch_regen(tmpdir, 'patched', 'patched-regen', ['patch', '-l', '-C', 'detect'])
+    _test_patch_regen(tmpdir, 'patched', 'patched-regen',
+                      ['patch', '-l', '-C', 'detect'])
 
 
 def test_patch_regen_count(tmpdir):
-    _test_patch_regen(tmpdir, 'patched', 'patched-regen', ['patch', '-l', '-C', 'count'])
+    _test_patch_regen(tmpdir, 'patched', 'patched-regen',
+                      ['patch', '-l', '-C', 'count'])
 
 
 def test_patch_regen_plain(tmpdir):
-    _test_patch_regen(tmpdir, 'patched', 'patched-regen', ['patch', '-l', '--changelog', 'plain'])
+    _test_patch_regen(tmpdir, 'patched', 'patched-regen',
+                      ['patch', '-l', '--changelog', 'plain'])
 
 
 def test_patch_regen_no_bump(tmpdir):
-    _test_patch_regen(tmpdir, 'patched', 'patched', ['patch', '-l', '--no-bump'], norm_changelog=False)
+    _test_patch_regen(tmpdir, 'patched', 'patched',
+                      ['patch', '-l', '--no-bump'], norm_changelog=False)

tests/test_spec.py

@@ -201,7 +201,8 @@ def test_set_patches_base_case_2_minimal():
     assert spec.txt == 'foo\nbaz\n'
 
 
-# found bug where following comment mangles prior line when clearing patches_base
+# found bug where following comment mangles prior line when clearing
+# patches_base
 def test_set_patches_base_case_3_minimal():
     spec = specfile.Spec(txt='foo\n# patches_base=1.2.3\n# bar\nbaz\n')
     spec.set_patches_base_version(None)
@@ -230,7 +231,7 @@ def test_set_patches_base_case_5_minimal():
 
 # patches_base/patches_ignore
 def test_set_patches_base_case_6_minimal():
-    spec = specfile.Spec(txt='Version: 1.2.3\n\n# patches_base=1.2.3\n# patches_ignore=DROP-IN-RPM\n#\nPatch0=foo.patch\n')
+    spec = specfile.Spec(txt='Version: 1.2.3\n\n# patches_base=1.2.3\n# patches_ignore=DROP-IN-RPM\n#\nPatch0=foo.patch\n')  # noqa
     spec.set_patches_base_version(None)
     assert 'Version: 1.2.3\n' in spec.txt
     assert '# patches_ignore=DROP-IN-RPM\n' in spec.txt
@@ -239,7 +240,7 @@ def test_set_patches_base_case_6_minimal():
 
 # patches_ignore/patches_base
 def test_set_patches_base_case_7_minimal():
-    spec = specfile.Spec(txt='Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=1.2.3\n#\nPatch0=foo.patch\n')
+    spec = specfile.Spec(txt='Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=1.2.3\n#\nPatch0=foo.patch\n')  # noqa
     spec.set_patches_base_version(None)
     assert 'Version: 1.2.3\n' in spec.txt
     assert '# patches_ignore=DROP-IN-RPM\n' in spec.txt
@@ -248,7 +249,7 @@ def test_set_patches_base_case_7_minimal():
 
 # patches_ignore/patches_base keep patches_base
 def test_set_patches_base_case_8_minimal():
-    spec = specfile.Spec(txt='Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=\n#\nPatch0=foo.patch\n')
+    spec = specfile.Spec(txt='Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=\n#\nPatch0=foo.patch\n')  # noqa
     spec.set_patches_base_version(None)
     assert '# patches_ignore=DROP-IN-RPM\n' in spec.txt
     assert '# patches_base=1.2.3\n' in spec.txt
@@ -310,7 +311,8 @@ def test_get_magic_comment_minimal_6():
     assert spec.get_magic_comment('foo') is None
 
 
-@pytest.mark.skip('Ignoring eged case until we get more details for expected behavior')
+@pytest.mark.skip(
+    'Ignoring eged case until we get more details for expected behavior')
 def test_get_magic_comment_minimal_7():
     spec = specfile.Spec(txt='# foo=\n')
     assert '' == spec.get_magic_comment('foo')