diff --git a/main.py b/main.py index 0b20eb7..c52e58c 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,7 @@ from schema import Person, Car, database from pprint import pprint from datetime import date -from sqliteframe import JoinTypes, OrderTypes +from src.sqliteframe import JoinTypes, OrderTypes insert_person_1 = Person.insert_into({ diff --git a/pyproject.toml b/pyproject.toml index 5be7a75..19d5fb1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ authors = [ ] keywords = ["orm", "sqlite3", "schematics", "lightweight", "zero-dependency"] classifiers = [ + "Development Status :: 3 - Alpha", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3.8", "Intended Audience :: Developers" @@ -23,3 +24,9 @@ build-backend = "setuptools.build_meta" GitHub = "https://github.com/Kieran-Lock/SQLiteFrame" Documentation = "https://sqliteframe-documentation.vercel.app/" License = "https://github.com/Kieran-Lock/SQLiteFrame/blob/master/LICENSE" + +[tool.setuptools.packages.find] +where = ["src"] + +[tool.setuptools.package-data] +"*" = ["**/*"] diff --git a/schema.py b/schema.py index be54ab0..991f902 100644 --- a/schema.py +++ b/schema.py @@ -1,4 +1,4 @@ -from sqliteframe import Database, table, String, Boolean, Date, Time, ForeignKey, Blob, Float, Integer, PreserveOrder +from src.sqliteframe import Database, table, String, Boolean, Date, Time, ForeignKey, Blob, Float, Integer, PreserveOrder from datetime import date, time from pathlib import Path diff --git a/sqliteframe/__init__.py b/src/sqliteframe/__init__.py similarity index 100% rename from sqliteframe/__init__.py rename to src/sqliteframe/__init__.py diff --git a/sqliteframe/database.py b/src/sqliteframe/database.py similarity index 100% rename from sqliteframe/database.py rename to src/sqliteframe/database.py diff --git a/sqliteframe/entity/__init__.py b/src/sqliteframe/entity/__init__.py similarity index 100% rename from sqliteframe/entity/__init__.py rename to src/sqliteframe/entity/__init__.py diff --git a/sqliteframe/entity/column.py b/src/sqliteframe/entity/column.py similarity index 100% rename from sqliteframe/entity/column.py rename to src/sqliteframe/entity/column.py diff --git a/sqliteframe/entity/entity.py b/src/sqliteframe/entity/entity.py similarity index 100% rename from sqliteframe/entity/entity.py rename to src/sqliteframe/entity/entity.py diff --git a/sqliteframe/entity/preserve_order.py b/src/sqliteframe/entity/preserve_order.py similarity index 100% rename from sqliteframe/entity/preserve_order.py rename to src/sqliteframe/entity/preserve_order.py diff --git a/sqliteframe/foreign_key/__init__.py b/src/sqliteframe/foreign_key/__init__.py similarity index 100% rename from sqliteframe/foreign_key/__init__.py rename to src/sqliteframe/foreign_key/__init__.py diff --git a/sqliteframe/foreign_key/foreign_key.py b/src/sqliteframe/foreign_key/foreign_key.py similarity index 100% rename from sqliteframe/foreign_key/foreign_key.py rename to src/sqliteframe/foreign_key/foreign_key.py diff --git a/sqliteframe/foreign_key/restraints.py b/src/sqliteframe/foreign_key/restraints.py similarity index 100% rename from sqliteframe/foreign_key/restraints.py rename to src/sqliteframe/foreign_key/restraints.py diff --git a/sqliteframe/join/__init__.py b/src/sqliteframe/join/__init__.py similarity index 100% rename from sqliteframe/join/__init__.py rename to src/sqliteframe/join/__init__.py diff --git a/sqliteframe/join/join.py b/src/sqliteframe/join/join.py similarity index 100% rename from sqliteframe/join/join.py rename to src/sqliteframe/join/join.py diff --git a/sqliteframe/join/join_types.py b/src/sqliteframe/join/join_types.py similarity index 100% rename from sqliteframe/join/join_types.py rename to src/sqliteframe/join/join_types.py diff --git a/sqliteframe/order_by/__init__.py b/src/sqliteframe/order_by/__init__.py similarity index 100% rename from sqliteframe/order_by/__init__.py rename to src/sqliteframe/order_by/__init__.py diff --git a/sqliteframe/order_by/order_by.py b/src/sqliteframe/order_by/order_by.py similarity index 100% rename from sqliteframe/order_by/order_by.py rename to src/sqliteframe/order_by/order_by.py diff --git a/sqliteframe/order_by/order_types.py b/src/sqliteframe/order_by/order_types.py similarity index 100% rename from sqliteframe/order_by/order_types.py rename to src/sqliteframe/order_by/order_types.py diff --git a/sqliteframe/parameterized/__init__.py b/src/sqliteframe/parameterized/__init__.py similarity index 100% rename from sqliteframe/parameterized/__init__.py rename to src/sqliteframe/parameterized/__init__.py diff --git a/sqliteframe/parameterized/parameterized.py b/src/sqliteframe/parameterized/parameterized.py similarity index 100% rename from sqliteframe/parameterized/parameterized.py rename to src/sqliteframe/parameterized/parameterized.py diff --git a/sqliteframe/pragma/__init__.py b/src/sqliteframe/pragma/__init__.py similarity index 100% rename from sqliteframe/pragma/__init__.py rename to src/sqliteframe/pragma/__init__.py diff --git a/sqliteframe/pragma/statements.py b/src/sqliteframe/pragma/statements.py similarity index 100% rename from sqliteframe/pragma/statements.py rename to src/sqliteframe/pragma/statements.py diff --git a/sqliteframe/pragma/types.py b/src/sqliteframe/pragma/types.py similarity index 100% rename from sqliteframe/pragma/types.py rename to src/sqliteframe/pragma/types.py diff --git a/sqliteframe/result/__init__.py b/src/sqliteframe/result/__init__.py similarity index 100% rename from sqliteframe/result/__init__.py rename to src/sqliteframe/result/__init__.py diff --git a/sqliteframe/result/result.py b/src/sqliteframe/result/result.py similarity index 100% rename from sqliteframe/result/result.py rename to src/sqliteframe/result/result.py diff --git a/sqliteframe/statements/__init__.py b/src/sqliteframe/statements/__init__.py similarity index 100% rename from sqliteframe/statements/__init__.py rename to src/sqliteframe/statements/__init__.py diff --git a/sqliteframe/statements/create_table.py b/src/sqliteframe/statements/create_table.py similarity index 100% rename from sqliteframe/statements/create_table.py rename to src/sqliteframe/statements/create_table.py diff --git a/sqliteframe/statements/delete_from.py b/src/sqliteframe/statements/delete_from.py similarity index 100% rename from sqliteframe/statements/delete_from.py rename to src/sqliteframe/statements/delete_from.py diff --git a/sqliteframe/statements/drop_table.py b/src/sqliteframe/statements/drop_table.py similarity index 100% rename from sqliteframe/statements/drop_table.py rename to src/sqliteframe/statements/drop_table.py diff --git a/sqliteframe/statements/insert_into.py b/src/sqliteframe/statements/insert_into.py similarity index 100% rename from sqliteframe/statements/insert_into.py rename to src/sqliteframe/statements/insert_into.py diff --git a/sqliteframe/statements/pragma.py b/src/sqliteframe/statements/pragma.py similarity index 100% rename from sqliteframe/statements/pragma.py rename to src/sqliteframe/statements/pragma.py diff --git a/sqliteframe/statements/select.py b/src/sqliteframe/statements/select.py similarity index 100% rename from sqliteframe/statements/select.py rename to src/sqliteframe/statements/select.py diff --git a/sqliteframe/statements/set.py b/src/sqliteframe/statements/set.py similarity index 100% rename from sqliteframe/statements/set.py rename to src/sqliteframe/statements/set.py diff --git a/sqliteframe/statements/statement.py b/src/sqliteframe/statements/statement.py similarity index 100% rename from sqliteframe/statements/statement.py rename to src/sqliteframe/statements/statement.py diff --git a/sqliteframe/suggested_schema/__init__.py b/src/sqliteframe/suggested_schema/__init__.py similarity index 100% rename from sqliteframe/suggested_schema/__init__.py rename to src/sqliteframe/suggested_schema/__init__.py diff --git a/sqliteframe/suggested_schema/column.py b/src/sqliteframe/suggested_schema/column.py similarity index 96% rename from sqliteframe/suggested_schema/column.py rename to src/sqliteframe/suggested_schema/column.py index 533e86e..3459595 100644 --- a/sqliteframe/suggested_schema/column.py +++ b/src/sqliteframe/suggested_schema/column.py @@ -2,7 +2,8 @@ The module containing logic for columns when suggesting schemas. """ -from sqliteframe import FKRestraints, Types +from ..foreign_key import Restraints as FKRestraints +from ..types import Types from .unknown_type import UnknownType diff --git a/sqliteframe/suggested_schema/fk_column.py b/src/sqliteframe/suggested_schema/fk_column.py similarity index 100% rename from sqliteframe/suggested_schema/fk_column.py rename to src/sqliteframe/suggested_schema/fk_column.py diff --git a/sqliteframe/suggested_schema/schema.py b/src/sqliteframe/suggested_schema/schema.py similarity index 97% rename from sqliteframe/suggested_schema/schema.py rename to src/sqliteframe/suggested_schema/schema.py index 406c134..240a2d7 100644 --- a/sqliteframe/suggested_schema/schema.py +++ b/src/sqliteframe/suggested_schema/schema.py @@ -2,7 +2,7 @@ The logic for generating an entire suggested schema. """ -from sqliteframe import Database +from ..database import Database from sqlite3 import Cursor from .table import Table diff --git a/sqliteframe/suggested_schema/table.py b/src/sqliteframe/suggested_schema/table.py similarity index 94% rename from sqliteframe/suggested_schema/table.py rename to src/sqliteframe/suggested_schema/table.py index 34f2fd7..77b8db3 100644 --- a/sqliteframe/suggested_schema/table.py +++ b/src/sqliteframe/suggested_schema/table.py @@ -3,7 +3,9 @@ """ from typing import Generator -from sqliteframe import Pragma, PragmaStatements, PragmaTypes, Database +from ..pragma import PragmaStatements, PragmaTypes +from ..statements import Pragma +from ..database import Database from .column import Column from .fk_column import FKColumn diff --git a/sqliteframe/suggested_schema/unknown_type.py b/src/sqliteframe/suggested_schema/unknown_type.py similarity index 100% rename from sqliteframe/suggested_schema/unknown_type.py rename to src/sqliteframe/suggested_schema/unknown_type.py diff --git a/sqliteframe/types/__init__.py b/src/sqliteframe/types/__init__.py similarity index 100% rename from sqliteframe/types/__init__.py rename to src/sqliteframe/types/__init__.py diff --git a/sqliteframe/types/blob.py b/src/sqliteframe/types/blob.py similarity index 100% rename from sqliteframe/types/blob.py rename to src/sqliteframe/types/blob.py diff --git a/sqliteframe/types/boolean.py b/src/sqliteframe/types/boolean.py similarity index 100% rename from sqliteframe/types/boolean.py rename to src/sqliteframe/types/boolean.py diff --git a/sqliteframe/types/date.py b/src/sqliteframe/types/date.py similarity index 100% rename from sqliteframe/types/date.py rename to src/sqliteframe/types/date.py diff --git a/sqliteframe/types/float.py b/src/sqliteframe/types/float.py similarity index 100% rename from sqliteframe/types/float.py rename to src/sqliteframe/types/float.py diff --git a/sqliteframe/types/integer.py b/src/sqliteframe/types/integer.py similarity index 100% rename from sqliteframe/types/integer.py rename to src/sqliteframe/types/integer.py diff --git a/sqliteframe/types/null.py b/src/sqliteframe/types/null.py similarity index 100% rename from sqliteframe/types/null.py rename to src/sqliteframe/types/null.py diff --git a/sqliteframe/types/string.py b/src/sqliteframe/types/string.py similarity index 100% rename from sqliteframe/types/string.py rename to src/sqliteframe/types/string.py diff --git a/sqliteframe/types/time.py b/src/sqliteframe/types/time.py similarity index 100% rename from sqliteframe/types/time.py rename to src/sqliteframe/types/time.py diff --git a/sqliteframe/types/type.py b/src/sqliteframe/types/type.py similarity index 100% rename from sqliteframe/types/type.py rename to src/sqliteframe/types/type.py diff --git a/sqliteframe/types/types.py b/src/sqliteframe/types/types.py similarity index 100% rename from sqliteframe/types/types.py rename to src/sqliteframe/types/types.py diff --git a/sqliteframe/where/__init__.py b/src/sqliteframe/where/__init__.py similarity index 100% rename from sqliteframe/where/__init__.py rename to src/sqliteframe/where/__init__.py diff --git a/sqliteframe/where/comparisons.py b/src/sqliteframe/where/comparisons.py similarity index 100% rename from sqliteframe/where/comparisons.py rename to src/sqliteframe/where/comparisons.py diff --git a/sqliteframe/where/condition.py b/src/sqliteframe/where/condition.py similarity index 100% rename from sqliteframe/where/condition.py rename to src/sqliteframe/where/condition.py diff --git a/sqliteframe/where/conjunctions.py b/src/sqliteframe/where/conjunctions.py similarity index 100% rename from sqliteframe/where/conjunctions.py rename to src/sqliteframe/where/conjunctions.py diff --git a/sqliteframe/where/where.py b/src/sqliteframe/where/where.py similarity index 100% rename from sqliteframe/where/where.py rename to src/sqliteframe/where/where.py diff --git a/sqliteframe/wildcards/__init__.py b/src/sqliteframe/wildcards/__init__.py similarity index 100% rename from sqliteframe/wildcards/__init__.py rename to src/sqliteframe/wildcards/__init__.py diff --git a/sqliteframe/wildcards/wildcards.py b/src/sqliteframe/wildcards/wildcards.py similarity index 100% rename from sqliteframe/wildcards/wildcards.py rename to src/sqliteframe/wildcards/wildcards.py