Merge pull request #13 from sclorg/fix_logging_reamd

Fix logging reamd

Author: phracek

.auto-merger.yaml

@@ -25,4 +25,4 @@ github:
   approval_labels:
     - "READY-to-MERGE"
 gitlab:
-  namespace: "redhat/rhel/containers"
+  namespace: "redhat/rhel/containers"

.github/workflows/python-tests.yml

@@ -13,7 +13,7 @@ jobs:
     name: Tox test
     strategy:
       matrix:
-        tox_env: [py38, py39, py310, py311, py312]
+        tox_env: [py311, py312, py313]
     # Use GitHub's Linux Docker host
     runs-on: ubuntu-latest
     steps:

.pre-commit-config.yaml

@@ -4,7 +4,7 @@
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v4.4.0
     hooks:
     - id: check-added-large-files
     - id: check-ast
@@ -13,11 +13,19 @@ repos:
     - id: detect-private-key
     - id: end-of-file-fixer
     - id: trailing-whitespace
-    - id: flake8
-      args:
-        - --max-line-length=120
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.711
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
     hooks:
-    -   id: mypy
-        args: [--no-strict-optional, --ignore-missing-imports]
+    -   id: flake8
+        additional_dependencies: [
+            "flake8-blind-except==0.2.0",
+            "flake8-mutable==1.2.0",
+            "pep8-naming==0.11.1",
+        ]
+        args:
+            - --max-line-length=120
+-   repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+    -   id: black
+        args: [--line-length=120]

README.md

@@ -82,36 +82,25 @@ the email service is configured, then the results are send to corresponding emai
 
 # Automatic pull request merger
 
-This option is used for analysation pull request in the specific namespace and repositories mentioned
+This option is used for analyzation pull request in the specific namespace and repositories mentioned
 in configuration file. At the end `auto-merger` provides the output into command line.
 
 ```bash
-$ auto-merger pr-checker --help
-Usage: auto-merger pr-checker [OPTIONS]
+$ auto-merger merger --help
+Usage: auto-merger merger [OPTIONS]
 
 Options:
   --send-email TEXT  Specify email addresses to which the mail will be sent.
   --help             Show this message and exit.
 
 ```
 
-The real output from `auto-merger pr-checker` could be:
+The real output from `auto-merger merger` could be:
 ```bash
-s2i-ruby-container
-------
-
-https://github.com/sclorg/s2i-ruby-container/pull/570 pr/missing-review pr/failing-ci
-https://github.com/sclorg/s2i-ruby-container/pull/569 dependencies ruby pr/missing-review
+SUMMARY
+https://github.com/sclorg/mariadb-container/pull/262 -> CAN BE MERGED
+Let's try to merge 262....
 
-s2i-nodejs-container
-------
-
-https://github.com/sclorg/s2i-nodejs-container/pull/463 pr/missing-review pr/failing-ci
-https://github.com/sclorg/s2i-nodejs-container/pull/236 pr/missing-review
-
-
-Pull requests that can be merged or missing 2 approvals
-https://github.com/sclorg/s2i-python-container/pull/574 - Missing 2 APPROVAL
 ```
 
 In case user specifies `--send-email`, multipletimes, and the system where is auto-merger running

auto-merger

@@ -37,6 +37,7 @@ from auto_merger.exceptions import AutoMergerConfigException
 
 logger = logging.getLogger("auto-merger")
 
+
 @click.group("auto-merger")
 @click.option("-d", "--debug", is_flag=True, default=False, help="Enable debug logs")
 @click.pass_context
@@ -56,12 +57,14 @@ def auto_merger(ctx, debug):
         sys.exit(10)
     ctx.obj = c
     logger.debug(f"auto_merger Debug: {ctx.obj.debug}")
+    ctx.obj.debug = debug
     if ctx.obj.debug:
         setup_logger(level=logging.DEBUG)
     else:
         setup_logger(level=logging.INFO)
     logger.debug("Let's get analyses")
 
+
 auto_merger.add_command(pr_checker)
 auto_merger.add_command(merger)
 

auto_merger/api.py

@@ -22,18 +22,18 @@
 
 import logging
 
-from typing import List
-
 from auto_merger.pr_checker import PRStatusChecker
 from auto_merger.config import Config
 from auto_merger.merger import AutoMerger
 
-logger = logging.getLogger("auto-merger")
+logger = logging.getLogger(__name__)
+
 
-def pull_request_checker(config: Config, send_email: List[str]) -> int:
+def pull_request_checker(config: Config, send_email: list[str] | None) -> int:
     """
     Checks NVR from brew build against pulp
     """
+    logger.debug(f"Configuration: {config.__str__()}")
     pr_status_checker = PRStatusChecker(config=config)
     ret_value = pr_status_checker.check_all_containers()
     if ret_value != 0:
@@ -46,8 +46,8 @@ def pull_request_checker(config: Config, send_email: List[str]) -> int:
     return ret_value
 
 
-def merger(config: Config, send_email: List[str]) -> int:
-    logger.debug(f"merger: {config.__str__()}")
+def merger(config: Config, send_email: list[str] | None) -> int:
+    logger.debug(f"Configuration: {config.__str__()}")
     auto_merger = AutoMerger(config=config)
     ret_value = auto_merger.check_all_containers()
     if ret_value != 0:
@@ -57,4 +57,4 @@ def merger(config: Config, send_email: List[str]) -> int:
     if send_email:
         if not auto_merger.send_results(send_email):
             return 1
-    return ret_value
+    return ret_value

auto_merger/cli/merger.py

@@ -28,13 +28,17 @@
 from auto_merger.config import pass_config
 from auto_merger import api
 
-logger = logging.getLogger("auto-merger")
+
+logger = logging.getLogger(__name__)
+
 
 @click.command("merger")
-@click.option("--send-email", multiple=True, help="Specify email addresses to which the mail will be sent.")
+@click.option(
+    "--send-email",
+    multiple=True,
+    help="Specify email addresses to which the mail will be sent.",
+)
 @pass_config
 def merger(config, send_email):
-
     ret_value = api.merger(config=config, send_email=send_email)
     sys.exit(ret_value)
-

auto_merger/cli/pr_checker.py

@@ -32,9 +32,12 @@
 
 
 @click.command("pr-checker")
-@click.option("--send-email", multiple=True, help="Specify email addresses to which the mail will be sent.")
+@click.option(
+    "--send-email",
+    multiple=True,
+    help="Specify email addresses to which the mail will be sent.",
+)
 @pass_config
 def pr_checker(config, send_email):
     ret_value = api.pull_request_checker(config=config, send_email=send_email)
     sys.exit(ret_value)
-

auto_merger/config.py

@@ -21,26 +21,23 @@
 # SOFTWARE.
 
 import logging
-import yaml
 import click
 
 from yaml import safe_load
 
 from pathlib import Path
-from typing import Dict
 
-from auto_merger.exceptions import AutoMergerConfigException, AutoMergerNetworkException
+from auto_merger.exceptions import AutoMergerConfigException
 
 
 logger = logging.getLogger("auto-merger")
 
 
 class Config:
-
     def __init__(self):
         self.debug: bool = True
-        self.github: Dict = {}
-        self.gitlab: Dict = {}
+        self.github: dict = {}
+        self.gitlab: dict = {}
 
     @classmethod
     def get_default_config(cls) -> "Config":
@@ -70,7 +67,7 @@ def get_from_dict(cls, raw_dict: dict) -> "Config":
         return config
 
     def __repr__(self):
-        return f"Config(debug={self.debug}, github={self.github}, " \
-               f"gitlab={self.gitlab})"
+        return f"Config(debug={self.debug}, github={self.github}, " f"gitlab={self.gitlab})"
+
 
 pass_config = click.make_pass_decorator(Config)

auto_merger/email.py

@@ -23,20 +23,20 @@
 import smtplib
 import logging
 
-from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import List
 
 logger = logging.getLogger(__name__)
 
-class EmailSender:
 
-    def __init__(self, recipient_email: List[str] = None):
+class EmailSender:
+    def __init__(self, recipient_email=None):
+        if recipient_email is None:
+            recipient_email = []
         self.recipient_email = recipient_email
         self.mime_msg = MIMEMultipart()
         self.send_from = ""
-        self.send_to = ""
+        self.send_to = [""]
 
     def create_email_msg(self, subject_msg: str):
         if not self.recipient_email:
@@ -50,14 +50,17 @@ def create_email_msg(self, subject_msg: str):
         self.mime_msg["To"] = ", ".join(self.send_to)
         self.mime_msg["Subject"] = subject_msg
 
-    def send_email(self, subject_msg, body: List[str] = None):
+    def send_email(self, subject_msg, body=None):
+        if body is None:
+            body = []
         whole_body = "".join(body)
-        msg = ("<html><head><style>table, th, td {border: 1px solid black;}</style></head>"
-               f"<body>{whole_body}</body></html>")
+        msg = (
+            "<html><head><style>table, th, td {border: 1px solid black;}</style></head>"
+            f"<body>{whole_body}</body></html>"
+        )
         self.create_email_msg(subject_msg)
         self.mime_msg.attach(MIMEText(msg, "html"))
         smtp = smtplib.SMTP("127.0.0.1")
         smtp.sendmail(self.send_from, self.send_to, self.mime_msg.as_string())
         smtp.close()
-        print("Sending email finished")
-
+        logger.info("Sending email finished")