Merge pull request #21 from seapagan/move-licenses

Move licenses out of template folder
seapagan · Jul 26, 2023 · 0b851c8 · 0b851c8
2 parents 3d28f00 + f451734
commit 0b851c8
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 10 deletions.
diff --git a/.github/codeql.yml → .github/workflows/codeql.yml b/.github/codeql.yml → .github/workflows/codeql.yml
diff --git a/py_maker/template/licenses/Apache2.jinja → py_maker/licenses/Apache2.jinja b/py_maker/template/licenses/Apache2.jinja → py_maker/licenses/Apache2.jinja
diff --git a/py_maker/template/licenses/BSD2.jinja → py_maker/licenses/BSD2.jinja b/py_maker/template/licenses/BSD2.jinja → py_maker/licenses/BSD2.jinja
diff --git a/py_maker/template/licenses/BSD3.jinja → py_maker/licenses/BSD3.jinja b/py_maker/template/licenses/BSD3.jinja → py_maker/licenses/BSD3.jinja
diff --git a/py_maker/template/licenses/CDDL.jinja → py_maker/licenses/CDDL.jinja b/py_maker/template/licenses/CDDL.jinja → py_maker/licenses/CDDL.jinja
diff --git a/py_maker/template/licenses/EPL2.jinja → py_maker/licenses/EPL2.jinja b/py_maker/template/licenses/EPL2.jinja → py_maker/licenses/EPL2.jinja
diff --git a/py_maker/template/licenses/GPL2.jinja → py_maker/licenses/GPL2.jinja b/py_maker/template/licenses/GPL2.jinja → py_maker/licenses/GPL2.jinja
diff --git a/py_maker/template/licenses/GPL3.jinja → py_maker/licenses/GPL3.jinja b/py_maker/template/licenses/GPL3.jinja → py_maker/licenses/GPL3.jinja
diff --git a/py_maker/template/licenses/LGPL.jinja → py_maker/licenses/LGPL.jinja b/py_maker/template/licenses/LGPL.jinja → py_maker/licenses/LGPL.jinja
diff --git a/py_maker/template/licenses/MIT.jinja → py_maker/licenses/MIT.jinja b/py_maker/template/licenses/MIT.jinja → py_maker/licenses/MIT.jinja
diff --git a/py_maker/template/licenses/MPL2.jinja → py_maker/licenses/MPL2.jinja b/py_maker/template/licenses/MPL2.jinja → py_maker/licenses/MPL2.jinja
diff --git a/py_maker/template/licenses/__init__.py → py_maker/licenses/__init__.py b/py_maker/template/licenses/__init__.py → py_maker/licenses/__init__.py
diff --git a/py_maker/prompt.py b/py_maker/prompt.py
@@ -1,5 +1,8 @@
 """Subclass the Prompt class from Rich to add a few features.
 
+I have a PR open to add these features to Rich, but until it is merged (if it is
+merged) I will use this subclass.
+
 Currently only makes the choices case-insensitive.
 """
 from rich.prompt import Confirm as RichConfirm
@@ -9,7 +12,7 @@
 
 
 class Confirm(RichConfirm):
-    """Just so we can import it from the same place as IPrompt.
+    """Just so we can import it from the same place as our Prompt.
 
     Saves importing from the Rich library.
     """

diff --git a/py_maker/pymaker.py b/py_maker/pymaker.py
@@ -119,21 +119,20 @@ def copy_template_files(self) -> None:
         'README.md.jinja' is copied as 'README.md' after template substitution.
         """
         template_dir = pkg_resources.files(template)
-        skip_dirs = ["__pycache__", "licenses"]
+
+        skip_dirs = ["__pycache__"]
         file_list = [
             item.relative_to(template_dir)
             for item in template_dir.rglob("*")  # type: ignore[attr-defined]
             if set(item.parts).isdisjoint(skip_dirs)
         ]
 
-        # set up Jinja environment
-        jinja_env = Environment(
-            loader=FileSystemLoader(str(template_dir)),
-            autoescape=True,
-        )
-
         try:
             # ---------------------- copy all the files ---------------------- #
+            jinja_env = Environment(
+                loader=FileSystemLoader(str(template_dir)),
+                autoescape=True,
+            )
             for item in file_list:
                 with pkg_resources.as_file(template_dir / item) as src:
                     if src.is_dir():
@@ -154,8 +153,12 @@ def copy_template_files(self) -> None:
                         dst.write_text(src.read_text(encoding="UTF-8"))
 
             # ---------------- generate the license file next. ------------- #
-            license_template = jinja_env.get_template(
-                f"licenses/{self.choices.license}.jinja"
+            license_env = Environment(
+                loader=FileSystemLoader(str(template_dir / "../licenses")),
+                autoescape=True,
+            )
+            license_template = license_env.get_template(
+                f"{self.choices.license}.jinja"
             )
             dst = self.choices.project_dir / "LICENSE.txt"
             dst.write_text(