(marge) Fix pylint warning (#8)

hiboxsystems · Dec 21, 2022 · ce56eee · ce56eee
1 parent a95f1a1
commit ce56eee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/marge/single_merge_job.py b/marge/single_merge_job.py
@@ -58,7 +58,7 @@ def update_merge_request_and_accept(self, approvals):
                     source_repo_url=source_repo_url,
                 )
             except GitLabRebaseResultMismatch as err:
-                log.info("Gitlab rebase didn't give expected result: " + err.reason)
+                log.info("Gitlab rebase didn't give expected result: %r", err.reason)
                 merge_request.comment("Someone skipped the queue! Will have to try again...")
                 continue
 

diff --git a/requirements_frozen.txt b/requirements_frozen.txt
@@ -10,6 +10,11 @@ dateparser==1.0.0
 flake8==3.8.4
 humanize==3.2.0
 idna==2.10
+
+# Workaround for AttributeError: 'EntryPoints' object has no attribute 'get'
+# More details: https://stackoverflow.com/a/73932581/227779
+importlib-metadata==4.8.3
+
 iniconfig==1.1.1
 isort==5.7.0
 lazy-object-proxy==1.5.2