refactor: further updates

src/generators/PythonGenerator.ts

@@ -146,39 +146,28 @@ export class PythonGenerator implements GeneratorInterface {
     }
 
     private async runPipInstall(): Promise<void> {
-        const { name } = this.generator.options;
-
         this.generator.log();
         this.generator.log(
             "Running pip to install the project dependencies for you...",
         );
 
-        const pip = path.join(
-            this.generator.env.cwd,
-            name,
-            ".venv",
-            "bin",
-            "pip",
-        );
+        const pip = path.join(this.generator.env.cwd, ".venv", "bin", "pip");
 
         const requirements = path.join(
             this.generator.env.cwd,
-            name,
             "requirements.txt",
         );
 
         await this.generator.spawn(pip, ["install", "-r", requirements]);
     }
 
     private async setupVenv(): Promise<void> {
-        const { name } = this.generator.options;
-
         this.generator.log();
         this.generator.log("Creating a virtual environment...");
         await this.generator.spawn("python3", [
             "-m",
             "venv",
-            `${path.join(this.generator.env.cwd, name, ".venv")}`,
+            `${path.join(this.generator.env.cwd, ".venv")}`,
         ]);
     }
 

templates/python/python-version.ejs

@@ -1 +1 @@
-<%- python.getEngine() %>
+3.12.1

tests/python.test.ts

@@ -3,12 +3,17 @@ import { fileURLToPath } from "node:url";
 import assert from "yeoman-assert";
 import helpers, { RunResult } from "yeoman-test";
 import { describe, beforeAll, afterAll, expect, it, vi } from "vitest";
+// import Generator from "yeoman-generator";
 import AppGenerator from "../src/app.js";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const generator = path.resolve(__dirname, "../dist/generators/app");
 
-const spawn = vi.spyOn(AppGenerator.prototype, "spawn").getMockImplementation();
+const spawn = vi
+    .spyOn(AppGenerator.prototype, "spawn")
+    .mockImplementation((command, args) =>
+        AppGenerator.prototype.spawn(command, [...args]),
+    );
 
 const files = [
     ".github/workflows/main.yml",
@@ -71,6 +76,7 @@ describe("generator-norgate-av:python", () => {
 
             afterAll(() => {
                 result?.cleanup();
+                spawn.mockClear();
             });
 
             it("should assign the correct values", () => {
@@ -133,11 +139,10 @@ describe("generator-norgate-av:python", () => {
             );
 
             it("should spawn a command to create a virtual environment", () => {
-                console.log(spawn);
                 expect(spawn).toHaveBeenCalledWith("python3", [
                     "-m",
                     "venv",
-                    `${path.join(process.cwd(), name, ".venv")}`,
+                    `${path.join(process.cwd(), ".venv")}`,
                 ]);
             });
 

vitest.config.ts

@@ -4,6 +4,7 @@ export default defineConfig({
     test: {
         environment: "node",
         testTimeout: 60000,
+        hookTimeout: 60000,
         resolveSnapshotPath(path, extension) {
             return path + extension;
         },