Reapply "Make flake8 happy"

This reverts commit 3302522.

Author: sdruskat

.flake8

@@ -5,3 +5,5 @@
 [flake8]
 max-complexity = 15
 max-line-length = 120
+per-file-ignores =
+    src/hermes/commands/marketplace.py:E231

src/hermes/commands/deposit/invenio.py

@@ -152,7 +152,7 @@ def resolve_doi(self, doi) -> str:
         :return: The record ID on the respective instance.
         """
 
-        res = self.client.get(f'https://doi.org/{doi}')
+        res = self.client.get(f'https://doi.org/{doi}')  # noqa E231
 
         # This is a mean hack due to DataCite answering a 404 with a 200 status
         if res.url == 'https://datacite.org/404.html':

src/hermes/commands/harvest/cff.py

@@ -80,7 +80,7 @@ def _convert_cff_to_codemeta(self, cff_data: str) -> t.Any:
     def _validate(self, cff_file: pathlib.Path, cff_dict: t.Dict) -> bool:
         audit_log = logging.getLogger('audit.cff')
 
-        cff_schema_url = f'https://citation-file-format.github.io/{_CFF_VERSION}/schema.json'
+        cff_schema_url = f'https://citation-file-format.github.io/{_CFF_VERSION}/schema.json'  # noqa E231
 
         # TODO: we should ship the schema we reference to by default to avoid unnecessary network traffic.
         #       If the requested version is not already downloaded, go ahead and download it.
@@ -101,7 +101,7 @@ def _validate(self, cff_file: pathlib.Path, cff_dict: t.Dict) -> bool:
             audit_log.info('')
             audit_log.info('See the Citation File Format schema guide for further details:')
             audit_log.info(
-                f'<https://github.com/citation-file-format/citation-file-format/blob/{_CFF_VERSION}/schema-guide.md>.')
+                f'<https://github.com/citation-file-format/citation-file-format/blob/{_CFF_VERSION}/schema-guide.md>.')  # noqa E231
             return False
 
         elif len(errors) == 0:

src/hermes/commands/init/base.py

@@ -99,7 +99,7 @@ def get_git_hoster_from_url(url: str) -> GitHoster:
     Returns the matching GitHoster value to the given url. Returns GitHoster.Empty if none is found.
     """
     parsed_url = urlparse(url)
-    git_base_url = f"{parsed_url.scheme}://{parsed_url.netloc}/"
+    git_base_url = f"{parsed_url.scheme}://{parsed_url.netloc}/"  # noqa E231
     if "github.com" in url:
         return GitHoster.GitHub
     elif connect_gitlab.is_url_gitlab(git_base_url):

src/hermes/commands/init/util/connect_github.py

@@ -49,7 +49,7 @@ def allow_actions(project_url: str, token):
     repo_name = url_split[-1]
 
     # GitHub API URLs
-    repo_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}"
+    repo_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}"  # noqa E231
     action_permissions_url = f"{repo_url}/actions/permissions/workflow"
 
     # Headers for GitHub API requests
@@ -89,7 +89,7 @@ def create_secret(project_url: str, secret_name: str, secret_value, token):
     repo_name = url_split[-1]
 
     # GitHub API URLs
-    repo_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}"
+    repo_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}"  # noqa E231
     public_key_url = f"{repo_url}/actions/secrets/public-key"
     secrets_url = f"{repo_url}/actions/secrets/{secret_name}"
 

src/hermes/commands/init/util/connect_gitlab.py

@@ -16,7 +16,7 @@
 
 site_specific_oauth_clients = [
     {
-        "url": "https://gitlab.com/",
+        "url": "https://gitlab.com/",  # noqa E231
         "client_id": "1133e9cee188c31bd68c9d0e8531774a4aae9d2458e13d83e67991213f868007",
         "name_addition": "gitlab.com"
     }, {
@@ -33,14 +33,14 @@
 
 def is_url_gitlab(url: str) -> bool:
     parsed_url = urlparse(url)
-    return requests.get(f"{parsed_url.scheme}://{parsed_url.netloc}/api/v4/version").status_code == 401
+    return requests.get(f"{parsed_url.scheme}://{parsed_url.netloc}/api/v4/version").status_code == 401  # noqa E231
 
 
 class GitLabConnection:
     def __init__(self, project_url: str):
         self.project_url: str = project_url
         parsed_url = urlparse(project_url)
-        self.base_url: str = f"{parsed_url.scheme}://{parsed_url.netloc}/"
+        self.base_url: str = f"{parsed_url.scheme}://{parsed_url.netloc}/"  # noqa E231
         self.api_url: str = urljoin(self.base_url, "api/v4/")
         self.project_namespace_name: str = parsed_url.path.removeprefix("/")
         self.gitlab_instance_name: str = f"GitLab ({parsed_url.netloc})"

src/hermes/commands/init/util/oauth_process.py

@@ -92,7 +92,7 @@ def open_browser(self, port: int = None) -> bool:
         if DEACTIVATE_BROWSER_OPENING:
             return False
         port = port or self.local_port
-        return webbrowser.open(f'http://localhost:{port}')
+        return webbrowser.open(f'http://localhost:{port}')  # noqa E231
 
     def get_tokens_from_refresh_token(self, refresh_token: str) -> dict[str: str]:
         """Returns access and refresh token as dict using a refresh token"""

src/hermes/commands/init/util/slim_click.py

@@ -137,9 +137,9 @@ def choose(text: str, options: list[str], default: int = 0) -> int:
     assert 0 <= default < len(options), "Default index should match the options list."
     echo(text)
     for i, option in enumerate(options):
-        index = f"{i:>2d}"
+        index = f"{i:>2d}"  # noqa E231
         if i == default:
-            index = f"*{i:>1d}"
+            index = f"*{i:>1d}"  # noqa E231
         print(f"[{index}] {option}")
     while True:
         chosen_index = -1
@@ -171,7 +171,7 @@ def next_step(description: str):
 def create_console_hyperlink(url: str, word: str) -> str:
     """Use this to have a consistent display of hyperlinks."""
     if USE_FANCY_HYPERLINKS:
-        return f"\033]8;;{url}\033\\{word}\033]8;;\033\\"
+        return f"\033]8;;{url}\033\\{word}\033]8;;\033\\"    # noqa E231,E702
     return f"{word} ({url})"
 
 

src/hermes/commands/postprocess/invenio.py

@@ -34,8 +34,9 @@ def cff_doi(ctx):
     try:
         cff = yaml.load(open('CITATION.cff', 'r'), yaml.Loader)
         new_identifier = {
-                'description': f"DOI for the published version {deposition['metadata']['version']} "
-                               f"[generated by hermes]",
+                'description': "DOI for the published version "
+                f"{deposition['metadata']['version']} "
+                "[generated by hermes]",
                 'type': 'doi',
                 'value': deposition['doi']
             }