From b27772891873aa5cbe3a1c7f746cf6cf1fdc6a19 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Jan 07 2023 12:53:53 +0000 Subject: [PATCH 1/4] fix(mirror_project_in): unused 'check' argument removed --- diff --git a/files/mirror_project_in.py b/files/mirror_project_in.py index 7a6a306..a21cc66 100644 --- a/files/mirror_project_in.py +++ b/files/mirror_project_in.py @@ -22,7 +22,7 @@ if "PAGURE_CONFIG" not in os.environ and os.path.exists( _config = pagure.config.reload_config() -def main(check=False, debug=False): +def main(debug=False): """ The function pulls in all the changes from upstream""" session = pagure.lib.model_base.create_session(_config["DB_URL"]) @@ -50,13 +50,6 @@ if __name__ == "__main__": description="Script to send email before the api token expires" ) parser.add_argument( - "--check", - dest="check", - action="store_true", - default=False, - help="Print the some output but does not send any email", - ) - parser.add_argument( "--debug", dest="debug", action="store_true", From 71e58347f706ba694f3073186e832836a79ac166 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Jan 07 2023 12:53:53 +0000 Subject: [PATCH 2/4] fix(mirror_project_in): CLI desc adjusted to reflect script purpose --- diff --git a/files/mirror_project_in.py b/files/mirror_project_in.py index a21cc66..8ea275a 100644 --- a/files/mirror_project_in.py +++ b/files/mirror_project_in.py @@ -47,7 +47,7 @@ def main(debug=False): if __name__ == "__main__": parser = argparse.ArgumentParser( - description="Script to send email before the api token expires" + description="Script to PULL external repositories into local repositories" ) parser.add_argument( "--debug", From e112e2135df5fc5ac5411309bb6c3643d6ae32b2 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Jan 07 2023 12:53:53 +0000 Subject: [PATCH 3/4] refactor(mirror_project_in): reformating based on 'black' findings --- diff --git a/files/mirror_project_in.py b/files/mirror_project_in.py index 8ea275a..e75b0af 100644 --- a/files/mirror_project_in.py +++ b/files/mirror_project_in.py @@ -23,7 +23,7 @@ _config = pagure.config.reload_config() def main(debug=False): - """ The function pulls in all the changes from upstream""" + """The function pulls in all the changes from upstream""" session = pagure.lib.model_base.create_session(_config["DB_URL"]) projects = ( From 196848fe3721aeea431ebe1d13ef8884ce4c7c41 Mon Sep 17 00:00:00 2001 From: Dominik Wombacher Date: Jan 07 2023 12:53:53 +0000 Subject: [PATCH 4/4] refactor(mirror_project_in): address 'flake8' findings files/mirror_project_in.py:6:1: F401 'datetime.datetime' imported but unused files/mirror_project_in.py:6:1: F401 'datetime.timedelta' imported but unused files/mirror_project_in.py:8:1: F401 'sqlalchemy.exc.SQLAlchemyError' imported but unused files/mirror_project_in.py:31:45: E711 comparison to None should be 'if cond is not None:' files/mirror_project_in.py:50:80: E501 line too long (82 > 79 characters) --- diff --git a/files/mirror_project_in.py b/files/mirror_project_in.py index e75b0af..1b9f836 100644 --- a/files/mirror_project_in.py +++ b/files/mirror_project_in.py @@ -3,9 +3,6 @@ from __future__ import print_function, absolute_import import os import argparse -from datetime import datetime, timedelta - -from sqlalchemy.exc import SQLAlchemyError import pagure.config import pagure.lib.model as model @@ -28,7 +25,7 @@ def main(debug=False): session = pagure.lib.model_base.create_session(_config["DB_URL"]) projects = ( session.query(model.Project) - .filter(model.Project.mirrored_from != None) + .filter(model.Project.mirrored_from is not None) .all() ) @@ -47,7 +44,7 @@ def main(debug=False): if __name__ == "__main__": parser = argparse.ArgumentParser( - description="Script to PULL external repositories into local repositories" + description="Script to PULL external repos into local (mirroring)" ) parser.add_argument( "--debug",