- Fixed nox run

- Changed postfix of templates to .jinja2

Author: MarcoMuellner

.github/workflows/build_docs.yml

@@ -1,8 +1,8 @@
-name: build_docs 
+name: build_docs
 on:
   push:
     branches:
-      - master 
+      - master
       - main
 jobs:
   deploy:
@@ -12,5 +12,5 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - run: pip install mkdocs-material 
+      - run: pip install mkdocs-material
       - run: mkdocs gh-deploy --force

noxfile.py

@@ -30,7 +30,6 @@
     "tests",
     "typeguard",
     "xdoctest",
-    "docs-build",
 )
 
 
@@ -147,7 +146,7 @@ def safety(session: Session) -> None:
 @session(python=python_versions)
 def mypy(session: Session) -> None:
     """Type-check using mypy."""
-    args = session.posargs or ["src", "tests", "docs/conf.py"]
+    args = session.posargs or ["src", "tests"]
     session.install(".")
     session.install("mypy", "pytest", "respx", "fastapi", "uvicorn")
     session.run("mypy", *args)
@@ -175,7 +174,7 @@ def coverage(session: Session) -> None:
     session.install("coverage[toml]")
 
     if not session.posargs and any(Path().glob(".coverage.*")):
-        session.run("coverage", "combine", "-i")
+        session.run("coverage", "combine")
 
     session.run("coverage", *args)
 
@@ -203,32 +202,15 @@ def xdoctest(session: Session) -> None:
     session.run("python", "-m", "xdoctest", *args)
 
 
-@session(name="docs-build", python=python_versions[0])
-def docs_build(session: Session) -> None:
-    """Build the documentation."""
-    args = session.posargs or ["docs", "docs/_build"]
-    if not session.posargs and "FORCE_COLOR" in os.environ:
-        args.insert(0, "--color")
-
-    session.install(".")
-    session.install("sphinx", "sphinx-click", "furo", "myst-parser")
-
-    build_dir = Path("docs", "_build")
-    if build_dir.exists():
-        shutil.rmtree(build_dir)
-
-    session.run("sphinx-build", *args)
-
-
 @session(python=python_versions[0])
 def docs(session: Session) -> None:
     """Build and serve the documentation with live reloading on file changes."""
-    args = session.posargs or ["--open-browser", "docs", "docs/_build"]
+    args = session.posargs or ["serve"]
     session.install(".")
-    session.install("sphinx", "sphinx-autobuild", "sphinx-click", "furo", "myst-parser")
+    session.install("mkdocs", "mkdocs-material")
 
     build_dir = Path("docs", "_build")
     if build_dir.exists():
         shutil.rmtree(build_dir)
 
-    session.run("sphinx-autobuild", *args)
+    session.run("mkdocs", *args)

pyproject.toml

@@ -11,6 +11,7 @@ documentation = "https://openapi-python-generator.readthedocs.io"
 classifiers = [
     "Development Status :: 2 - Pre-Alpha",
 ]
+keywords = ["OpenAPI", "Generator", "Python", "async"]
 
 [tool.poetry.urls]
 Changelog = "https://github.com/MarcoMuellner/openapi-python-generator/releases"

src/openapi_python_generator/common.py

@@ -28,21 +28,21 @@ class AutoFormat(str, Enum):
     HTTPLibrary.httpx: LibraryConfig(
         name="httpx",
         library_name="httpx",
-        template_name="httpx.template",
+        template_name="httpx.jinja2",
         include_async=True,
         include_sync=True,
     ),
     HTTPLibrary.requests: LibraryConfig(
         name="requests",
         library_name="requests",
-        template_name="requests.template",
+        template_name="requests.jinja2",
         include_async=False,
         include_sync=True,
     ),
     HTTPLibrary.aiohttp: LibraryConfig(
         name="aiohttp",
         library_name="aiohttp",
-        template_name="aiohttp.template",
+        template_name="aiohttp.jinja2",
         include_async=True,
         include_sync=False,
     ),

src/openapi_python_generator/language_converters/python/jinja_config.py

@@ -2,11 +2,11 @@
 
 from jinja2 import Environment, FileSystemLoader
 
-ENUM_TEMPLATE = "enum.template"
-MODELS_TEMPLATE = "models.template"
-SERVICE_TEMPLATE = "service.template"
-HTTPX_TEMPLATE = "httpx.template"
-API_CONFIG_TEMPLATE = "apiconfig.template"
+ENUM_TEMPLATE = "enum.jinja2"
+MODELS_TEMPLATE = "models.jinja2"
+SERVICE_TEMPLATE = "service.jinja2"
+HTTPX_TEMPLATE = "httpx.jinja2"
+API_CONFIG_TEMPLATE = "apiconfig.jinja2"
 TEMPLATE_PATH = Path(__file__).parent / "templates"
 
 JINJA_ENV = Environment(