templates / globaly propagate package metadata vars

Author: p1-ra

Diff for: openapi_python_client/__init__.py

@@ -67,7 +67,6 @@ def __init__(
         else:
             loader = package_loader
         self.env: Environment = Environment(loader=loader, trim_blocks=True, lstrip_blocks=True)
-        self.env.globals.update(utils=utils)
 
         self.project_name: str = config.project_name_override or f"{utils.kebab_case(openapi.title).lower()}-client"
         self.project_dir: Path = Path.cwd()
@@ -82,6 +81,15 @@ def __init__(
         self.version: str = config.package_version_override or openapi.version
 
         self.env.filters.update(TEMPLATE_FILTERS)
+        self.env.globals.update(
+            utils=utils,
+            package_name=self.package_name,
+            package_dir=self.package_dir,
+            package_description=self.package_description,
+            package_version=self.version,
+            project_name=self.project_name,
+            project_dir=self.project_dir,
+        )
 
     def build(self) -> Sequence[GeneratorError]:
         """Create the project from templates"""
@@ -144,9 +152,7 @@ def _create_package(self) -> None:
         package_init = self.package_dir / "__init__.py"
 
         package_init_template = self.env.get_template("package_init.py.jinja")
-        package_init.write_text(
-            package_init_template.render(description=self.package_description), encoding=self.file_encoding
-        )
+        package_init.write_text(package_init_template.render(), encoding=self.file_encoding)
 
         if self.meta != MetaType.NONE:
             pytyped = self.package_dir / "py.typed"
@@ -168,9 +174,7 @@ def _build_metadata(self) -> None:
         readme = self.project_dir / "README.md"
         readme_template = self.env.get_template("README.md.jinja")
         readme.write_text(
-            readme_template.render(
-                project_name=self.project_name, description=self.package_description, package_name=self.package_name
-            ),
+            readme_template.render(),
             encoding=self.file_encoding,
         )
 
@@ -184,25 +188,15 @@ def _build_pyproject_toml(self, *, use_poetry: bool) -> None:
         pyproject_template = self.env.get_template(template)
         pyproject_path = self.project_dir / "pyproject.toml"
         pyproject_path.write_text(
-            pyproject_template.render(
-                project_name=self.project_name,
-                package_name=self.package_name,
-                version=self.version,
-                description=self.package_description,
-            ),
+            pyproject_template.render(),
             encoding=self.file_encoding,
         )
 
     def _build_setup_py(self) -> None:
         template = self.env.get_template("setup.py.jinja")
         path = self.project_dir / "setup.py"
         path.write_text(
-            template.render(
-                project_name=self.project_name,
-                package_name=self.package_name,
-                version=self.version,
-                description=self.package_description,
-            ),
+            template.render(),
             encoding=self.file_encoding,
         )
 
@@ -247,7 +241,6 @@ def _build_api(self) -> None:
         api_init_template = self.env.get_template("api_init.py.jinja")
         api_init_path.write_text(
             api_init_template.render(
-                package_name=self.package_name,
                 endpoint_collections_by_tag=endpoint_collections_by_tag,
             ),
             encoding=self.file_encoding,
@@ -261,7 +254,7 @@ def _build_api(self) -> None:
             endpoint_init_path = tag_dir / "__init__.py"
             endpoint_init_template = self.env.get_template("endpoint_init.py.jinja")
             endpoint_init_path.write_text(
-                endpoint_init_template.render(package_name=self.package_name, endpoint_collection=collection),
+                endpoint_init_template.render(endpoint_collection=collection),
                 encoding=self.file_encoding,
             )
             (tag_dir / "__init__.py").touch()

Diff for: openapi_python_client/templates/README.md.jinja

@@ -1,5 +1,5 @@
 # {{ project_name }}
-{{ description }}
+{{ package_description }}
 
 ## Usage
 First, create a client:

Diff for: openapi_python_client/templates/package_init.py.jinja

@@ -1,2 +1,2 @@
-""" {{ description }} """
+""" {{ package_description }} """
 from .client import AuthenticatedClient, Client

Diff for: openapi_python_client/templates/pyproject.toml.jinja

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "{{ project_name }}"
-version = "{{ version }}"
-description = "{{ description }}"
+version = "{{ package_version }}"
+description = "{{ package_description }}"
 
 authors = []
 

Diff for: openapi_python_client/templates/setup.py.jinja

@@ -7,8 +7,8 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="{{ project_name }}",
-    version="{{ version }}",
-    description="{{ description }}",
+    version="{{ package_version }}",
+    description="{{ package_description }}",
     long_description=long_description,
     long_description_content_type="text/markdown",
     package_dir={"": "{{ package_name }}"},