Add copilot extension & improve test suite

lukin0110 · Jan 12, 2024 · 171ce1b · 171ce1b
1 parent af8aa71
commit 171ce1b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 12 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -15,6 +15,7 @@
                 "visualstudioexptteam.vscodeintellicode"
             ],
             "settings": {
+                "dev.containers.copyGitConfig": true,
                 "editor.codeActionsOnSave": {
                     "source.fixAll": true,
                     "source.organizeImports": true
@@ -31,8 +32,7 @@
                 "[toml]": {
                     "editor.formatOnSave": false
                 },
-                "python.defaultInterpreterPath": "/workspaces/poetry-copier/testing/.venv/bin/python",
-                "remote.containers.copyGitConfig": true
+                "python.defaultInterpreterPath": "/workspaces/poetry-copier/testing/.venv/bin/python"
             }
         }
     }

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 # PyCharm
 .idea/
+
+# Unit test / coverage reports
+reports/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "testing"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}
diff --git a/template/.devcontainer/devcontainer.json.jinja b/template/.devcontainer/devcontainer.json.jinja
@@ -19,6 +19,7 @@
       "extensions": [
         "charliermarsh.ruff",
         "eamodio.gitlens",
+        "github.copilot",
         "ms-azuretools.vscode-docker",
         "ms-python.mypy-type-checker",
         "ms-python.python",

diff --git a/testing/tests/test_fastapi.py b/testing/tests/test_fastapi.py
@@ -21,8 +21,9 @@ def test_github_generation(answers: dict[str, str | bool], expected_paths: set[s
         "use_fastapi": True,
     }
     with TemporaryDirectory() as tmpdir:
-        logger.debug("GitHub package: %s", tmpdir)
-        copier.run_copy("../template", tmpdir, data=answers_, cleanup_on_error=True)
+        logger.info("GitHub package: %s", tmpdir)
+        _path = Path(__file__).parent.parent.parent / "template"
+        copier.run_copy(str(_path.absolute()), tmpdir, data=answers_, cleanup_on_error=True)
         expected = expected_paths | {
             ".github/workflows/push_to_ghcr.yml",
             ".github/workflows/test.yml",

diff --git a/testing/tests/test_gradio.py b/testing/tests/test_gradio.py
@@ -21,8 +21,9 @@ def test_github_generation(answers: dict[str, str | bool], expected_paths: set[s
         "use_gradio": True,
     }
     with TemporaryDirectory() as tmpdir:
-        logger.debug("GitHub package: %s", tmpdir)
-        copier.run_copy("../template", tmpdir, data=answers_, cleanup_on_error=True)
+        logger.info("GitHub package: %s", tmpdir)
+        _path = Path(__file__).parent.parent.parent / "template"
+        copier.run_copy(str(_path.absolute()), tmpdir, data=answers_, cleanup_on_error=True)
         expected = expected_paths | {
             ".github/workflows/push_to_ghcr.yml",
             ".github/workflows/test.yml",

diff --git a/testing/tests/test_package.py b/testing/tests/test_package.py
@@ -19,8 +19,9 @@ def test_github_generation(answers: dict[str, str | bool], expected_paths: set[s
         **answers,
     }
     with TemporaryDirectory() as tmpdir:
-        logger.debug("GitHub package: %s", tmpdir)
-        copier.run_copy("../template", tmpdir, data=answers_, quiet=True, cleanup_on_error=True)
+        logger.info("GitHub package: %s", tmpdir)
+        _path = Path(__file__).parent.parent.parent / "template"
+        copier.run_copy(str(_path.absolute()), tmpdir, data=answers_, cleanup_on_error=True)
         expected = expected_paths | {
             ".github/workflows/test.yml",
             ".github/dependabot.yml",
@@ -40,8 +41,9 @@ def test_gitlab_generation(answers: dict[str, str | bool], expected_paths: set[s
         **answers,
     }
     with TemporaryDirectory() as tmpdir:
-        logger.debug("GitLab package: %s", tmpdir)
-        copier.run_copy("../template", tmpdir, data=answers_, cleanup_on_error=True)
+        logger.info("GitLab package: %s", tmpdir)
+        _path = Path(__file__).parent.parent.parent / "template"
+        copier.run_copy(str(_path.absolute()), tmpdir, data=answers_, cleanup_on_error=True)
         expected = expected_paths | {".gitlab-ci.yml"}
         assert_paths(tmpdir, expected)
         assert_devcontainer(Path(tmpdir) / ".devcontainer/devcontainer.json")
@@ -58,8 +60,9 @@ def test_no_ci_generation(answers: dict[str, str | bool], expected_paths: set[st
         **answers,
     }
     with TemporaryDirectory() as tmpdir:
-        logger.debug("No CI package: %s", tmpdir)
-        copier.run_copy("../template", tmpdir, data=answers_, cleanup_on_error=True)
+        logger.info("No CI package: %s", tmpdir)
+        _path = Path(__file__).parent.parent.parent / "template"
+        copier.run_copy(str(_path.absolute()), tmpdir, data=answers_, cleanup_on_error=True)
         assert_paths(tmpdir, expected_paths)
         assert_devcontainer(Path(tmpdir) / ".devcontainer/devcontainer.json")
         assert_toml(Path(tmpdir) / "pyproject.toml")

diff --git a/testing/tests/utils.py b/testing/tests/utils.py
@@ -79,6 +79,7 @@ def assert_devcontainer(path: Path) -> None:
                         "extensions": [
                             "charliermarsh.ruff",
                             "eamodio.gitlens",
+                            "github.copilot",
                             "ms-azuretools.vscode-docker",
                             "ms-python.mypy-type-checker",
                             "ms-python.python",