From 9a0379f51837b26cf5521afb48e19209f99fef76 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen <louistw@uab.edu> Date: Tue, 7 Jun 2022 14:32:23 -0500 Subject: [PATCH] Fix pylint wrong-import-order --- account_manager.py | 9 +++++---- agent_template.py | 1 + create_account.py | 5 +++-- dev_rmq_agents/ohpc_account_create.py | 3 ++- dev_rmq_agents/ood_account_create.py | 3 ++- dev_rmq_agents/slurm_agent.py | 3 ++- flask_producer.py | 8 +++++--- init_user_state.py | 8 +++++--- prod_rmq_agents/acct_mgmt_workflow.py | 9 +++++---- prod_rmq_agents/dir_verify.py | 7 ++++--- prod_rmq_agents/expire_account.py | 12 +++++++----- prod_rmq_agents/get-next-uid-gid.py | 9 +++++---- prod_rmq_agents/git_commit.py | 8 +++++--- prod_rmq_agents/new_jobs.py | 10 ++++++---- prod_rmq_agents/notify_user.py | 10 ++++++---- prod_rmq_agents/ssh_access.py | 10 ++++++---- prod_rmq_agents/subscribe_mail_lists.py | 5 +++-- prod_rmq_agents/task_manager.py | 10 ++++++---- prod_rmq_agents/user_reg_event_logger.py | 1 + prod_rmq_agents/user_reg_logger.py | 6 ++++-- prod_rmq_agents/user_state.py | 8 +++++--- rc_rmq.py | 4 +++- rc_util.py | 16 +++++++++------- user_auth.py | 3 ++- 24 files changed, 102 insertions(+), 66 deletions(-) diff --git a/account_manager.py b/account_manager.py index 109a516..1604784 100755 --- a/account_manager.py +++ b/account_manager.py @@ -1,14 +1,15 @@ #!/usr/bin/env python3 -import json -import rc_util import argparse +import json import signal +import time import uuid + import pika + +import rabbit_config as rcfg import rc_util from rc_rmq import RCRMQ -import rabbit_config as rcfg -import time parser = argparse.ArgumentParser(description = "Account management driver script") parser.add_argument( diff --git a/agent_template.py b/agent_template.py index 7858bdb..16176c4 100644 --- a/agent_template.py +++ b/agent_template.py @@ -1,5 +1,6 @@ #!/usr/bin/env python import json + from rc_rmq import RCRMQ task = "task_name" diff --git a/create_account.py b/create_account.py index 42668c3..a329977 100755 --- a/create_account.py +++ b/create_account.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 -import json -import rc_util import argparse +import json import signal +import rc_util + parser = argparse.ArgumentParser() parser.add_argument("username", help="username that will be created") parser.add_argument("email", nargs="?", default="", help="User's email") diff --git a/dev_rmq_agents/ohpc_account_create.py b/dev_rmq_agents/ohpc_account_create.py index 5cdabd5..fa83fe6 100644 --- a/dev_rmq_agents/ohpc_account_create.py +++ b/dev_rmq_agents/ohpc_account_create.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -import sys import json import subprocess +import sys from pwd import getpwnam + from rc_rmq import RCRMQ task = "ohpc_account" diff --git a/dev_rmq_agents/ood_account_create.py b/dev_rmq_agents/ood_account_create.py index de4ed8a..57e7a9b 100644 --- a/dev_rmq_agents/ood_account_create.py +++ b/dev_rmq_agents/ood_account_create.py @@ -1,7 +1,8 @@ #!/usr/bin/env python -import sys import json import subprocess +import sys + from rc_rmq import RCRMQ task = "ood_account" diff --git a/dev_rmq_agents/slurm_agent.py b/dev_rmq_agents/slurm_agent.py index f6c4350..c40dac1 100755 --- a/dev_rmq_agents/slurm_agent.py +++ b/dev_rmq_agents/slurm_agent.py @@ -1,7 +1,8 @@ #!/usr/bin/env python -import sys import json import subprocess +import sys + from rc_rmq import RCRMQ task = "slurm_account" diff --git a/flask_producer.py b/flask_producer.py index 908b57f..8cea3af 100755 --- a/flask_producer.py +++ b/flask_producer.py @@ -1,8 +1,10 @@ #!/usr/bin/env python -import pika -import sys -import socket import json +import socket +import sys + +import pika + import rabbit_config as rcfg if len(sys.argv) < 3: diff --git a/init_user_state.py b/init_user_state.py index 54ba947..f539d2c 100644 --- a/init_user_state.py +++ b/init_user_state.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 import argparse -import dataset -import sys import subprocess +import sys +from datetime import datetime + +import dataset + import rabbit_config as rcfg import rc_util -from datetime import datetime parser = argparse.ArgumentParser() parser.add_argument("-f", "--force", action="store_true", help="force update") diff --git a/prod_rmq_agents/acct_mgmt_workflow.py b/prod_rmq_agents/acct_mgmt_workflow.py index 124af99..79a60f9 100755 --- a/prod_rmq_agents/acct_mgmt_workflow.py +++ b/prod_rmq_agents/acct_mgmt_workflow.py @@ -1,14 +1,15 @@ #!/usr/bin/env python3 -import json -import rc_util import argparse +import json import signal +import time import uuid + import pika + +import rabbit_config as rcfg import rc_util from rc_rmq import RCRMQ -import rabbit_config as rcfg -import time task = "acctmgr" diff --git a/prod_rmq_agents/dir_verify.py b/prod_rmq_agents/dir_verify.py index 4b768c9..7493ed7 100644 --- a/prod_rmq_agents/dir_verify.py +++ b/prod_rmq_agents/dir_verify.py @@ -1,10 +1,11 @@ #!/usr/bin/env python -import os import json -import rc_util +import os from pathlib import Path -from rc_rmq import RCRMQ + import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "dir_verify" dirs = rcfg.User_dirs diff --git a/prod_rmq_agents/expire_account.py b/prod_rmq_agents/expire_account.py index 94e4212..b8de124 100644 --- a/prod_rmq_agents/expire_account.py +++ b/prod_rmq_agents/expire_account.py @@ -1,13 +1,15 @@ #!/usr/bin/env python -import os import json -import pika -import rc_util +import os +from datetime import date, timedelta from os import popen from pathlib import Path -from rc_rmq import RCRMQ + +import pika + import rabbit_config as rcfg -from datetime import date, timedelta +import rc_util +from rc_rmq import RCRMQ task = "expire_account" diff --git a/prod_rmq_agents/get-next-uid-gid.py b/prod_rmq_agents/get-next-uid-gid.py index 03cb51f..fdad2e3 100644 --- a/prod_rmq_agents/get-next-uid-gid.py +++ b/prod_rmq_agents/get-next-uid-gid.py @@ -1,12 +1,13 @@ #!/usr/bin/env python import json +import shlex import time -import rc_util from os import popen -from rc_rmq import RCRMQ -import rabbit_config as rcfg from subprocess import run -import shlex + +import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "create_account" diff --git a/prod_rmq_agents/git_commit.py b/prod_rmq_agents/git_commit.py index c8665c1..5e1f40f 100644 --- a/prod_rmq_agents/git_commit.py +++ b/prod_rmq_agents/git_commit.py @@ -1,11 +1,13 @@ #!/usr/bin/env python +import json import os +import time + import sh -import json + +import rabbit_config as rmq_cfg import rc_util from rc_rmq import RCRMQ -import rabbit_config as rmq_cfg -import time task = "git_commit" diff --git a/prod_rmq_agents/new_jobs.py b/prod_rmq_agents/new_jobs.py index 2d3280d..f8d9abe 100644 --- a/prod_rmq_agents/new_jobs.py +++ b/prod_rmq_agents/new_jobs.py @@ -1,12 +1,14 @@ #!/usr/bin/env python -import os import json -import pika -import rc_util +import os from os import popen from pathlib import Path -from rc_rmq import RCRMQ + +import pika + import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "new_jobs" diff --git a/prod_rmq_agents/notify_user.py b/prod_rmq_agents/notify_user.py index d204bad..802807a 100644 --- a/prod_rmq_agents/notify_user.py +++ b/prod_rmq_agents/notify_user.py @@ -1,13 +1,15 @@ #!/usr/bin/env python import json -import rc_util import smtplib +from datetime import datetime + import dataset -from rc_rmq import RCRMQ +import mail_config as mail_cfg from jinja2 import Template -from datetime import datetime + import rabbit_config as rcfg -import mail_config as mail_cfg +import rc_util +from rc_rmq import RCRMQ task = "notify_user" diff --git a/prod_rmq_agents/ssh_access.py b/prod_rmq_agents/ssh_access.py index e289e57..fea6eac 100644 --- a/prod_rmq_agents/ssh_access.py +++ b/prod_rmq_agents/ssh_access.py @@ -1,12 +1,14 @@ #!/usr/bin/env python -import os import json -import pika -import rc_util +import os from os import popen from pathlib import Path -from rc_rmq import RCRMQ + +import pika + import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "ssh_access" diff --git a/prod_rmq_agents/subscribe_mail_lists.py b/prod_rmq_agents/subscribe_mail_lists.py index a70d007..4629b10 100644 --- a/prod_rmq_agents/subscribe_mail_lists.py +++ b/prod_rmq_agents/subscribe_mail_lists.py @@ -1,10 +1,11 @@ #!/usr/bin/env python import json import smtplib -import rc_util from email.message import EmailMessage -from rc_rmq import RCRMQ + import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "subscribe_mail_list" diff --git a/prod_rmq_agents/task_manager.py b/prod_rmq_agents/task_manager.py index 3b82f83..df04f40 100644 --- a/prod_rmq_agents/task_manager.py +++ b/prod_rmq_agents/task_manager.py @@ -2,14 +2,16 @@ import copy import json import signal -import dataset -import rc_util import smtplib -from rc_rmq import RCRMQ -from jinja2 import Template from datetime import datetime + +import dataset import mail_config as mail_cfg +from jinja2 import Template + import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "task_manager" timeout = 30 diff --git a/prod_rmq_agents/user_reg_event_logger.py b/prod_rmq_agents/user_reg_event_logger.py index 177b2c9..606b24f 100644 --- a/prod_rmq_agents/user_reg_event_logger.py +++ b/prod_rmq_agents/user_reg_event_logger.py @@ -1,5 +1,6 @@ #!/usr/bin/env python import json + from rc_rmq import RCRMQ task = "user_reg_event_log" diff --git a/prod_rmq_agents/user_reg_logger.py b/prod_rmq_agents/user_reg_logger.py index ea8f9ee..568bee1 100755 --- a/prod_rmq_agents/user_reg_logger.py +++ b/prod_rmq_agents/user_reg_logger.py @@ -1,10 +1,12 @@ #!/usr/bin/env python import json +from datetime import datetime + import dataset + +import rabbit_config as rcfg import rc_util from rc_rmq import RCRMQ -from datetime import datetime -import rabbit_config as rcfg # Define queue name task = "reg_logger" diff --git a/prod_rmq_agents/user_state.py b/prod_rmq_agents/user_state.py index 208af16..8a05f45 100644 --- a/prod_rmq_agents/user_state.py +++ b/prod_rmq_agents/user_state.py @@ -1,11 +1,13 @@ #!/usr/bin/env python import json -import rc_util +from datetime import datetime + import dataset import pika -from rc_rmq import RCRMQ -from datetime import datetime + import rabbit_config as rcfg +import rc_util +from rc_rmq import RCRMQ task = "user_state" diff --git a/rc_rmq.py b/rc_rmq.py index 8227982..47896f1 100644 --- a/rc_rmq.py +++ b/rc_rmq.py @@ -1,6 +1,8 @@ import json -import pika import socket + +import pika + import rabbit_config as rcfg diff --git a/rc_util.py b/rc_util.py index 89f84e9..3fffb1b 100644 --- a/rc_util.py +++ b/rc_util.py @@ -1,17 +1,19 @@ +import argparse import errno import functools -import os -import signal +import json import logging -import argparse -import pika +import os import pwd +import signal import uuid -from rc_rmq import RCRMQ -import json -from urllib.parse import quote from time import sleep +from urllib.parse import quote + +import pika + import rabbit_config as rcfg +from rc_rmq import RCRMQ rc_rmq = RCRMQ({"exchange": "RegUsr", "exchange_type": "topic"}) tasks = { diff --git a/user_auth.py b/user_auth.py index 54b8f8a..2ec2c7c 100644 --- a/user_auth.py +++ b/user_auth.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 +import subprocess import sys + import rc_util -import subprocess # During migration of this new script for ood # e.g. not all of users are in the db -- GitLab