Merge pull request #4202 from Yelp/u/robj/migrate-isort

move from reorder-python-imports to isort

Author: Rob-Johnson

.pre-commit-config.yaml

@@ -25,12 +25,10 @@ repos:
           '--indent', '4',
           '--no-sort-keys',
         ]
--   repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.4.0
+-   repo: https://github.com/PyCQA/isort
+    rev: 5.13.2
     hooks:
-    -   id: reorder-python-imports
-        args: [--py3-plus]
-        additional_dependencies: [aspy.refactor_imports==0.5.3]
+    -   id: isort
         exclude: ^paasta_tools/paastaapi
 -   repo: https://github.com/asottile/pyupgrade
     rev: v1.12.0

docs/source/conf.py

@@ -14,7 +14,6 @@
 
 import sphinx_rtd_theme
 
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

general_itests/steps/deployments_json_steps.py

@@ -23,8 +23,8 @@
 from behave import when
 from dulwich.objects import Blob
 from dulwich.objects import Commit
-from dulwich.objects import parse_timezone
 from dulwich.objects import Tree
+from dulwich.objects import parse_timezone
 from dulwich.repo import Repo
 
 from paasta_tools import generate_deployments_for_service

paasta_tools/adhoc_tools.py

@@ -17,16 +17,15 @@
 
 from paasta_tools.long_running_service_tools import LongRunningServiceConfig
 from paasta_tools.long_running_service_tools import LongRunningServiceConfigDict
+from paasta_tools.utils import DEFAULT_SOA_DIR
 from paasta_tools.utils import BranchDictV2
+from paasta_tools.utils import NoConfigurationForServiceError
+from paasta_tools.utils import NoDeploymentsAvailable
 from paasta_tools.utils import deep_merge_dictionaries
-from paasta_tools.utils import DEFAULT_SOA_DIR
 from paasta_tools.utils import load_service_instance_config
 from paasta_tools.utils import load_v2_deployments_json
-from paasta_tools.utils import NoConfigurationForServiceError
-from paasta_tools.utils import NoDeploymentsAvailable
 from paasta_tools.utils import prompt_pick_one
 
-
 log = logging.getLogger(__name__)
 
 

paasta_tools/api/client.py

@@ -24,9 +24,8 @@
 
 import paasta_tools.paastaapi.apis as paastaapis
 from paasta_tools import paastaapi
-from paasta_tools.utils import load_system_paasta_config
 from paasta_tools.utils import SystemPaastaConfig
-
+from paasta_tools.utils import load_system_paasta_config
 
 log = logging.getLogger(__name__)
 

paasta_tools/api/tweens/auth.py

@@ -29,7 +29,6 @@
 
 from paasta_tools.api.tweens import Handler
 
-
 logger = logging.getLogger(__name__)
 AUTH_CACHE_SIZE = 50000
 AUTH_CACHE_TTL = 30 * 60

paasta_tools/api/views/autoscaler.py

@@ -30,11 +30,10 @@
 from paasta_tools.cli.utils import get_instance_config
 from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAME
 from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE
-from paasta_tools.kubernetes_tools import get_or_create_namespaced_configmap
 from paasta_tools.kubernetes_tools import KubernetesDeploymentConfig
+from paasta_tools.kubernetes_tools import get_or_create_namespaced_configmap
 from paasta_tools.kubernetes_tools import patch_namespaced_configmap
 
-
 log = logging.getLogger(__name__)
 
 

paasta_tools/api/views/exception.py

@@ -20,7 +20,6 @@
 from pyramid.response import Response
 from pyramid.view import view_config
 
-
 log = logging.getLogger(__name__)
 
 

paasta_tools/api/views/instance.py

@@ -37,11 +37,11 @@
 from paasta_tools.cli.cmds.status import get_actual_deployments
 from paasta_tools.instance import kubernetes as pik
 from paasta_tools.mesos_tools import get_all_frameworks as get_all_mesos_frameworks
-from paasta_tools.utils import compose_job_id
+from paasta_tools.utils import PAASTA_K8S_INSTANCE_TYPES
 from paasta_tools.utils import DeploymentVersion
 from paasta_tools.utils import NoConfigurationForServiceError
-from paasta_tools.utils import PAASTA_K8S_INSTANCE_TYPES
 from paasta_tools.utils import TimeoutError
+from paasta_tools.utils import compose_job_id
 from paasta_tools.utils import validate_service_instance
 
 log = logging.getLogger(__name__)

paasta_tools/api/views/remote_run.py

@@ -23,7 +23,6 @@
 from paasta_tools.kubernetes.remote_run import remote_run_stop
 from paasta_tools.kubernetes.remote_run import remote_run_token
 
-
 DEFAULT_MAX_DURATION = 60 * 60  # 1 hour