upgraded package dependencies and python version

Author: eadwinCode

ellar/core/schema.py

@@ -113,44 +113,3 @@ class HTTPValidationError(BaseModel):
 
 class Schema(Serializer):
     pass
-
-
-class EllarPyProjectSerializer(Serializer):
-    project_name: str = Field(alias="project-name")
-    application: str = Field(alias="application")
-    config: str = Field(alias="config")
-    root_module: str = Field(alias="root-module")
-    apps_module: str = Field(alias="apps-module")
-
-
-class EllarScaffoldList(Serializer):
-    name: str
-    is_directory: bool
-    name_in_context: t.Optional[bool] = Field(default=None, alias="name-context")
-    files: t.Optional[t.List["EllarScaffoldList"]]
-
-
-EllarScaffoldList.update_forward_refs()
-
-
-class EllarScaffoldSchema(Serializer):
-    context: t.List[str]
-    files: t.List[EllarScaffoldList]
-
-    @classmethod
-    def schema_example(cls) -> "EllarScaffoldSchema":
-        return cls(
-            context=["project_name"],
-            files=[
-                dict(name="sample.ellar", is_directory=False),
-                dict(
-                    name="sample",
-                    is_directory=False,
-                    files=[
-                        dict(
-                            dict(name="sample.ellar", is_directory=False),
-                        )
-                    ],
-                ),
-            ],
-        )

pyproject.toml

@@ -29,7 +29,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -47,16 +46,10 @@ dependencies = [
     "jinja2",
     # cli
     "typer >=0.6.1,<0.7.0",
-    # exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225
-    "tomlkit >=0.11.1,<1.0.0,!=0.11.2,!=0.11.3",
-    "uvicorn[standard] == 0.18.3",
     # testing
     "httpx >= 0.22.0"
 ]
 
-[project.scripts]
-ellar = "ellar.cli:main"
-
 [project.urls]
 Documentation = "https://github.com/eadwinCode/ellar"
 Source = "https://github.com/eadwinCode/ellar"
@@ -101,5 +94,6 @@ doc = [
     "mkdocs-material >=7.1.9,<8.0.0",
     "mdx-include >=1.4.1,<2.0.0",
     "mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0",
-    "markdown-include"
+    "markdown-include",
+    "mkdocstrings"
 ]

tests/conftest.py

@@ -1,17 +1,10 @@
 import functools
-import os.path
-import subprocess
-import sys
 from pathlib import PurePath, PurePosixPath, PureWindowsPath
 from uuid import uuid4
 
 import pytest
 from pydantic import create_model
 from starlette.testclient import TestClient
-from tomlkit import table
-
-from ellar.cli.service import PY_PROJECT_TOML, EllarCLIService, EllarPyProject
-from ellar.cli.testing import EllarCliRunner
 
 
 @pytest.fixture
@@ -41,71 +34,3 @@ class Config:
 @pytest.fixture
 def random_type():
     return type(f"Random{uuid4().hex[:6]}", (), {})
-
-
-@pytest.fixture
-def mock_py_project_table():
-    return table()
-
-
-@pytest.fixture
-def ellar_py_project(mock_py_project_table):
-    return EllarPyProject.get_or_create_ellar_py_project(mock_py_project_table)
-
-
-@pytest.fixture
-def add_ellar_project_to_py_project(ellar_py_project, tmp_py_project_path, tmp_path):
-    EllarCLIService.write_py_project(
-        tmp_py_project_path, ellar_py_project.get_root_node()
-    )
-
-    def _wrapper(project_name: str):
-        cli_service = EllarCLIService(
-            py_project_path=tmp_py_project_path,
-            ellar_py_projects=ellar_py_project,
-            cwd=str(tmp_path),
-        )
-        cli_service.create_ellar_project_meta(project_name)
-        return ellar_py_project
-
-    return _wrapper
-
-
-@pytest.fixture
-def write_empty_py_project(tmp_py_project_path, mock_py_project_table):
-    EllarCLIService.write_py_project(tmp_py_project_path, mock_py_project_table)
-    return mock_py_project_table
-
-
-@pytest.fixture
-def tmp_py_project_path(tmp_path):
-    os.chdir(str(tmp_path))
-    py_project_toml = tmp_path / PY_PROJECT_TOML
-    py_project_toml.touch(exist_ok=True)
-    return py_project_toml
-
-
-@pytest.fixture(autouse=True)
-def sys_path(tmp_path):
-    sys.path.append(str(tmp_path))
-    yield
-    sys.path.remove(str(tmp_path))
-
-
-@pytest.fixture
-def cli_runner(tmp_path):
-    os.chdir(str(tmp_path))
-    return EllarCliRunner()
-
-
-@pytest.fixture
-def process_runner(tmp_path):
-    os.chdir(str(tmp_path))
-
-    def _wrapper_process(*args, **kwargs):
-        kwargs.setdefault("stdout", subprocess.PIPE)
-        kwargs.setdefault("stderr", subprocess.PIPE)
-        result = subprocess.run(*args, **kwargs)
-        return result
-
-    return _wrapper_process