Unpin isort version and make needed changes

Signed-off-by: Tim Lane <[email protected]>

Author: Tim Lane

src/common/remote_command_executor.py

@@ -16,9 +16,8 @@
 from math import ceil
 from multiprocessing import Pool
 
-from retrying import retry
-
 from paramiko import AutoAddPolicy, SSHClient
+from retrying import retry
 
 RemoteCommandResult = collections.namedtuple("RemoteCommandResult", ["return_code", "stdout", "stderr"])
 

src/common/ssh_keyscan.py

@@ -16,9 +16,10 @@
 from math import ceil
 from multiprocessing import Pool
 
-from common.utils import EventType, run_command
 from paramiko import HostKeys, RSAKey, Transport
 
+from common.utils import EventType, run_command
+
 
 def _get_server_keys(hostname):
 

tests/common/schedulers/test_sge_commands.py

@@ -9,8 +9,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.sge_commands import (
     QCONF_COMMANDS,
     SgeHost,

tests/common/schedulers/test_slurm_commands.py

@@ -9,8 +9,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.slurm_commands import SlurmJob, get_jobs_info, get_pending_jobs_info
 from tests.common import read_text
 

tests/common/schedulers/test_torque_commands.py

@@ -12,8 +12,8 @@
 from unittest.mock import call
 
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.torque_commands import (
     TorqueHost,
     TorqueJob,

tests/jobwatcher/plugins/test_sge.py

@@ -9,8 +9,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.sge_commands import SGE_HOLD_STATE, SgeHost, SgeJob
 from jobwatcher.plugins.sge import get_busy_nodes, get_required_nodes
 

tests/jobwatcher/plugins/test_slurm.py

@@ -9,8 +9,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.slurm_commands import PENDING_RESOURCES_REASONS, SlurmJob, get_pending_jobs_info
 from jobwatcher.plugins.slurm import get_required_nodes
 

tests/jobwatcher/plugins/test_torque.py

@@ -10,8 +10,8 @@
 # limitations under the License.
 
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.torque_commands import TorqueHost, TorqueJob, TorqueResourceList
 from jobwatcher.plugins.torque import get_busy_nodes, get_required_nodes
 

tests/nodewatcher/plugins/test_sge.py

@@ -9,8 +9,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.sge_commands import SGE_HOLD_STATE, SgeHost, SgeJob
 from nodewatcher.plugins.sge import has_jobs, has_pending_jobs, is_node_down
 

tests/nodewatcher/plugins/test_slurm.py

@@ -9,8 +9,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
-
 from assertpy import assert_that
+
 from common.schedulers.slurm_commands import PENDING_RESOURCES_REASONS, SlurmJob
 from nodewatcher.plugins.slurm import has_pending_jobs