Fix import order for cron/, scripts/ and test/

test/selenium_tests/framework.py

@@ -8,31 +8,26 @@ import os
 import time
 import traceback
 import unittest
-
 from functools import partial, wraps
 
 import requests
-
-from galaxy_selenium import (
-    driver_factory,
-)
-from galaxy_selenium.navigates_galaxy import NavigatesGalaxy, retry_during_transitions
-
 try:
     from pyvirtualdisplay import Display
 except ImportError:
     Display = None
-
 from six.moves.urllib.parse import urljoin
 
-from base import populators
-from base.driver_util import classproperty, DEFAULT_WEB_HOST, get_ip_address
-from base.testcase import FunctionalTestCase
-from base.workflows_format_2 import (
-    ImporterGalaxyInterface,
+from base import populators  # noqa: I100
+from base.driver_util import classproperty, DEFAULT_WEB_HOST, get_ip_address  # noqa: I100
+from base.testcase import FunctionalTestCase  # noqa: I100
+from base.workflows_format_2 import (  # noqa: I100
     convert_and_import_workflow,
+    ImporterGalaxyInterface,
 )
-
+from galaxy_selenium import (  # noqa: I100
+    driver_factory,
+)
+from galaxy_selenium.navigates_galaxy import NavigatesGalaxy, retry_during_transitions  # noqa: I100
 from galaxy.util import asbool
 
 DEFAULT_WAIT_TIMEOUT = 60

test/selenium_tests/test_anon_history.py

@@ -1,5 +1,7 @@
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 
 class AnonymousHistoriesTestCase(SeleniumTestCase):

test/selenium_tests/test_collection_builders.py

@@ -1,5 +1,7 @@
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 
 class CollectionBuildersTestCase(SeleniumTestCase):

test/selenium_tests/test_history_dataset_state.py

@@ -1,6 +1,6 @@
 from .framework import (
-    SeleniumTestCase,
     selenium_test,
+    SeleniumTestCase,
     UsesHistoryItemAssertions,
 )
 

test/selenium_tests/test_history_options.py

@@ -1,5 +1,7 @@
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 
 class HistoryOptionsTestCase(SeleniumTestCase):

test/selenium_tests/test_history_panel.py

@@ -1,7 +1,9 @@
 import time
 
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 
 class HistoryPanelTestCase(SeleniumTestCase):

test/selenium_tests/test_history_sharing.py

@@ -1,5 +1,7 @@
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 # Remove hack when submit_login works more consistently.
 VALID_LOGIN_RETRIES = 3

test/selenium_tests/test_login.py

@@ -1,5 +1,7 @@
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 
 class LoginTestCase(SeleniumTestCase):

test/selenium_tests/test_sizzle_loading.py

@@ -1,5 +1,7 @@
-from .framework import SeleniumTestCase
-from .framework import selenium_test
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
 
 
 class SizzleLoadingTestCase(SeleniumTestCase):

test/selenium_tests/test_stock_tours.py

@@ -1,10 +1,12 @@
 import os
 
-from .framework import SeleniumTestCase
-from .framework import selenium_test
-
 from galaxy.util import galaxy_root_path
 
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
+
 STOCK_TOURS_DIRECTORY = os.path.join(galaxy_root_path, "config", "plugins", "tours")
 
 

test/selenium_tests/test_tool_form.py

@@ -1,11 +1,11 @@
+from galaxy_selenium.navigates_galaxy import retry_call_during_transitions
+
 from .framework import (
-    SeleniumTestCase,
     selenium_test,
+    SeleniumTestCase,
     UsesHistoryItemAssertions,
 )
 
-from galaxy_selenium.navigates_galaxy import retry_call_during_transitions
-
 
 class ToolFormTestCase(SeleniumTestCase, UsesHistoryItemAssertions):
 

test/selenium_tests/test_uploads.py

@@ -1,6 +1,6 @@
 from .framework import (
-    SeleniumTestCase,
     selenium_test,
+    SeleniumTestCase,
     UsesHistoryItemAssertions,
 )
 

test/selenium_tests/test_workflow_editor.py

@@ -1,17 +1,16 @@
 import time
 
+from ._workflow_fixtures import (
+    WORKFLOW_SIMPLE_CAT_TWICE,
+    WORKFLOW_WITH_INVALID_STATE,
+    WORKFLOW_WITH_OLD_TOOL_VERSION,
+)
 from .framework import (
     retry_assertion_during_transitions,
     selenium_test,
     SeleniumTestCase
 )
 
-from ._workflow_fixtures import (
-    WORKFLOW_SIMPLE_CAT_TWICE,
-    WORKFLOW_WITH_OLD_TOOL_VERSION,
-    WORKFLOW_WITH_INVALID_STATE,
-)
-
 
 class WorkflowEditorTestCase(SeleniumTestCase):
 

test/selenium_tests/test_workflow_run.py

@@ -1,15 +1,14 @@
 import time
 
-from .framework import (
-    selenium_test,
-    SeleniumTestCase,
-    UsesHistoryItemAssertions,
-)
-
 from ._workflow_fixtures import (
     WORKFLOW_SIMPLE_CAT_TWICE,
     WORKFLOW_WITH_OLD_TOOL_VERSION,
 )
+from .framework import (
+    selenium_test,
+    SeleniumTestCase,
+    UsesHistoryItemAssertions,
+)
 
 
 class WorkflowRunTestCase(SeleniumTestCase, UsesHistoryItemAssertions):