From 8a42ac576503890e62a077eab0c489d4ff3ae26a Mon Sep 17 00:00:00 2001 From: Brandon Rodriguez <brodriguez8774@gmail.com> Date: Sat, 30 Jul 2022 17:15:41 -0400 Subject: [PATCH] Correct main folder name, to be more package-friendly --- generate_docs.sh | 2 +- main.py | 4 ++-- {src => py_dbcn}/__init__.py | 0 {src => py_dbcn}/connectors/__init__.py | 0 {src => py_dbcn}/connectors/core/__init__.py | 0 {src => py_dbcn}/connectors/core/core.py | 2 +- {src => py_dbcn}/connectors/core/database.py | 2 +- {src => py_dbcn}/connectors/core/display.py | 2 +- {src => py_dbcn}/connectors/core/query.py | 2 +- {src => py_dbcn}/connectors/core/records.py | 2 +- {src => py_dbcn}/connectors/core/tables.py | 2 +- {src => py_dbcn}/connectors/core/validate.py | 2 +- {src => py_dbcn}/connectors/mysql/__init__.py | 0 {src => py_dbcn}/connectors/mysql/core.py | 4 ++-- {src => py_dbcn}/connectors/mysql/database.py | 4 ++-- {src => py_dbcn}/connectors/mysql/display.py | 4 ++-- {src => py_dbcn}/connectors/mysql/query.py | 4 ++-- {src => py_dbcn}/connectors/mysql/records.py | 4 ++-- {src => py_dbcn}/connectors/mysql/tables.py | 4 ++-- {src => py_dbcn}/connectors/mysql/validate.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/__init__.py | 0 {src => py_dbcn}/connectors/postgresql/core.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/database.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/display.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/query.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/records.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/tables.py | 4 ++-- {src => py_dbcn}/connectors/postgresql/validate.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/__init__.py | 0 {src => py_dbcn}/connectors/sqlite/core.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/database.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/display.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/query.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/records.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/tables.py | 4 ++-- {src => py_dbcn}/connectors/sqlite/validate.py | 4 ++-- {src => py_dbcn}/logging.py | 2 +- tests/connectors/core/test_database.py | 2 +- tests/connectors/core/test_display.py | 2 +- tests/connectors/core/test_query.py | 2 +- tests/connectors/core/test_records.py | 2 +- tests/connectors/core/test_tables.py | 2 +- tests/connectors/core/test_validate.py | 4 ++-- tests/connectors/mysql/test_core.py | 2 +- tests/connectors/mysql/test_validate.py | 4 ++-- tests/connectors/postgresql/test_database.py | 2 +- tests/connectors/postgresql/test_display.py | 2 +- tests/connectors/postgresql/test_query.py | 2 +- tests/connectors/postgresql/test_records.py | 2 +- tests/connectors/postgresql/test_tables.py | 2 +- tests/connectors/postgresql/test_validate.py | 4 ++-- tests/connectors/sqlite/test_database.py | 2 +- tests/connectors/sqlite/test_display.py | 2 +- tests/connectors/sqlite/test_query.py | 2 +- tests/connectors/sqlite/test_records.py | 2 +- tests/connectors/sqlite/test_tables.py | 2 +- tests/connectors/sqlite/test_validate.py | 4 ++-- 57 files changed, 77 insertions(+), 77 deletions(-) rename {src => py_dbcn}/__init__.py (100%) rename {src => py_dbcn}/connectors/__init__.py (100%) rename {src => py_dbcn}/connectors/core/__init__.py (100%) rename {src => py_dbcn}/connectors/core/core.py (98%) rename {src => py_dbcn}/connectors/core/database.py (99%) rename {src => py_dbcn}/connectors/core/display.py (99%) rename {src => py_dbcn}/connectors/core/query.py (96%) rename {src => py_dbcn}/connectors/core/records.py (99%) rename {src => py_dbcn}/connectors/core/tables.py (99%) rename {src => py_dbcn}/connectors/core/validate.py (99%) rename {src => py_dbcn}/connectors/mysql/__init__.py (100%) rename {src => py_dbcn}/connectors/mysql/core.py (95%) rename {src => py_dbcn}/connectors/mysql/database.py (84%) rename {src => py_dbcn}/connectors/mysql/display.py (85%) rename {src => py_dbcn}/connectors/mysql/query.py (84%) rename {src => py_dbcn}/connectors/mysql/records.py (84%) rename {src => py_dbcn}/connectors/mysql/tables.py (84%) rename {src => py_dbcn}/connectors/mysql/validate.py (84%) rename {src => py_dbcn}/connectors/postgresql/__init__.py (100%) rename {src => py_dbcn}/connectors/postgresql/core.py (95%) rename {src => py_dbcn}/connectors/postgresql/database.py (84%) rename {src => py_dbcn}/connectors/postgresql/display.py (85%) rename {src => py_dbcn}/connectors/postgresql/query.py (84%) rename {src => py_dbcn}/connectors/postgresql/records.py (85%) rename {src => py_dbcn}/connectors/postgresql/tables.py (84%) rename {src => py_dbcn}/connectors/postgresql/validate.py (85%) rename {src => py_dbcn}/connectors/sqlite/__init__.py (100%) rename {src => py_dbcn}/connectors/sqlite/core.py (95%) rename {src => py_dbcn}/connectors/sqlite/database.py (84%) rename {src => py_dbcn}/connectors/sqlite/display.py (85%) rename {src => py_dbcn}/connectors/sqlite/query.py (84%) rename {src => py_dbcn}/connectors/sqlite/records.py (84%) rename {src => py_dbcn}/connectors/sqlite/tables.py (84%) rename {src => py_dbcn}/connectors/sqlite/validate.py (84%) rename {src => py_dbcn}/logging.py (99%) diff --git a/generate_docs.sh b/generate_docs.sh index c4a1380..895b380 100755 --- a/generate_docs.sh +++ b/generate_docs.sh @@ -22,7 +22,7 @@ mkdir "./docs/build/" ## Auto-generate docs source files, from actual Python code in project. -#sphinx-apidoc -o ./docs/source/api/ ./src/connectors/ +#sphinx-apidoc -o ./docs/source/api/ ./py_dbcn/connectors/ ## Remove modules .rst file, because we don't actually care about it. diff --git a/main.py b/main.py index 990a58b..08ce727 100644 --- a/main.py +++ b/main.py @@ -6,8 +6,8 @@ Entrypoint for manually testing project logic. # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector -from src.logging import init_logging +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/__init__.py b/py_dbcn/__init__.py similarity index 100% rename from src/__init__.py rename to py_dbcn/__init__.py diff --git a/src/connectors/__init__.py b/py_dbcn/connectors/__init__.py similarity index 100% rename from src/connectors/__init__.py rename to py_dbcn/connectors/__init__.py diff --git a/src/connectors/core/__init__.py b/py_dbcn/connectors/core/__init__.py similarity index 100% rename from src/connectors/core/__init__.py rename to py_dbcn/connectors/core/__init__.py diff --git a/src/connectors/core/core.py b/py_dbcn/connectors/core/core.py similarity index 98% rename from src/connectors/core/core.py rename to py_dbcn/connectors/core/core.py index afd1597..e3b47b8 100644 --- a/src/connectors/core/core.py +++ b/py_dbcn/connectors/core/core.py @@ -9,7 +9,7 @@ Should be inherited by language-specific connectors. from abc import ABC, abstractmethod # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging from .database import BaseDatabase from .display import BaseDisplay from .query import BaseQuery diff --git a/src/connectors/core/database.py b/py_dbcn/connectors/core/database.py similarity index 99% rename from src/connectors/core/database.py rename to py_dbcn/connectors/core/database.py index caed8b4..4f6b9aa 100644 --- a/src/connectors/core/database.py +++ b/py_dbcn/connectors/core/database.py @@ -8,7 +8,7 @@ Should be inherited by language-specific connectors. # System Imports. # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/core/display.py b/py_dbcn/connectors/core/display.py similarity index 99% rename from src/connectors/core/display.py rename to py_dbcn/connectors/core/display.py index cfc6354..72acd26 100644 --- a/src/connectors/core/display.py +++ b/py_dbcn/connectors/core/display.py @@ -8,7 +8,7 @@ Should be inherited by language-specific connectors. # System Imports. # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/core/query.py b/py_dbcn/connectors/core/query.py similarity index 96% rename from src/connectors/core/query.py rename to py_dbcn/connectors/core/query.py index 5462a94..5d5e802 100644 --- a/src/connectors/core/query.py +++ b/py_dbcn/connectors/core/query.py @@ -8,7 +8,7 @@ Should be inherited by language-specific connectors. # System Imports. # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/core/records.py b/py_dbcn/connectors/core/records.py similarity index 99% rename from src/connectors/core/records.py rename to py_dbcn/connectors/core/records.py index 7bd17bf..3a5da28 100644 --- a/src/connectors/core/records.py +++ b/py_dbcn/connectors/core/records.py @@ -8,7 +8,7 @@ Should be inherited by language-specific connectors. # System Imports. # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/core/tables.py b/py_dbcn/connectors/core/tables.py similarity index 99% rename from src/connectors/core/tables.py rename to py_dbcn/connectors/core/tables.py index 18d03ff..57a5421 100644 --- a/src/connectors/core/tables.py +++ b/py_dbcn/connectors/core/tables.py @@ -8,7 +8,7 @@ Should be inherited by language-specific connectors. # System Imports. # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/core/validate.py b/py_dbcn/connectors/core/validate.py similarity index 99% rename from src/connectors/core/validate.py rename to py_dbcn/connectors/core/validate.py index e3ffd5d..1b7e9a2 100644 --- a/src/connectors/core/validate.py +++ b/py_dbcn/connectors/core/validate.py @@ -9,7 +9,7 @@ Should be inherited by language-specific connectors. import copy # User Imports. -from src.logging import init_logging +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/__init__.py b/py_dbcn/connectors/mysql/__init__.py similarity index 100% rename from src/connectors/mysql/__init__.py rename to py_dbcn/connectors/mysql/__init__.py diff --git a/src/connectors/mysql/core.py b/py_dbcn/connectors/mysql/core.py similarity index 95% rename from src/connectors/mysql/core.py rename to py_dbcn/connectors/mysql/core.py index e7ef469..7400f85 100644 --- a/src/connectors/mysql/core.py +++ b/py_dbcn/connectors/mysql/core.py @@ -14,8 +14,8 @@ from .query import MysqlQuery from .records import MysqlRecords from .tables import MysqlTables from .validate import MysqlValidate -from src.connectors.core import AbstractDbConnector -from src.logging import init_logging +from py_dbcn.connectors.core import AbstractDbConnector +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/database.py b/py_dbcn/connectors/mysql/database.py similarity index 84% rename from src/connectors/mysql/database.py rename to py_dbcn/connectors/mysql/database.py index 0d31c2e..95dd5c8 100644 --- a/src/connectors/mysql/database.py +++ b/py_dbcn/connectors/mysql/database.py @@ -7,8 +7,8 @@ Contains database connection logic specific to MySQL databases. # System Imports. # User Imports. -from src.connectors.core.database import BaseDatabase -from src.logging import init_logging +from py_dbcn.connectors.core.database import BaseDatabase +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/display.py b/py_dbcn/connectors/mysql/display.py similarity index 85% rename from src/connectors/mysql/display.py rename to py_dbcn/connectors/mysql/display.py index 6df9232..8624e1c 100644 --- a/src/connectors/mysql/display.py +++ b/py_dbcn/connectors/mysql/display.py @@ -7,8 +7,8 @@ Contains database connection logic specific to MySQL databases. # System Imports. # User Imports. -from src.connectors.core.display import BaseDisplay -from src.logging import init_logging +from py_dbcn.connectors.core.display import BaseDisplay +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/query.py b/py_dbcn/connectors/mysql/query.py similarity index 84% rename from src/connectors/mysql/query.py rename to py_dbcn/connectors/mysql/query.py index 6ff8f3d..d668e6a 100644 --- a/src/connectors/mysql/query.py +++ b/py_dbcn/connectors/mysql/query.py @@ -7,8 +7,8 @@ Contains database connection logic specific to MySQL databases. # System Imports. # User Imports. -from src.connectors.core.query import BaseQuery -from src.logging import init_logging +from py_dbcn.connectors.core.query import BaseQuery +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/records.py b/py_dbcn/connectors/mysql/records.py similarity index 84% rename from src/connectors/mysql/records.py rename to py_dbcn/connectors/mysql/records.py index 0be6afc..bf0fbcd 100644 --- a/src/connectors/mysql/records.py +++ b/py_dbcn/connectors/mysql/records.py @@ -7,8 +7,8 @@ Contains database connection logic specific to MySQL databases. # System Imports. # User Imports. -from src.connectors.core.records import BaseRecords -from src.logging import init_logging +from py_dbcn.connectors.core.records import BaseRecords +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/tables.py b/py_dbcn/connectors/mysql/tables.py similarity index 84% rename from src/connectors/mysql/tables.py rename to py_dbcn/connectors/mysql/tables.py index 410342e..39329bb 100644 --- a/src/connectors/mysql/tables.py +++ b/py_dbcn/connectors/mysql/tables.py @@ -7,8 +7,8 @@ Contains database connection logic specific to MySQL databases. # System Imports. # User Imports. -from src.connectors.core.tables import BaseTables -from src.logging import init_logging +from py_dbcn.connectors.core.tables import BaseTables +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/mysql/validate.py b/py_dbcn/connectors/mysql/validate.py similarity index 84% rename from src/connectors/mysql/validate.py rename to py_dbcn/connectors/mysql/validate.py index 0aa1d16..e1d090f 100644 --- a/src/connectors/mysql/validate.py +++ b/py_dbcn/connectors/mysql/validate.py @@ -7,8 +7,8 @@ Contains database connection logic specific to MySQL databases. # System Imports. # User Imports. -from src.connectors.core.validate import BaseValidate -from src.logging import init_logging +from py_dbcn.connectors.core.validate import BaseValidate +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/__init__.py b/py_dbcn/connectors/postgresql/__init__.py similarity index 100% rename from src/connectors/postgresql/__init__.py rename to py_dbcn/connectors/postgresql/__init__.py diff --git a/src/connectors/postgresql/core.py b/py_dbcn/connectors/postgresql/core.py similarity index 95% rename from src/connectors/postgresql/core.py rename to py_dbcn/connectors/postgresql/core.py index a42a9ee..396be8f 100644 --- a/src/connectors/postgresql/core.py +++ b/py_dbcn/connectors/postgresql/core.py @@ -13,8 +13,8 @@ from .query import PostgresqlQuery from .records import PostgresqlRecords from .tables import PostgresqlTables from .validate import PostgresqlValidate -from src.connectors.core import AbstractDbConnector -from src.logging import init_logging +from py_dbcn.connectors.core import AbstractDbConnector +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/database.py b/py_dbcn/connectors/postgresql/database.py similarity index 84% rename from src/connectors/postgresql/database.py rename to py_dbcn/connectors/postgresql/database.py index a7ca306..0bbe3cb 100644 --- a/src/connectors/postgresql/database.py +++ b/py_dbcn/connectors/postgresql/database.py @@ -7,8 +7,8 @@ Contains database connection logic specific to PostgreSQL databases. # System Imports. # User Imports. -from src.connectors.core.database import BaseDatabase -from src.logging import init_logging +from py_dbcn.connectors.core.database import BaseDatabase +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/display.py b/py_dbcn/connectors/postgresql/display.py similarity index 85% rename from src/connectors/postgresql/display.py rename to py_dbcn/connectors/postgresql/display.py index a834715..21e4974 100644 --- a/src/connectors/postgresql/display.py +++ b/py_dbcn/connectors/postgresql/display.py @@ -7,8 +7,8 @@ Contains database connection logic specific to PostgreSQL databases. # System Imports. # User Imports. -from src.connectors.core.display import BaseDisplay -from src.logging import init_logging +from py_dbcn.connectors.core.display import BaseDisplay +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/query.py b/py_dbcn/connectors/postgresql/query.py similarity index 84% rename from src/connectors/postgresql/query.py rename to py_dbcn/connectors/postgresql/query.py index d127c25..c2e6aa5 100644 --- a/src/connectors/postgresql/query.py +++ b/py_dbcn/connectors/postgresql/query.py @@ -7,8 +7,8 @@ Contains database connection logic specific to PostgreSQL databases. # System Imports. # User Imports. -from src.connectors.core.query import BaseQuery -from src.logging import init_logging +from py_dbcn.connectors.core.query import BaseQuery +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/records.py b/py_dbcn/connectors/postgresql/records.py similarity index 85% rename from src/connectors/postgresql/records.py rename to py_dbcn/connectors/postgresql/records.py index 316522b..48cc15c 100644 --- a/src/connectors/postgresql/records.py +++ b/py_dbcn/connectors/postgresql/records.py @@ -7,8 +7,8 @@ Contains database connection logic specific to PostgreSQL databases. # System Imports. # User Imports. -from src.connectors.core.records import BaseRecords -from src.logging import init_logging +from py_dbcn.connectors.core.records import BaseRecords +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/tables.py b/py_dbcn/connectors/postgresql/tables.py similarity index 84% rename from src/connectors/postgresql/tables.py rename to py_dbcn/connectors/postgresql/tables.py index 44f15f5..ff17869 100644 --- a/src/connectors/postgresql/tables.py +++ b/py_dbcn/connectors/postgresql/tables.py @@ -7,8 +7,8 @@ Contains database connection logic specific to PostgreSQL databases. # System Imports. # User Imports. -from src.connectors.core.tables import BaseTables -from src.logging import init_logging +from py_dbcn.connectors.core.tables import BaseTables +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/postgresql/validate.py b/py_dbcn/connectors/postgresql/validate.py similarity index 85% rename from src/connectors/postgresql/validate.py rename to py_dbcn/connectors/postgresql/validate.py index 24175e5..80a26d2 100644 --- a/src/connectors/postgresql/validate.py +++ b/py_dbcn/connectors/postgresql/validate.py @@ -7,8 +7,8 @@ Contains database connection logic specific to PostgreSQL databases. # System Imports. # User Imports. -from src.connectors.core.validate import BaseValidate -from src.logging import init_logging +from py_dbcn.connectors.core.validate import BaseValidate +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/__init__.py b/py_dbcn/connectors/sqlite/__init__.py similarity index 100% rename from src/connectors/sqlite/__init__.py rename to py_dbcn/connectors/sqlite/__init__.py diff --git a/src/connectors/sqlite/core.py b/py_dbcn/connectors/sqlite/core.py similarity index 95% rename from src/connectors/sqlite/core.py rename to py_dbcn/connectors/sqlite/core.py index 3f076ca..583072a 100644 --- a/src/connectors/sqlite/core.py +++ b/py_dbcn/connectors/sqlite/core.py @@ -14,8 +14,8 @@ from .query import SqliteQuery from .records import SqliteRecords from .tables import SqliteTables from .validate import SqliteValidate -from src.connectors.core import AbstractDbConnector -from src.logging import init_logging +from py_dbcn.connectors.core import AbstractDbConnector +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/database.py b/py_dbcn/connectors/sqlite/database.py similarity index 84% rename from src/connectors/sqlite/database.py rename to py_dbcn/connectors/sqlite/database.py index f79fa42..c7cc817 100644 --- a/src/connectors/sqlite/database.py +++ b/py_dbcn/connectors/sqlite/database.py @@ -7,8 +7,8 @@ Contains database connection logic specific to SqLite databases. # System Imports. # User Imports. -from src.connectors.core.database import BaseDatabase -from src.logging import init_logging +from py_dbcn.connectors.core.database import BaseDatabase +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/display.py b/py_dbcn/connectors/sqlite/display.py similarity index 85% rename from src/connectors/sqlite/display.py rename to py_dbcn/connectors/sqlite/display.py index b8e40d3..cfc7d49 100644 --- a/src/connectors/sqlite/display.py +++ b/py_dbcn/connectors/sqlite/display.py @@ -7,8 +7,8 @@ Contains database connection logic specific to SqLite databases. # System Imports. # User Imports. -from src.connectors.core.display import BaseDisplay -from src.logging import init_logging +from py_dbcn.connectors.core.display import BaseDisplay +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/query.py b/py_dbcn/connectors/sqlite/query.py similarity index 84% rename from src/connectors/sqlite/query.py rename to py_dbcn/connectors/sqlite/query.py index 3bac88c..51e29b6 100644 --- a/src/connectors/sqlite/query.py +++ b/py_dbcn/connectors/sqlite/query.py @@ -7,8 +7,8 @@ Contains database connection logic specific to SqLite databases. # System Imports. # User Imports. -from src.connectors.core.query import BaseQuery -from src.logging import init_logging +from py_dbcn.connectors.core.query import BaseQuery +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/records.py b/py_dbcn/connectors/sqlite/records.py similarity index 84% rename from src/connectors/sqlite/records.py rename to py_dbcn/connectors/sqlite/records.py index 95fa894..40d53e6 100644 --- a/src/connectors/sqlite/records.py +++ b/py_dbcn/connectors/sqlite/records.py @@ -7,8 +7,8 @@ Contains database connection logic specific to SqLite databases. # System Imports. # User Imports. -from src.connectors.core.database import BaseDatabase -from src.logging import init_logging +from py_dbcn.connectors.core.database import BaseDatabase +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/tables.py b/py_dbcn/connectors/sqlite/tables.py similarity index 84% rename from src/connectors/sqlite/tables.py rename to py_dbcn/connectors/sqlite/tables.py index ca676f7..3f72ddb 100644 --- a/src/connectors/sqlite/tables.py +++ b/py_dbcn/connectors/sqlite/tables.py @@ -7,8 +7,8 @@ Contains database connection logic specific to SqLite databases. # System Imports. # User Imports. -from src.connectors.core.tables import BaseTables -from src.logging import init_logging +from py_dbcn.connectors.core.tables import BaseTables +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/connectors/sqlite/validate.py b/py_dbcn/connectors/sqlite/validate.py similarity index 84% rename from src/connectors/sqlite/validate.py rename to py_dbcn/connectors/sqlite/validate.py index ecb2139..b2e6c7f 100644 --- a/src/connectors/sqlite/validate.py +++ b/py_dbcn/connectors/sqlite/validate.py @@ -7,8 +7,8 @@ Contains database connection logic specific to SqLite databases. # System Imports. # User Imports. -from src.connectors.core.validate import BaseValidate -from src.logging import init_logging +from py_dbcn.connectors.core.validate import BaseValidate +from py_dbcn.logging import init_logging # Import logger. diff --git a/src/logging.py b/py_dbcn/logging.py similarity index 99% rename from src/logging.py rename to py_dbcn/logging.py index 9a2f5c1..0876f4e 100644 --- a/src/logging.py +++ b/py_dbcn/logging.py @@ -15,7 +15,7 @@ import logging.config this = sys.modules[__name__] this.settings = None project_dir = pathlib.Path().absolute() -this.logging_directory = project_dir.joinpath('src/logs') +this.logging_directory = project_dir.joinpath('py_dbcn/logs') this.logging_class = 'logging.handlers.RotatingFileHandler' this.logging_max_bytes = 1024 * 1024 * 10 # Max log file size of 10 MB. this.logging_backup_count = 10 # Keep 10 log files before overwriting. diff --git a/tests/connectors/core/test_database.py b/tests/connectors/core/test_database.py index 8b1cc07..e62c103 100644 --- a/tests/connectors/core/test_database.py +++ b/tests/connectors/core/test_database.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestCoreDatabase(unittest.TestCase): diff --git a/tests/connectors/core/test_display.py b/tests/connectors/core/test_display.py index 8fdbeab..2292275 100644 --- a/tests/connectors/core/test_display.py +++ b/tests/connectors/core/test_display.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestCoreDisplay(unittest.TestCase): diff --git a/tests/connectors/core/test_query.py b/tests/connectors/core/test_query.py index a4d07f8..c70fb69 100644 --- a/tests/connectors/core/test_query.py +++ b/tests/connectors/core/test_query.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestCoreQuery(unittest.TestCase): diff --git a/tests/connectors/core/test_records.py b/tests/connectors/core/test_records.py index ce9f981..48bacc2 100644 --- a/tests/connectors/core/test_records.py +++ b/tests/connectors/core/test_records.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestCoreRecords(unittest.TestCase): diff --git a/tests/connectors/core/test_tables.py b/tests/connectors/core/test_tables.py index 7fac9fc..ceb8039 100644 --- a/tests/connectors/core/test_tables.py +++ b/tests/connectors/core/test_tables.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestCoreTables(unittest.TestCase): diff --git a/tests/connectors/core/test_validate.py b/tests/connectors/core/test_validate.py index 396af52..2b3b643 100644 --- a/tests/connectors/core/test_validate.py +++ b/tests/connectors/core/test_validate.py @@ -7,8 +7,8 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector -from src.connectors.core.validate import BaseValidate +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors.core.validate import BaseValidate class TestCoreValidate(unittest.TestCase): diff --git a/tests/connectors/mysql/test_core.py b/tests/connectors/mysql/test_core.py index 53c4667..255e01e 100644 --- a/tests/connectors/mysql/test_core.py +++ b/tests/connectors/mysql/test_core.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config -from src.connectors import MysqlDbConnector +from py_dbcn.connectors import MysqlDbConnector class TestMysqlDatabaseParent(unittest.TestCase): diff --git a/tests/connectors/mysql/test_validate.py b/tests/connectors/mysql/test_validate.py index ef425e2..518a088 100644 --- a/tests/connectors/mysql/test_validate.py +++ b/tests/connectors/mysql/test_validate.py @@ -7,8 +7,8 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector -from src.connectors.core.validate import BaseValidate +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors.core.validate import BaseValidate class TestMysqlValidate(unittest.TestCase): diff --git a/tests/connectors/postgresql/test_database.py b/tests/connectors/postgresql/test_database.py index 970c968..5240090 100644 --- a/tests/connectors/postgresql/test_database.py +++ b/tests/connectors/postgresql/test_database.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestPostgresqlDatabase(unittest.TestCase): diff --git a/tests/connectors/postgresql/test_display.py b/tests/connectors/postgresql/test_display.py index 38da3e1..c54f758 100644 --- a/tests/connectors/postgresql/test_display.py +++ b/tests/connectors/postgresql/test_display.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestPostgresqlDisplay(unittest.TestCase): diff --git a/tests/connectors/postgresql/test_query.py b/tests/connectors/postgresql/test_query.py index d87a2c9..ba801ac 100644 --- a/tests/connectors/postgresql/test_query.py +++ b/tests/connectors/postgresql/test_query.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestPostgresqlQuery(unittest.TestCase): diff --git a/tests/connectors/postgresql/test_records.py b/tests/connectors/postgresql/test_records.py index 8c083c8..8420108 100644 --- a/tests/connectors/postgresql/test_records.py +++ b/tests/connectors/postgresql/test_records.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestPostgresqlRecords(unittest.TestCase): diff --git a/tests/connectors/postgresql/test_tables.py b/tests/connectors/postgresql/test_tables.py index 13a19ae..4240b3e 100644 --- a/tests/connectors/postgresql/test_tables.py +++ b/tests/connectors/postgresql/test_tables.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestPostgresqlTables(unittest.TestCase): diff --git a/tests/connectors/postgresql/test_validate.py b/tests/connectors/postgresql/test_validate.py index c6361d7..814d7ba 100644 --- a/tests/connectors/postgresql/test_validate.py +++ b/tests/connectors/postgresql/test_validate.py @@ -7,8 +7,8 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector -from src.connectors.core.validate import BaseValidate +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors.core.validate import BaseValidate class TestPostgresqlValidate(unittest.TestCase): diff --git a/tests/connectors/sqlite/test_database.py b/tests/connectors/sqlite/test_database.py index df0cbd0..9f056f3 100644 --- a/tests/connectors/sqlite/test_database.py +++ b/tests/connectors/sqlite/test_database.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestSqliteDatabase(unittest.TestCase): diff --git a/tests/connectors/sqlite/test_display.py b/tests/connectors/sqlite/test_display.py index 95023cd..fd4d5e2 100644 --- a/tests/connectors/sqlite/test_display.py +++ b/tests/connectors/sqlite/test_display.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestSqliteDisplay(unittest.TestCase): diff --git a/tests/connectors/sqlite/test_query.py b/tests/connectors/sqlite/test_query.py index fa242ac..c1c7b59 100644 --- a/tests/connectors/sqlite/test_query.py +++ b/tests/connectors/sqlite/test_query.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestSqliteQuery(unittest.TestCase): diff --git a/tests/connectors/sqlite/test_records.py b/tests/connectors/sqlite/test_records.py index 66e39fb..eceec41 100644 --- a/tests/connectors/sqlite/test_records.py +++ b/tests/connectors/sqlite/test_records.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestSqliteRecords(unittest.TestCase): diff --git a/tests/connectors/sqlite/test_tables.py b/tests/connectors/sqlite/test_tables.py index d43e0a6..992cf17 100644 --- a/tests/connectors/sqlite/test_tables.py +++ b/tests/connectors/sqlite/test_tables.py @@ -7,7 +7,7 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector class TestSqliteTables(unittest.TestCase): diff --git a/tests/connectors/sqlite/test_validate.py b/tests/connectors/sqlite/test_validate.py index 47169ea..31b7cb1 100644 --- a/tests/connectors/sqlite/test_validate.py +++ b/tests/connectors/sqlite/test_validate.py @@ -7,8 +7,8 @@ import unittest # User Imports. from config import mysql_config, sqlite_config -from src.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector -from src.connectors.core.validate import BaseValidate +from py_dbcn.connectors import MysqlDbConnector, PostgresqlDbConnector, SqliteDbConnector +from py_dbcn.connectors.core.validate import BaseValidate class TestSqliteValidate(unittest.TestCase): -- GitLab