fix some error and writing

Author: qdriven

pyproject-poetry.toml

@@ -8,24 +8,22 @@ repository = "https://github.com/fluent-qa/fluentqa-pdao"
 homepage = "https://github.com/fluent-qa/fluentqa-pdao"
 
 # Keywords description https://python-poetry.org/docs/pyproject/#keywords
-keywords = ["python-dao","database access object"]  #! Update me
+keywords = ["python-dao", "database access object"] #! Update me
 
 # Pypi classifiers: https://pypi.org/classifiers/
-classifiers = [  #! Update me
+classifiers = [ #! Update me
   "Development Status :: 3 - Alpha",
   "Intended Audience :: Developers",
   "Operating System :: OS Independent",
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Programming Language :: Python :: 3",
 ]
-packages = [
-    { include = "qpydao", from="src"},
-]
+packages = [{ include = "qpydao", from = "src" }]
 
 [tool.poetry.dependencies]
-python=">=3.9,<3.12"
+python = ">=3.9,<3.12"
 alembic = "^1.10.4"
-qpystructs = { path = "../fluent-structs", develop = true }
+qpystructs = { path = "../qpystructs", develop = true }
 sqlalchemy = "^2.0.23"
 sqlmodel = "^0.0.14"
 psycopg2-binary = "^2.9.9"
@@ -34,7 +32,7 @@ psycopg2-binary = "^2.9.9"
 pytest = "^7.4.0"
 allure-pytest = "^2.10.0"
 pre-commit = "^3.3.2"
-isort = {extras = ["colors"], version = "^5.11.4"}
+isort = { extras = ["colors"], version = "^5.11.4" }
 darglint = "^1.8.1"
 pytest-html = "^4.0.2"
 coverage = "^7.2.7"
@@ -44,7 +42,7 @@ pytest-cov = "^4.1.0"
 
 [tool.black]
 # https://github.com/psf/black
-target-version = ["py310","py311","py312"]
+target-version = ["py310", "py311", "py312"]
 line-length = 88
 color = true
 
@@ -68,8 +66,21 @@ exclude = '''
 # https://github.com/timothycrosley/isort/
 py_version = 310
 line_length = 88
-known_typing = ["typing", "types", "typing_extensions", "mypy", "mypy_extensions"]
-sections = ["FUTURE", "TYPING", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
+known_typing = [
+  "typing",
+  "types",
+  "typing_extensions",
+  "mypy",
+  "mypy_extensions",
+]
+sections = [
+  "FUTURE",
+  "TYPING",
+  "STDLIB",
+  "THIRDPARTY",
+  "FIRSTPARTY",
+  "LOCALFOLDER",
+]
 include_trailing_comma = true
 profile = "black"
 multi_line_output = 3
@@ -85,8 +96,22 @@ extend_skip = ["setup.py"]
 [tool.pytest.ini_options]
 # https://docs.pytest.org/en/6.2.x/customize.html#pyproject-toml
 # Directories that are not visited by pytest collector:
-norecursedirs =["hooks", "*.egg", ".eggs", "dist", "build", "docs", ".tox", ".git", "__pycache__"]
-doctest_optionflags = ["NUMBER", "NORMALIZE_WHITESPACE", "IGNORE_EXCEPTION_DETAIL"]
+norecursedirs = [
+  "hooks",
+  "*.egg",
+  ".eggs",
+  "dist",
+  "build",
+  "docs",
+  ".tox",
+  ".git",
+  "__pycache__",
+]
+doctest_optionflags = [
+  "NUMBER",
+  "NORMALIZE_WHITESPACE",
+  "IGNORE_EXCEPTION_DETAIL",
+]
 
 # Extra options:
 addopts = [
@@ -113,4 +138,3 @@ show_missing = true
 [build-system]
 requires = ["poetry_core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
-

pyproject.toml

@@ -10,30 +10,21 @@ build-backend = "pdm.backend"
 authors = [{ name = "fluentqa-team", email = "[email protected]" }]
 classifiers = [
   "Development Status :: 3 - Alpha",
-  "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
 ]
 description = "A Simple Database Access Object Lib"
 dynamic = ["version"]
-keywords = [
-  "copier-template",
-  "full-development-lifecycle",
-  "project-template",
-  "scaffold",
-]
+keywords = ["python database access object lib", "decorator", "repository"]
 license = { text = "UNDEFINED" }
 name = "qpydao"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
   #   "pydantic-settings",
   #   "typer[all]",
-  "dynaconf>=3.2.5",
   "pydantic>=2.7.4",
   "alembic>=1.13.1",
   "sqlalchemy>=2.0.30",
@@ -45,7 +36,6 @@ dependencies = [
   "ruff>=0.7.2",
 ]
 
-
 [project.urls]
 issue = "https://github.com/fluent-qa/qpydao/issues"
 repository = "https://github.com/fluent-qa/qpydao"
@@ -60,9 +50,10 @@ minversion = "6.0"
 cov = "qpydao"
 cov-report = "html"
 
+[tool.coverage]
 
 [tool.coverage.report]
-fail_under = 100
+fail_under = 80
 
 [tool.coverage.run]
 source = ["src/qpydao"]
@@ -101,13 +92,16 @@ trailing_comma_inline_array = true
 
 [tool.pdm]
 distribution = true
+
 [tool.pdm.scripts]
 lint = "ruff check --fix --unsafe-fixes"
 fmt = "ruff format . --check"
 test = "pytest "
 docs = "mkdocs serve"
 docs-deploy = "mkdocs gh-deploy --force"
 cleanup = "sh scripts/cleanup.sh"
+purge = "sh scripts/cleanup.sh && rm -rf .venv"
+clean_install = "rm -rf .venv && pdm install"
 
 [tool.pdm.dev-dependencies]
 docs = ["mkdocs-material>=9.5.27", "mkdocs>=1.6.0"]