lint: apply isort to standardize imports

Author: ralphbean

docs/source/conf.py

@@ -14,6 +14,7 @@
 #
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('..'))
 
 
@@ -182,4 +183,4 @@
 epub_exclude_files = ['search.html']
 
 
-# -- Extension configuration -------------------------------------------------
+# -- Extension configuration -------------------------------------------------

setup.py

@@ -16,9 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110.15.0 USA
 #
 # Authors:  Ralph Bean <rbean@redhat.com>
-from setuptools import setup
 import os
 
+from setuptools import setup
+
 with open('requirements.txt', 'rb') as f:
     install_requires = f.read().decode('utf-8').split('\n')
     if not os.getenv('READTHEDOCS'):

sync-page/event-handler.py

@@ -3,10 +3,10 @@
 import os
 
 # 3rd Party Modules
-from flask import Flask, render_template, request, redirect
+from flask import Flask, redirect, render_template, request
 
 # Local Modules
-from sync2jira.main import load_config, initialize_pr, initialize_issues
+from sync2jira.main import initialize_issues, initialize_pr, load_config
 
 # Global Variables
 app = Flask(__name__, static_url_path="/assets", static_folder="assets")

sync2jira/downstream_issue.py

@@ -18,22 +18,22 @@
 # Authors:  Ralph Bean <rbean@redhat.com>
 
 # Python Standard Library Modules
-from datetime import datetime, timezone
 import difflib
 import logging
 import operator
 import re
+from datetime import datetime, timezone
 from typing import Optional
 
 # 3rd Party Modules
 import arrow
-from jira import JIRAError
-import jira.client
 import jinja2
+import jira.client
 import pypandoc
+from jira import JIRAError
 
 # Local Modules
-from sync2jira.intermediary import Issue, PR
+from sync2jira.intermediary import PR, Issue
 from sync2jira.mailer import send_mail
 
 # The date the service was upgraded

sync2jira/downstream_pr.py

@@ -26,7 +26,6 @@
 import sync2jira.downstream_issue as d_issue
 from sync2jira.intermediary import Issue, matcher
 
-
 log = logging.getLogger('sync2jira')
 
 

sync2jira/mailer.py

@@ -3,10 +3,10 @@
 This script is used to send emails
 """
 
-import smtplib
 import os
-from email.mime.text import MIMEText
+import smtplib
 from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
 
 DEFAULT_FROM = os.environ.get('DEFAULT_FROM')
 DEFAULT_SERVER = os.environ.get('DEFAULT_SERVER')

sync2jira/main.py

@@ -23,26 +23,26 @@
 """
 # Build-In Modules
 import logging
-import warnings
+import os
 import traceback
-from time import sleep
-import requests
+import warnings
 from copy import deepcopy
-import os
+from time import sleep
 
 # 3rd Party Modules
 import fedmsg
 import fedmsg.config
 import jinja2
-from requests_kerberos import HTTPKerberosAuth, OPTIONAL
+import requests
+from requests_kerberos import OPTIONAL, HTTPKerberosAuth
 
 # Local Modules
-import sync2jira.upstream_issue as u_issue
-import sync2jira.upstream_pr as u_pr
 import sync2jira.downstream_issue as d_issue
 import sync2jira.downstream_pr as d_pr
-from sync2jira.mailer import send_mail
+import sync2jira.upstream_issue as u_issue
+import sync2jira.upstream_pr as u_pr
 from sync2jira.intermediary import matcher
+from sync2jira.mailer import send_mail
 
 # Set up our logging
 FORMAT = "[%(asctime)s] %(levelname)s: %(message)s"
@@ -61,6 +61,10 @@
 # Issue related handlers
 issue_handlers = {
     # GitHub
+    # New webhook-2fm topics
+    'github.issues': u_issue.handle_github_message,
+    'github.issue_comment': u_issue.handle_github_message,
+    # Old github2fedmsg topics
     'github.issue.opened': u_issue.handle_github_message,
     'github.issue.reopened': u_issue.handle_github_message,
     'github.issue.labeled': u_issue.handle_github_message,
@@ -77,6 +81,10 @@
 # PR related handlers
 pr_handlers = {
     # GitHub
+    # New webhook-2fm topics
+    'github.pull_request': u_pr.handle_github_message,
+    'github.issue_comment': u_pr.handle_github_message,
+    # Old github2fedmsg topics
     'github.pull_request.opened': u_pr.handle_github_message,
     'github.pull_request.edited': u_pr.handle_github_message,
     'github.issue.comment': u_pr.handle_github_message,

sync2jira/upstream_issue.py

@@ -18,15 +18,14 @@
 # Authors:  Ralph Bean <rbean@redhat.com>
 
 import logging
-from urllib.parse import urlencode
 from copy import deepcopy
+from urllib.parse import urlencode
 
 import requests
 from github import Github
 
 import sync2jira.intermediary as i
 
-
 log = logging.getLogger('sync2jira')
 graphqlurl = 'https://api.github.com/graphql'
 

sync2jira/upstream_pr.py

@@ -24,7 +24,6 @@
 import sync2jira.intermediary as i
 import sync2jira.upstream_issue as u_issue
 
-
 log = logging.getLogger('sync2jira')
 
 

tests/integration_tests/integration_test.py

@@ -2,16 +2,17 @@
 This is a helper program to listen for UMB trigger. Test and then deploy Sync2Jira
 """
 # Built-In Modules
-import os
 import logging
+import os
+
+# 3rd Party Modules
+import jira.client
 
 # Local Modules
-from sync2jira.main import main as m
 from jira_values import GITHUB
 from runtime_config import runtime_config
 
-# 3rd Party Modules
-import jira.client
+from sync2jira.main import main as m
 
 # Global Variables
 URL = os.environ['JIRA_STAGE_URL']
@@ -139,4 +140,4 @@ def get_jira_client():
 
 if __name__ == '__main__':
     # Call our main method after parsing out message
-    main()
+    main()