moving tests directory to top level

.travis.yml

@@ -8,7 +8,7 @@ sudo: false
 
 services:
   - postgresql
-  
+
 python:
 - '3.6'
 - '3.7'
@@ -39,7 +39,7 @@ install:
 - pip install .[all,dev]
 
 script:
-- pytest -p no:sugar python/sdssdb/tests --cov python/sdssdb --cov-report html
+- pytest -p no:sugar tests --cov python/sdssdb --cov-report html
 
 after_success:
 - coveralls

python/sdssdb/tests/conftest.py → tests/conftest.py

@@ -9,15 +9,15 @@
 import pytest
 import importlib
 import inspect
-from sdssdb.tests.sqladbs import prepare_testdb as sqla_prepdb
-from sdssdb.tests.pwdbs import prepare_testdb as pw_prepdb
+from .sqladbs import prepare_testdb as sqla_prepdb
+from .pwdbs import prepare_testdb as pw_prepdb
 from pytest_postgresql.factories import DatabaseJanitor
 
 
 def pytest_addoption(parser):
     """ Add new options to the pytest command-line """
     # only run peewee tests
-    parser.addoption('--peewee', action='store_true', default=False, 
+    parser.addoption('--peewee', action='store_true', default=False,
                      help='Only run tests for peewee dbs')
 
     # only run sqla tests
@@ -31,7 +31,7 @@ def pytest_addoption(parser):
 
 def pytest_ignore_collect(path, config):
     ''' pytest hook to identify tests to be ignored during collection
-    
+
     Looks through all test_xxx.py files in pwdbs and sqladbs and determines
     which ones have databases that fail to connect and ignores them.
 

python/sdssdb/tests/pwdbs/conftest.py → tests/pwdbs/conftest.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: conftest.py
 # Project: pwdbs
 # Author: Brian Cherinka

python/sdssdb/tests/pwdbs/factories.py → tests/pwdbs/factories.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: factories.py
 # Project: pwdbs
 # Author: Brian Cherinka
@@ -13,7 +13,7 @@
 
 from __future__ import print_function, division, absolute_import
 import factory
-from sdssdb.tests.pwdbs import models, database as testdb
+from tests.pwdbs import models, database as testdb
 from sdssdb.peewee.sdss5db import database as sdss5db, targetdb
 from .factoryboy import PeeweeModelFactory
 

python/sdssdb/tests/pwdbs/models.py → tests/pwdbs/models.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: models.py
 # Project: pwdbs
 # Author: Brian Cherinka
@@ -13,7 +13,7 @@
 
 from __future__ import print_function, division, absolute_import
 from peewee import CharField, AutoField
-from sdssdb.tests.pwdbs import TmpModel
+from tests.pwdbs import TmpModel
 
 #
 # This file contains models used by the temporary test database.

python/sdssdb/tests/pwdbs/test_factory.py → tests/pwdbs/test_factory.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: test_factory.py
 # Project: pwdbs
 # Author: Brian Cherinka
@@ -12,15 +12,15 @@
 
 
 from __future__ import print_function, division, absolute_import
-from sdssdb.tests.pwdbs import models
+from tests.pwdbs import models
 import pytest
 
 
 @pytest.fixture()
 def batchit(user_factory):
     user_factory.create_batch(10)
 
-    
+
 class TestFactory(object):
 
     def test_factory_fixture(self, transaction, user_factory):

python/sdssdb/tests/sqladbs/conftest.py → tests/sqladbs/conftest.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: conftest.py
 # Project: sqladbs
 # Author: Brian Cherinka
@@ -23,8 +23,8 @@
 #
 # pytest_factoryboy @register decorator registers fixtures in directory where it is
 # called.  To make available to tests, need to either import them into conftest or register
-# manually in conftest.  The below code registers them manually instead of with 
-# @register class decorator. For docs on pytest_factoryboy, 
+# manually in conftest.  The below code registers them manually instead of with
+# @register class decorator. For docs on pytest_factoryboy,
 # see https://pytest-factoryboy.readthedocs.io/en/latest
 for item in dir(factories):
     attr = getattr(factories, item)

python/sdssdb/tests/sqladbs/factories.py → tests/sqladbs/factories.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: factories.py
 # Project: sqladbs
 # Author: Brian Cherinka
@@ -13,7 +13,7 @@
 
 from __future__ import print_function, division, absolute_import
 import factory
-from sdssdb.tests.sqladbs import models, database as db, get_model_from_database
+from tests.sqladbs import models, database as db, get_model_from_database
 from sdssdb.sqlalchemy.mangadb import database as mangadb
 from sdssdb.sqlalchemy.archive import database as archive
 
@@ -63,7 +63,7 @@ class TreeFactory(factory.alchemy.SQLAlchemyModelFactory):
         ''' factory for archive db tree table '''
         class Meta:
             model = sas.Tree
-            sqlalchemy_session = archive.Session  
+            sqlalchemy_session = archive.Session
 
         id = factory.Sequence(lambda n: n)
         version = factory.Sequence(lambda n: 'dr{0}'.format(30 + n))

python/sdssdb/tests/sqladbs/models.py → tests/sqladbs/models.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: models.py
 # Project: sqladbs
 # Author: Brian Cherinka
@@ -14,7 +14,7 @@
 from __future__ import print_function, division, absolute_import
 
 from sqlalchemy import Column, Integer, String
-from sdssdb.tests.sqladbs import TmpBase
+from tests.sqladbs import TmpBase
 
 #
 # This file contains models used by the temporary test database.

python/sdssdb/tests/sqladbs/test_factory.py → tests/sqladbs/test_factory.py

@@ -1,6 +1,6 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # Filename: test_testdb.py
 # Project: sqladbs
 # Author: Brian Cherinka
@@ -14,7 +14,7 @@
 from __future__ import print_function, division, absolute_import
 
 import pytest
-from sdssdb.tests.sqladbs import models, database
+from tests.sqladbs import models, database
 
 
 @pytest.fixture(scope='function', autouse=True)