Merge pull request #20 from python-ellar/requirement_fix

rearrangement lib dependencies

Author: eadwinCode

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Install build dependencies
         run: pip install build
       - name: Build distribution

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: make test-cov
       - name: Coverage

.github/workflows/test_full.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: pytest tests
 
@@ -36,7 +36,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Linting check
         run: ruff check ellar_sql tests
       - name: mypy

Makefile

@@ -13,7 +13,8 @@ clean: ## Removing cached python compiled files
 	find . -name .ruff_cache  | xargs  rm -rfv
 
 install: ## Install dependencies
-	flit install --deps develop --symlink
+	pip install -r requirements.txt
+	flit install --symlink
 
 install-full: ## Install dependencies
 	make install
@@ -24,8 +25,8 @@ lint:fmt ## Run code linters
 	mypy ellar_sql
 
 fmt format:clean ## Run code formatters
-	ruff format ellar_sql tests examples
-	ruff check --fix ellar_sql tests examples
+	ruff format ellar_sql tests samples
+	ruff check --fix ellar_sql tests samples
 
 test:clean ## Run tests
 	pytest

ellar_sql/model/base.py

@@ -157,14 +157,11 @@ class ModelBase(ModelDataExportMixin):
 
         __table_args__: t.Any
 
-        def __init__(self, **kwargs: t.Any) -> None:
-            ...
+        def __init__(self, **kwargs: t.Any) -> None: ...
 
-        def _sa_inspect_type(self) -> sa.Mapper["ModelBase"]:
-            ...
+        def _sa_inspect_type(self) -> sa.Mapper["ModelBase"]: ...
 
-        def _sa_inspect_instance(self) -> sa.InstanceState["ModelBase"]:
-            ...
+        def _sa_inspect_instance(self) -> sa.InstanceState["ModelBase"]: ...
 
     @classmethod
     def get_db_session(

ellar_sql/model/table.py

@@ -30,8 +30,7 @@ def __init__(
         *args: sa_sql_schema.SchemaItem,
         __database__: t.Optional[str] = None,
         **kwargs: t.Any,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @t.overload
     def __init__(
@@ -40,14 +39,12 @@ def __init__(
         metadata: sa.MetaData,
         *args: sa_sql_schema.SchemaItem,
         **kwargs: t.Any,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @t.overload
     def __init__(
         self, name: str, *args: sa_sql_schema.SchemaItem, **kwargs: t.Any
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def __init__(
         self, name: str, *args: sa_sql_schema.SchemaItem, **kwargs: t.Any

ellar_sql/pagination/view.py

@@ -65,8 +65,7 @@ def pagination_context(
 
     if t.TYPE_CHECKING:
 
-        def __init__(self, **kwargs: t.Any) -> None:
-            ...
+        def __init__(self, **kwargs: t.Any) -> None: ...
 
 
 class PageNumberPagination(PaginationBase):

pyproject.toml

@@ -37,40 +37,12 @@ dependencies = [
     "alembic >= 1.10.0"
 ]
 
-dev = [
-    "pre-commit"
-]
-doc = [
-    "mkdocs >=1.1.2,<2.0.0",
-    "mkdocs-material >=7.1.9,<10.0.0",
-    "mdx-include >=1.4.1,<2.0.0",
-    "mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0",
-    "markdown-include",
-    "mkdocstrings",
-    "mkdocs-minify-plugin",
-    "mkdocs-git-revision-date-localized-plugin"
-]
-
 [project.urls]
 Documentation = "https://github.com/python-ellar/ellar-sql"
 Source = "https://github.com/python-ellar/ellar-sql"
 Homepage = "https://python-ellar.github.io/ellar-sql/"
 "Bug Tracker" = "https://github.com/python-ellar/ellar-sql/issues"
 
-[project.optional-dependencies]
-test = [
-    "pytest >= 7.1.3,< 9.0.0",
-    "pytest-cov >= 2.12.0,<5.0.0",
-    "pytest-asyncio",
-    "aiosqlite",
-    "anyio[trio] >= 3.2.1",
-    "ruff ==0.3.0",
-    "mypy == 1.8.0",
-    "autoflake",
-    "ellar-cli >= 0.3.3",
-    "factory-boy >= 3.3.0"
-]
-
 [tool.ruff]
 select = [
     "E",  # pycodestyle errors

pytest.ini

@@ -2,7 +2,7 @@
 addopts = --strict-config --strict-markers
 xfail_strict = true
 junit_family = "xunit2"
-norecursedirs = examples/*
+norecursedirs = samples/*
 
 [pytest-watch]
 runner= pytest --failed-first --maxfail=1 --no-success-flaky-report

requirements-docs.txt

@@ -0,0 +1,8 @@
+markdown-include
+mdx-include >=1.4.1,<2.0.0
+mkdocs >=1.1.2,<2.0.0
+mkdocs-git-revision-date-localized-plugin
+mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0
+mkdocs-material >=7.1.9,<10.0.0
+mkdocs-minify-plugin
+mkdocstrings[python] >=0.19.0, <0.25.0