refactor: Remove unnecessary namespacing of fixtures. (#167)

schireson · Sep 16, 2022 · 51d9785 · 51d9785
1 parent 3254bd8
commit 51d9785
Show file tree

Hide file tree

Showing 32 changed files with 81 additions and 86 deletions.
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -9,7 +9,7 @@ Fixture Functions
     :members: create_mongo_fixture, create_mysql_fixture, create_postgres_fixture, create_redis_fixture, create_redshift_fixture, create_sqlite_fixture, Rows, Statements, StaticStatements
 
 
-.. automodule:: pytest_mock_resources.fixture.database.generic
+.. automodule:: pytest_mock_resources.fixture.credentials
     :members: Credentials
 
 Fixture Config

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-mock-resources"
-version = "2.5.1"
+version = "2.5.2"
 description = "A pytest plugin for easily instantiating reproducible mock resources."
 authors = [
     "Omar Khan <oakhan3@gmail.com>",

diff --git a/src/pytest_mock_resources/__init__.py b/src/pytest_mock_resources/__init__.py
@@ -6,13 +6,14 @@
     RedisConfig,
     RedshiftConfig,
 )
-from pytest_mock_resources.fixture.database import (
+from pytest_mock_resources.fixture import (
     create_mongo_fixture,
     create_mysql_fixture,
     create_postgres_fixture,
     create_redis_fixture,
     create_redshift_fixture,
     create_sqlite_fixture,
+    Credentials,
     pmr_mongo_config,
     pmr_mongo_container,
     pmr_mysql_config,
@@ -23,16 +24,14 @@
     pmr_redis_container,
     pmr_redshift_config,
     pmr_redshift_container,
-    Rows,
-    Statements,
-    StaticStatements,
 )
 from pytest_mock_resources.hooks import (  # noqa
     pytest_addoption,
     pytest_configure,
     pytest_itemcollected,
     pytest_sessionfinish,
 )
+from pytest_mock_resources.sqlalchemy import Rows, Statements, StaticStatements
 
 __all__ = [
     "get_container",
@@ -47,6 +46,7 @@
     "create_redis_fixture",
     "create_redshift_fixture",
     "create_sqlite_fixture",
+    "Credentials",
     "pmr_mongo_config",
     "pmr_mongo_container",
     "pmr_mysql_config",

diff --git a/src/pytest_mock_resources/fixture/__init__.py b/src/pytest_mock_resources/fixture/__init__.py
@@ -1,8 +1,47 @@
-import uuid
+from pytest_mock_resources.fixture.credentials import Credentials
+from pytest_mock_resources.fixture.mongo import (
+    create_mongo_fixture,
+    pmr_mongo_config,
+    pmr_mongo_container,
+)
+from pytest_mock_resources.fixture.mysql import (
+    create_mysql_fixture,
+    pmr_mysql_config,
+    pmr_mysql_container,
+)
+from pytest_mock_resources.fixture.postgresql import (
+    create_postgres_fixture,
+    pmr_postgres_config,
+    pmr_postgres_container,
+)
+from pytest_mock_resources.fixture.redis import (
+    create_redis_fixture,
+    pmr_redis_config,
+    pmr_redis_container,
+)
+from pytest_mock_resources.fixture.redshift import (
+    create_redshift_fixture,
+    pmr_redshift_config,
+    pmr_redshift_container,
+)
+from pytest_mock_resources.fixture.sqlite import create_sqlite_fixture
 
-
-def generate_fixture_id(enabled: bool = True, name=""):
-    if enabled:
-        uuid_str = str(uuid.uuid4()).replace("-", "_")
-        return "_".join(["pmr_template", name, uuid_str])
-    return None
+__all__ = [
+    "create_mongo_fixture",
+    "create_mysql_fixture",
+    "create_postgres_fixture",
+    "create_redis_fixture",
+    "create_redshift_fixture",
+    "create_sqlite_fixture",
+    "Credentials",
+    "pmr_mongo_config",
+    "pmr_mongo_container",
+    "pmr_mysql_config",
+    "pmr_mysql_container",
+    "pmr_postgres_config",
+    "pmr_postgres_container",
+    "pmr_redis_config",
+    "pmr_redis_container",
+    "pmr_redshift_config",
+    "pmr_redshift_container",
+]
diff --git a/src/pytest_mock_resources/fixture/base.py b/src/pytest_mock_resources/fixture/base.py
@@ -0,0 +1,8 @@
+import uuid
+
+
+def generate_fixture_id(enabled: bool = True, name=""):
+    if enabled:
+        uuid_str = str(uuid.uuid4()).replace("-", "_")
+        return "_".join(["pmr_template", name, uuid_str])
+    return None
diff --git a/...ock_resources/fixture/database/generic.py → ...est_mock_resources/fixture/credentials.py b/...ock_resources/fixture/database/generic.py → ...est_mock_resources/fixture/credentials.py
diff --git a/src/pytest_mock_resources/fixture/database/__init__.py b/src/pytest_mock_resources/fixture/database/__init__.py
diff --git a/src/pytest_mock_resources/fixture/database/relational/__init__.py b/src/pytest_mock_resources/fixture/database/relational/__init__.py
diff --git a/..._mock_resources/fixture/database/mongo.py → src/pytest_mock_resources/fixture/mongo.py b/..._mock_resources/fixture/database/mongo.py → src/pytest_mock_resources/fixture/mongo.py
@@ -3,7 +3,7 @@
 from pytest_mock_resources.compat import pymongo
 from pytest_mock_resources.container.base import get_container
 from pytest_mock_resources.container.mongo import MongoConfig
-from pytest_mock_resources.fixture.database.generic import assign_fixture_credentials
+from pytest_mock_resources.fixture.credentials import assign_fixture_credentials
 
 
 @pytest.fixture(scope="session")

diff --git a/...rces/fixture/database/relational/mysql.py → src/pytest_mock_resources/fixture/mysql.py b/...rces/fixture/database/relational/mysql.py → src/pytest_mock_resources/fixture/mysql.py
@@ -4,8 +4,8 @@
 
 from pytest_mock_resources.container.base import get_container
 from pytest_mock_resources.container.mysql import get_sqlalchemy_engine, MysqlConfig
-from pytest_mock_resources.fixture.database.generic import assign_fixture_credentials
-from pytest_mock_resources.fixture.database.relational.generic import EngineManager
+from pytest_mock_resources.fixture.credentials import assign_fixture_credentials
+from pytest_mock_resources.sqlalchemy import EngineManager
 
 
 @pytest.fixture(scope="session")

diff --git a/...fixture/database/relational/postgresql.py → ...test_mock_resources/fixture/postgresql.py b/...fixture/database/relational/postgresql.py → ...test_mock_resources/fixture/postgresql.py
@@ -7,13 +7,9 @@
 
 from pytest_mock_resources.container.base import get_container
 from pytest_mock_resources.container.postgres import get_sqlalchemy_engine, PostgresConfig
-from pytest_mock_resources.fixture import generate_fixture_id
-from pytest_mock_resources.fixture.database.generic import assign_fixture_credentials
-from pytest_mock_resources.fixture.database.relational.generic import (
-    bifurcate_actions,
-    EngineManager,
-    normalize_actions,
-)
+from pytest_mock_resources.fixture.base import generate_fixture_id
+from pytest_mock_resources.fixture.credentials import assign_fixture_credentials
+from pytest_mock_resources.sqlalchemy import bifurcate_actions, EngineManager, normalize_actions
 
 log = logging.getLogger(__name__)
 

diff --git a/..._mock_resources/fixture/database/redis.py → src/pytest_mock_resources/fixture/redis.py b/..._mock_resources/fixture/database/redis.py → src/pytest_mock_resources/fixture/redis.py
@@ -3,7 +3,7 @@
 from pytest_mock_resources.compat import redis
 from pytest_mock_resources.container.base import get_container
 from pytest_mock_resources.container.redis import RedisConfig
-from pytest_mock_resources.fixture.database.generic import assign_fixture_credentials
+from pytest_mock_resources.fixture.credentials import assign_fixture_credentials
 
 
 @pytest.fixture(scope="session")

diff --git a/.../database/relational/redshift/__init__.py → ...ck_resources/fixture/redshift/__init__.py b/.../database/relational/redshift/__init__.py → ...ck_resources/fixture/redshift/__init__.py
@@ -2,8 +2,8 @@
 
 from pytest_mock_resources.container.base import get_container
 from pytest_mock_resources.container.redshift import get_sqlalchemy_engine, RedshiftConfig
-from pytest_mock_resources.fixture import generate_fixture_id
-from pytest_mock_resources.fixture.database.relational.postgresql import create_engine_manager
+from pytest_mock_resources.fixture.base import generate_fixture_id
+from pytest_mock_resources.fixture.postgresql import create_engine_manager
 from pytest_mock_resources.patch.redshift import psycopg2, sqlalchemy
 
 
@@ -69,7 +69,7 @@ def create_redshift_fixture(
             to bad default behavior).
     """
 
-    from pytest_mock_resources.fixture.database.relational.redshift.udf import REDSHIFT_UDFS
+    from pytest_mock_resources.fixture.redshift.udf import REDSHIFT_UDFS
 
     fixture_id = generate_fixture_id(enabled=template_database, name="pg")
 

diff --git a/...xture/database/relational/redshift/udf.py → ...st_mock_resources/fixture/redshift/udf.py b/...xture/database/relational/redshift/udf.py → ...st_mock_resources/fixture/redshift/udf.py
@@ -2,7 +2,7 @@
 
 from sqlalchemy import text
 
-from pytest_mock_resources.fixture.database import Statements
+from pytest_mock_resources.sqlalchemy import Statements
 
 
 @enum.unique

diff --git a/...ces/fixture/database/relational/sqlite.py → src/pytest_mock_resources/fixture/sqlite.py b/...ces/fixture/database/relational/sqlite.py → src/pytest_mock_resources/fixture/sqlite.py
@@ -25,8 +25,8 @@
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import sqltypes
 
-from pytest_mock_resources.fixture.database.generic import assign_fixture_credentials
-from pytest_mock_resources.fixture.database.relational.generic import EngineManager
+from pytest_mock_resources.fixture.credentials import assign_fixture_credentials
+from pytest_mock_resources.sqlalchemy import EngineManager
 
 
 class PMRSQLiteDDLCompiler(sqlite_base.SQLiteDDLCompiler):

diff --git a/...es/fixture/database/relational/generic.py → src/pytest_mock_resources/sqlalchemy.py b/...es/fixture/database/relational/generic.py → src/pytest_mock_resources/sqlalchemy.py
diff --git a/tests/fixture/__init__.py b/tests/fixture/__init__.py
@@ -1,3 +1,3 @@
 import pytest
 
-pytest.register_assert_rewrite("tests.fixture.database")
+pytest.register_assert_rewrite("tests.fixture.redshift.utils")
diff --git a/...s/fixture/database/relational/__init__.py → tests/fixture/redshift/__init__.py b/...s/fixture/database/relational/__init__.py → tests/fixture/redshift/__init__.py
diff --git a/tests/fixture/database/test_copy.py → tests/fixture/redshift/test_copy.py b/tests/fixture/database/test_copy.py → tests/fixture/redshift/test_copy.py
@@ -6,7 +6,7 @@
 from pytest_mock_resources.compat import boto3, moto
 from pytest_mock_resources.compat.sqlalchemy import declarative_base
 from tests import skip_if_sqlalchemy2
-from tests.fixture.database import (
+from tests.fixture.redshift.utils import (
     COPY_TEMPLATE,
     data_columns,
     fetch_values_from_table_and_assert,

diff --git a/tests/fixture/database/test_patch.py → tests/fixture/redshift/test_patch.py b/tests/fixture/database/test_patch.py → tests/fixture/redshift/test_patch.py
@@ -3,7 +3,7 @@
 from sqlalchemy import text
 
 from pytest_mock_resources import create_postgres_fixture, create_redshift_fixture
-from tests.fixture.database import (
+from tests.fixture.redshift.utils import (
     copy_fn_to_test_create_engine_patch,
     copy_fn_to_test_psycopg2_connect_patch,
     copy_fn_to_test_psycopg2_connect_patch_as_context_manager,

diff --git a/tests/fixture/database/test_udf.py → tests/fixture/redshift/test_udf.py b/tests/fixture/database/test_udf.py → tests/fixture/redshift/test_udf.py
diff --git a/tests/fixture/database/test_unload.py → tests/fixture/redshift/test_unload.py b/tests/fixture/database/test_unload.py → tests/fixture/redshift/test_unload.py
@@ -4,7 +4,7 @@
 from pytest_mock_resources import create_redshift_fixture
 from pytest_mock_resources.compat import moto
 from tests import skip_if_sqlalchemy2
-from tests.fixture.database import (
+from tests.fixture.redshift.utils import (
     fetch_values_from_s3_and_assert,
     randomcase,
     setup_table_and_insert_data,

diff --git a/tests/fixture/database/__init__.py → tests/fixture/redshift/utils.py b/tests/fixture/database/__init__.py → tests/fixture/redshift/utils.py
diff --git a/tests/fixture/database/test_database.py → tests/fixture/test_database.py b/tests/fixture/database/test_database.py → tests/fixture/test_database.py
@@ -8,7 +8,7 @@
     create_redshift_fixture,
     create_sqlite_fixture,
 )
-from pytest_mock_resources.fixture.database.relational.generic import EngineManager
+from pytest_mock_resources.sqlalchemy import EngineManager
 from tests import skip_if_not_sqlalchemy2
 
 sqlite = create_sqlite_fixture()

diff --git a/...xture/database/relational/test_generic.py → tests/fixture/test_engine_manager.py b/...xture/database/relational/test_generic.py → tests/fixture/test_engine_manager.py
@@ -5,7 +5,7 @@
 
 from pytest_mock_resources import create_postgres_fixture, create_sqlite_fixture, Rows
 from pytest_mock_resources.compat.sqlalchemy import declarative_base, select
-from pytest_mock_resources.fixture.database.relational.generic import identify_matching_tables
+from pytest_mock_resources.sqlalchemy import identify_matching_tables
 from tests import skip_if_not_sqlalchemy2, skip_if_sqlalchemy2
 
 Base = declarative_base()

diff --git a/tests/fixture/database/test_mongo.py → tests/fixture/test_mongo.py b/tests/fixture/database/test_mongo.py → tests/fixture/test_mongo.py
diff --git a/.../fixture/database/test_ordered_actions.py → tests/fixture/test_ordered_actions.py b/.../fixture/database/test_ordered_actions.py → tests/fixture/test_ordered_actions.py
diff --git a/tests/fixture/database/test_postgres.py → tests/fixture/test_postgres.py b/tests/fixture/database/test_postgres.py → tests/fixture/test_postgres.py
@@ -3,7 +3,7 @@
 from pytest_mock_resources import create_postgres_fixture
 from pytest_mock_resources.compat.sqlalchemy import declarative_base
 from pytest_mock_resources.container.postgres import get_sqlalchemy_engine
-from pytest_mock_resources.fixture.database.relational.postgresql import _produce_clean_database
+from pytest_mock_resources.fixture.postgresql import _produce_clean_database
 
 Base = declarative_base()
 

diff --git a/tests/fixture/database/test_redis.py → tests/fixture/test_redis.py b/tests/fixture/database/test_redis.py → tests/fixture/test_redis.py
diff --git a/tests/fixture/database/test_rows.py → tests/fixture/test_rows.py b/tests/fixture/database/test_rows.py → tests/fixture/test_rows.py
diff --git a/tests/fixture/database/test_sqlite.py → tests/fixture/test_sqlite.py b/tests/fixture/database/test_sqlite.py → tests/fixture/test_sqlite.py
@@ -7,7 +7,7 @@
 
 from pytest_mock_resources import create_postgres_fixture, create_sqlite_fixture, Rows
 from pytest_mock_resources.compat.sqlalchemy import declarative_base, select
-from pytest_mock_resources.fixture.database.relational.sqlite import utc
+from pytest_mock_resources.fixture.sqlite import utc
 
 Base = declarative_base()
 

diff --git a/tests/fixture/database/test_statements.py → tests/fixture/test_statements.py b/tests/fixture/database/test_statements.py → tests/fixture/test_statements.py