Linting fixes.

Author: elibon99

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+ignore = E203, W503

.pre-commit-config.yaml

@@ -3,6 +3,7 @@ repos:
   rev: 6.0.0
   hooks:
     - id: flake8
+      exclude: ^tests/
 - repo: https://github.com/psf/black
   rev: 22.12.0
   hooks:

gitbark/bark_core/parents/invalid_parents.py

@@ -50,7 +50,8 @@ def validate_invalid_parents(
     invalid_parents = []
 
     for parent in parents:
-        if not cache.get(parent.hash).valid:
+        value = cache.get(parent.hash)
+        if value and not value.valid:
             invalid_parents.append(parent)
 
     if len(invalid_parents) == 0:
@@ -59,6 +60,6 @@ def validate_invalid_parents(
     invalid_parent_hashes = [parent.hash for parent in invalid_parents]
     commit_msg = commit.get_commit_message()
     for hash in invalid_parent_hashes:
-        if not hash in commit_msg:
+        if hash not in commit_msg:
             return False
     return True

gitbark/bark_core/signatures/commands/add_approvals_cmd.py

@@ -22,6 +22,9 @@
 import re
 import sys
 import click
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 @click.command()
@@ -31,7 +34,7 @@ def add_approvals(ctx, commit_msg_file):
     """
     Include approvals in a merge commit message.
 
-    NOTE: This command should only be invoked as part of a 
+    NOTE: This command should only be invoked as part of a
     prepare-commit-msg hook.
 
     \b
@@ -44,37 +47,38 @@ def add_approvals(ctx, commit_msg_file):
     try:
         merge_head_hash = repo.revparse_single("MERGE_HEAD").id.__str__()
         merge_head = Commit(merge_head_hash)
-    except:
+    except Exception:
         return
-    
+
     head = Commit(repo.revparse_single("HEAD").id)
     threshold = get_approval_threshold(head)
     if not threshold:
         return
-    
+
     approvals = get_approvals(merge_head, project)
     if len(approvals) < threshold:
         raise CliFail(
-            f"Found {len(approvals)} approvals for {merge_head.hash} but expected {threshold}."
+            f"Found {len(approvals)} approvals for {merge_head.hash} "
+            "but expected {threshold}."
         )
-    
+
     click.echo(f"Found {len(approvals)} approvals for {merge_head.hash}!")
     sys.stdin = open("/dev/tty", "r")
     click.confirm(
         "Do you want to include them in the merge commit message?",
         abort=True,
-        err=True
+        err=True,
     )
     write_approvals_to_commit_msg(
-        approvals,
-        commit_msg_file,
-        project.project_path,
-        merge_head
+        approvals, commit_msg_file, project.project_path, merge_head
     )
 
 
 def write_approvals_to_commit_msg(
-    approvals: list[str], commit_msg_file: str, project_path: str, merge_head: Commit
+    approvals: list[str],
+    commit_msg_file: str,
+    project_path: str,
+    merge_head: Commit,
 ):
     with open(f"{project_path}/{commit_msg_file}", "w") as f:
         f.write("\n" * 2)
@@ -101,8 +105,8 @@ def get_approvals(merge_head: Commit, project):
     # Try to fetch approvals from remote
     try:
         cmd("git", "origin", "fetch", "refs/signatures/*:refs/signatures/*")
-    except:
-        pass
+    except Exception:
+        logger.error("Failed to fetch from 'refs/signatures'")
 
     references = repo.references.iterator()
     approvals = []

gitbark/bark_core/signatures/commands/approve_cmd.py

@@ -22,6 +22,7 @@
 import os
 import click
 
+
 class KeyType(Enum):
     GPG = 1
     SSH = 2
@@ -44,32 +45,23 @@ def click_parse_commit(ctx, param, val):
     except Exception:
         raise CliFail(f"{val} is not a valid commit object!")
 
+
 @click.command()
 @click.pass_context
 @click.argument("commit", default="HEAD", callback=click_parse_commit)
-@click.option(
-    "--gpg-key-id",
-    type=str,
-    default="",
-    help="The GPG key ID."
-)
+@click.option("--gpg-key-id", type=str, default="", help="The GPG key ID.")
 @click.option(
     "--ssh-key-path",
     type=str,
     default="",
-    help="The path to your private SSH key."
+    help="The path to your private SSH key.",
 )
-def approve(
-    ctx,
-    commit,
-    gpg_key_id,
-    ssh_key_path
-):
+def approve(ctx, commit, gpg_key_id, ssh_key_path):
     """Add your signature to a commit.
 
-    This will create a signature over a given commit object, that 
+    This will create a signature over a given commit object, that
     is stored under `refs/signatures`.
-    
+
     \b
     COMMIT the commit to sign.
     """

gitbark/bark_core/signatures/require_approval.py

@@ -38,17 +38,18 @@ def validate(self, commit: Commit) -> bool:
 
 def require_approval(commit: Commit, threshold: int, authorized_pubkeys: list[Pubkey]):
     """
-    Verifies that the parent from the merged branch contains a threshold of approvals. These approvals are detached signatures
-    included in the merge commit message.
+    Verifies that the parent from the merged branch contains a threshold of approvals.
+    These approvals are detached signatures included in the merge commit message.
 
-    Note: The second parent of a merge request will always be the parent of the merged branch.
+    Note: The second parent of a merge request will always be the parent
+    of the merged branch.
     """
     parents = commit.get_parents()
     violation = ""
 
     if len(parents) <= 1:
         # Require approval can only be applied on pull requests
-        violation = f"Commit does not originate from a pull request"
+        violation = "Commit does not originate from a pull request"
         return False, violation
 
     # The merge head

gitbark/bark_core/signatures/require_signature.py

@@ -36,7 +36,7 @@ def require_signature(commit: Commit, authorized_pubkeys: list[Pubkey]):
 
     if not signature:
         # No signature
-        violation = f"Commit was not signed"
+        violation = "Commit was not signed"
         return False, violation
 
     if len(authorized_pubkeys) == 0:

gitbark/bark_core/signatures/util.py

@@ -18,12 +18,12 @@ def _parse_pubkey(self, pubkey: str) -> Union[PGPKey, PKey]:
             key, _ = PGPKey.from_blob(pubkey)
             fingerprint = str(key.fingerprint)
             return key, fingerprint
-        except:
+        except Exception:
             pass
         try:
             key = PKey(data=pubkey)
             fingerprint = key.fingerprint.split(":")[1]
-        except:
+        except Exception:
             pass
         raise ValueError("Could not parse public key!")
 
@@ -45,7 +45,7 @@ def verify_pgp_signature(pubkey: PGPKey, signature: Any, subject: Any) -> bool:
             return True
         else:
             return False
-    except:
+    except Exception:
         return False
 
 

gitbark/cli/__main__.py

@@ -25,7 +25,7 @@
     CliFail,
     handle_exit,
     get_root,
-    _add_subcommands
+    _add_subcommands,
 )
 
 from typing import Optional
@@ -79,7 +79,6 @@ def install(ctx):
 
     if report.is_repo_valid():
         click.echo("Installed GitBark successfully!")
-        
 
     handle_exit(report)
 
@@ -168,7 +167,6 @@ def verify(ctx, branch, ref_update, all, bootstrap):
     if not is_installed(project):
         click.echo('Error: Bark is not installed! Run "bark install" first!')
         exit(1)
-    # store = ctx.obj["store"]
 
     head = None
     if not all:
@@ -185,8 +183,6 @@ def verify(ctx, branch, ref_update, all, bootstrap):
         elif not ref_update:
             click.echo(f"{branch} is in a valid state!")
 
-        # store.update_project(project)
-
     handle_exit(report)
 
 

gitbark/cli/util.py

@@ -77,6 +77,7 @@ def inner(ctx, param, val):
 
     return wrap
 
+
 def get_root() -> str:
     try:
         root = os.path.abspath(cmd("git", "rev-parse", "--show-toplevel")[0])
@@ -85,19 +86,20 @@ def get_root() -> str:
             "Failed to find Git repository! Make sure "
             "you are not inside the .git directory."
         )
-    
+
     return root
 
+
 def _add_subcommands(group: click.Group):
     try:
         toplevel = get_root()
         project = Project(toplevel)
         globals.init(toplevel)
         if not is_installed(project):
             return
-    except:
+    except Exception:
         return
-    
+
     bark_rules = get_bark_rules(project)
     subcommand_entrypoints = project.get_subcommand_entrypoints(bark_rules)
     for entrypoint in subcommand_entrypoints:
@@ -107,23 +109,25 @@ def _add_subcommands(group: click.Group):
             group.add_command(ep.resolve())
         except Exception as e:
             raise e
-        
-            
+
+
 def verify_bootstrap(project: Project):
     repo = project.repo
     if not repo.lookup_branch("branch_rules"):
         raise CliFail('Error: The "branch_rules" branch has not been created!')
 
+
 def is_local_branch(branch: str):
     return branch.startswith("refs/heads")
 
+
 def restore_incoming_changes():
     try:
         cmd("git", "restore", "--staged", ".")
         cmd("git", "restore", ".")
-    except:
+    except Exception:
         pass
-    
+
 
 def handle_exit(report: Report):
     exit_status = 0

gitbark/commands/verify.py

@@ -81,7 +81,8 @@ def verify(
 ) -> Report:
     """Verifies a branch or the entire repository.
 
-    If `all` is set, the entire repository will be validated. Otherwise `branch` will be validated.
+    If `all` is set, the entire repository will be validated. Otherwise
+    `branch` will be validated.
     """
     report = Report()