Fix cyclic import in pavelib

pavelib/paver_tests/test_paver_bok_choy_cmds.py

 
 import os
 import unittest
-from pavelib.utils.test.suites.bokchoy_suite import BokChoyTestSuite
+from pavelib.utils.test.suites import BokChoyTestSuite
 
 REPO_DIR = os.getcwd()
 

pavelib/utils/test/suites/__init__.py

@@ -6,3 +6,4 @@ from .nose_suite import NoseTestSuite, SystemTestSuite, LibTestSuite
 from .python_suite import PythonTestSuite
 from .js_suite import JsTestSuite
 from .acceptance_suite import AcceptanceTestSuite
+from .bokchoy_suite import BokChoyTestSuite

pavelib/utils/test/suites/acceptance_suite.py

@@ -3,7 +3,7 @@ Acceptance test suite
 """
 from paver.easy import sh, call_task
 from pavelib.utils.test import utils as test_utils
-from pavelib.utils.test.suites import TestSuite
+from pavelib.utils.test.suites.suite import TestSuite
 from pavelib.utils.envs import Env
 
 __test__ = False  # do not collect

pavelib/utils/test/suites/bokchoy_suite.py

@@ -4,7 +4,7 @@ Class used for defining and running Bok Choy acceptance test suite
 from time import sleep
 
 from paver.easy import sh
-from pavelib.utils.test.suites import TestSuite
+from pavelib.utils.test.suites.suite import TestSuite
 from pavelib.utils.envs import Env
 from pavelib.utils.test import bokchoy_utils
 from pavelib.utils.test import utils as test_utils

pavelib/utils/test/suites/js_suite.py

@@ -3,7 +3,7 @@ Javascript test tasks
 """
 from pavelib import assets
 from pavelib.utils.test import utils as test_utils
-from pavelib.utils.test.suites import TestSuite
+from pavelib.utils.test.suites.suite import TestSuite
 from pavelib.utils.envs import Env
 
 __test__ = False  # do not collect

pavelib/utils/test/suites/nose_suite.py

@@ -4,7 +4,7 @@ Classes used for defining and running nose test suites
 import os
 from paver.easy import call_task
 from pavelib.utils.test import utils as test_utils
-from pavelib.utils.test.suites import TestSuite
+from pavelib.utils.test.suites.suite import TestSuite
 from pavelib.utils.envs import Env
 
 __test__ = False  # do not collect

pavelib/utils/test/suites/python_suite.py

@@ -2,7 +2,8 @@
 Classes used for defining and running python test suites
 """
 from pavelib.utils.test import utils as test_utils
-from pavelib.utils.test.suites import TestSuite, LibTestSuite, SystemTestSuite
+from pavelib.utils.test.suites.suite import TestSuite
+from pavelib.utils.test.suites.nose_suite import LibTestSuite, SystemTestSuite
 from pavelib.utils.envs import Env
 
 __test__ = False  # do not collect