Restructured project from flat-file to src

Kieran-Lock · Oct 17, 2023 · b2a8b5a · b2a8b5a
1 parent aadb647
commit b2a8b5a
Show file tree

Hide file tree

Showing 58 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 → src/sqliteframe/__init__.py b/sqliteframe/__init__.py → src/sqliteframe/__init__.py
diff --git a/sqliteframe/database.py → src/sqliteframe/database.py b/sqliteframe/database.py → src/sqliteframe/database.py
diff --git a/sqliteframe/entity/__init__.py → src/sqliteframe/entity/__init__.py b/sqliteframe/entity/__init__.py → src/sqliteframe/entity/__init__.py
diff --git a/sqliteframe/entity/column.py → src/sqliteframe/entity/column.py b/sqliteframe/entity/column.py → src/sqliteframe/entity/column.py
diff --git a/sqliteframe/entity/entity.py → src/sqliteframe/entity/entity.py b/sqliteframe/entity/entity.py → src/sqliteframe/entity/entity.py
diff --git a/sqliteframe/entity/preserve_order.py → src/sqliteframe/entity/preserve_order.py b/sqliteframe/entity/preserve_order.py → src/sqliteframe/entity/preserve_order.py
diff --git a/sqliteframe/foreign_key/__init__.py → src/sqliteframe/foreign_key/__init__.py b/sqliteframe/foreign_key/__init__.py → src/sqliteframe/foreign_key/__init__.py
diff --git a/sqliteframe/foreign_key/foreign_key.py → src/sqliteframe/foreign_key/foreign_key.py b/sqliteframe/foreign_key/foreign_key.py → src/sqliteframe/foreign_key/foreign_key.py
diff --git a/sqliteframe/foreign_key/restraints.py → src/sqliteframe/foreign_key/restraints.py b/sqliteframe/foreign_key/restraints.py → src/sqliteframe/foreign_key/restraints.py
diff --git a/sqliteframe/join/__init__.py → src/sqliteframe/join/__init__.py b/sqliteframe/join/__init__.py → src/sqliteframe/join/__init__.py
diff --git a/sqliteframe/join/join.py → src/sqliteframe/join/join.py b/sqliteframe/join/join.py → src/sqliteframe/join/join.py
diff --git a/sqliteframe/join/join_types.py → src/sqliteframe/join/join_types.py b/sqliteframe/join/join_types.py → src/sqliteframe/join/join_types.py
diff --git a/sqliteframe/order_by/__init__.py → src/sqliteframe/order_by/__init__.py b/sqliteframe/order_by/__init__.py → src/sqliteframe/order_by/__init__.py
diff --git a/sqliteframe/order_by/order_by.py → src/sqliteframe/order_by/order_by.py b/sqliteframe/order_by/order_by.py → src/sqliteframe/order_by/order_by.py
diff --git a/sqliteframe/order_by/order_types.py → src/sqliteframe/order_by/order_types.py b/sqliteframe/order_by/order_types.py → src/sqliteframe/order_by/order_types.py
diff --git a/sqliteframe/parameterized/__init__.py → src/sqliteframe/parameterized/__init__.py b/sqliteframe/parameterized/__init__.py → src/sqliteframe/parameterized/__init__.py
diff --git a/sqliteframe/parameterized/parameterized.py → ...qliteframe/parameterized/parameterized.py b/sqliteframe/parameterized/parameterized.py → ...qliteframe/parameterized/parameterized.py
diff --git a/sqliteframe/pragma/__init__.py → src/sqliteframe/pragma/__init__.py b/sqliteframe/pragma/__init__.py → src/sqliteframe/pragma/__init__.py
diff --git a/sqliteframe/pragma/statements.py → src/sqliteframe/pragma/statements.py b/sqliteframe/pragma/statements.py → src/sqliteframe/pragma/statements.py
diff --git a/sqliteframe/pragma/types.py → src/sqliteframe/pragma/types.py b/sqliteframe/pragma/types.py → src/sqliteframe/pragma/types.py
diff --git a/sqliteframe/result/__init__.py → src/sqliteframe/result/__init__.py b/sqliteframe/result/__init__.py → src/sqliteframe/result/__init__.py
diff --git a/sqliteframe/result/result.py → src/sqliteframe/result/result.py b/sqliteframe/result/result.py → src/sqliteframe/result/result.py
diff --git a/sqliteframe/statements/__init__.py → src/sqliteframe/statements/__init__.py b/sqliteframe/statements/__init__.py → src/sqliteframe/statements/__init__.py
diff --git a/sqliteframe/statements/create_table.py → src/sqliteframe/statements/create_table.py b/sqliteframe/statements/create_table.py → src/sqliteframe/statements/create_table.py
diff --git a/sqliteframe/statements/delete_from.py → src/sqliteframe/statements/delete_from.py b/sqliteframe/statements/delete_from.py → src/sqliteframe/statements/delete_from.py
diff --git a/sqliteframe/statements/drop_table.py → src/sqliteframe/statements/drop_table.py b/sqliteframe/statements/drop_table.py → src/sqliteframe/statements/drop_table.py
diff --git a/sqliteframe/statements/insert_into.py → src/sqliteframe/statements/insert_into.py b/sqliteframe/statements/insert_into.py → src/sqliteframe/statements/insert_into.py
diff --git a/sqliteframe/statements/pragma.py → src/sqliteframe/statements/pragma.py b/sqliteframe/statements/pragma.py → src/sqliteframe/statements/pragma.py
diff --git a/sqliteframe/statements/select.py → src/sqliteframe/statements/select.py b/sqliteframe/statements/select.py → src/sqliteframe/statements/select.py
diff --git a/sqliteframe/statements/set.py → src/sqliteframe/statements/set.py b/sqliteframe/statements/set.py → src/sqliteframe/statements/set.py
diff --git a/sqliteframe/statements/statement.py → src/sqliteframe/statements/statement.py b/sqliteframe/statements/statement.py → src/sqliteframe/statements/statement.py
diff --git a/sqliteframe/suggested_schema/__init__.py → src/sqliteframe/suggested_schema/__init__.py b/sqliteframe/suggested_schema/__init__.py → src/sqliteframe/suggested_schema/__init__.py
diff --git a/sqliteframe/suggested_schema/column.py → src/sqliteframe/suggested_schema/column.py b/sqliteframe/suggested_schema/column.py → 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 → ...sqliteframe/suggested_schema/fk_column.py b/sqliteframe/suggested_schema/fk_column.py → ...sqliteframe/suggested_schema/fk_column.py
diff --git a/sqliteframe/suggested_schema/schema.py → src/sqliteframe/suggested_schema/schema.py b/sqliteframe/suggested_schema/schema.py → 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 → src/sqliteframe/suggested_schema/table.py b/sqliteframe/suggested_schema/table.py → 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 → ...iteframe/suggested_schema/unknown_type.py b/sqliteframe/suggested_schema/unknown_type.py → ...iteframe/suggested_schema/unknown_type.py
diff --git a/sqliteframe/types/__init__.py → src/sqliteframe/types/__init__.py b/sqliteframe/types/__init__.py → src/sqliteframe/types/__init__.py
diff --git a/sqliteframe/types/blob.py → src/sqliteframe/types/blob.py b/sqliteframe/types/blob.py → src/sqliteframe/types/blob.py
diff --git a/sqliteframe/types/boolean.py → src/sqliteframe/types/boolean.py b/sqliteframe/types/boolean.py → src/sqliteframe/types/boolean.py
diff --git a/sqliteframe/types/date.py → src/sqliteframe/types/date.py b/sqliteframe/types/date.py → src/sqliteframe/types/date.py
diff --git a/sqliteframe/types/float.py → src/sqliteframe/types/float.py b/sqliteframe/types/float.py → src/sqliteframe/types/float.py
diff --git a/sqliteframe/types/integer.py → src/sqliteframe/types/integer.py b/sqliteframe/types/integer.py → src/sqliteframe/types/integer.py
diff --git a/sqliteframe/types/null.py → src/sqliteframe/types/null.py b/sqliteframe/types/null.py → src/sqliteframe/types/null.py
diff --git a/sqliteframe/types/string.py → src/sqliteframe/types/string.py b/sqliteframe/types/string.py → src/sqliteframe/types/string.py
diff --git a/sqliteframe/types/time.py → src/sqliteframe/types/time.py b/sqliteframe/types/time.py → src/sqliteframe/types/time.py
diff --git a/sqliteframe/types/type.py → src/sqliteframe/types/type.py b/sqliteframe/types/type.py → src/sqliteframe/types/type.py
diff --git a/sqliteframe/types/types.py → src/sqliteframe/types/types.py b/sqliteframe/types/types.py → src/sqliteframe/types/types.py
diff --git a/sqliteframe/where/__init__.py → src/sqliteframe/where/__init__.py b/sqliteframe/where/__init__.py → src/sqliteframe/where/__init__.py
diff --git a/sqliteframe/where/comparisons.py → src/sqliteframe/where/comparisons.py b/sqliteframe/where/comparisons.py → src/sqliteframe/where/comparisons.py
diff --git a/sqliteframe/where/condition.py → src/sqliteframe/where/condition.py b/sqliteframe/where/condition.py → src/sqliteframe/where/condition.py
diff --git a/sqliteframe/where/conjunctions.py → src/sqliteframe/where/conjunctions.py b/sqliteframe/where/conjunctions.py → src/sqliteframe/where/conjunctions.py
diff --git a/sqliteframe/where/where.py → src/sqliteframe/where/where.py b/sqliteframe/where/where.py → src/sqliteframe/where/where.py
diff --git a/sqliteframe/wildcards/__init__.py → src/sqliteframe/wildcards/__init__.py b/sqliteframe/wildcards/__init__.py → src/sqliteframe/wildcards/__init__.py
diff --git a/sqliteframe/wildcards/wildcards.py → src/sqliteframe/wildcards/wildcards.py b/sqliteframe/wildcards/wildcards.py → src/sqliteframe/wildcards/wildcards.py