Fetched template changes (#6)

Author: spietras

.copier-answers.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.11.0
+_commit: 0.12.0
 _src_path: gh:quickplates/meta
 accountname: quickplates
 description: Helm charts template ⛵

.devcontainer/devcontainer.json

@@ -129,6 +129,7 @@
             }
           }
         },
+        "python.analysis.nodeExecutable": "auto",
         "remote.autoForwardPorts": false
       }
     }

.trunk/configs/ruff.toml

@@ -23,10 +23,27 @@ ignore = [
   "Q003",
   "W191",
 
-  # Disable some docstring rules that are too strict
+  # Disable rules that are too strict
+  "ANN401",
+  "ARG",
+  "BLE",
   "D100",
   "D104",
   "D105",
   "D106",
   "D107",
+  "S104",
+]
+
+[lint.extend-per-file-ignores]
+# Disable some rules in tests
+"tests/**" = [
+  # Disable irrelevant rules
+  "S",
+]
+
+[lint.isort]
+known-first-party = [
+  # Treat tests as a first-party module
+  "tests",
 ]

.trunk/trunk.yaml

@@ -10,7 +10,7 @@ runtimes:
   enabled:
     # Needed for gitleaks, shfmt
     - [email protected]
-    # Needed for markdownlint, prettier
+    # Needed for markdownlint, prettier, pyright
     - [email protected]
     # Needed for ruff, yamllint
     - [email protected]
@@ -57,11 +57,13 @@ lint:
             check
             path:${target}
           success_codes: [0, 1]
-    # Enable Ruff formatter
-    - name: ruff
-      commands:
-        - name: format
-          enabled: true
+    # Modify existing pyright definition
+    - name: pyright
+      environment:
+        - name: PATH
+          list:
+            # Add Python to Path
+            - ${env.PYRIGHT_PYTHON}/bin
   enabled:
     # GitHub Actions linting
     - [email protected]
@@ -80,8 +82,13 @@ lint:
         packages:
           # JSON sorting
           - [email protected]
+    # Python type checking
+    - [email protected]
     # Python formatting and linting
-    - [email protected]
+    - [email protected]:
+        commands:
+          - lint
+          - format
     # Shell linting
     - [email protected]
     # Shell formatting

.vscode/settings.json

@@ -2,5 +2,9 @@
   "files.associations": {
     "**/src/**": "plaintext"
   },
-  "git.autoRepositoryDetection": false
+  "git.autoRepositoryDetection": false,
+  "python.analysis.diagnosticMode": "workspace",
+  "python.analysis.diagnosticsSource": "Pyright",
+  "python.analysis.pyrightVersion": "1.1.407",
+  "python.testing.pytestEnabled": true
 }

flake.nix

@@ -40,8 +40,8 @@
         task = pkgs.go-task;
         coreutils = pkgs.coreutils;
         trunk = pkgs.trunk-io;
+        pytest = pkgs.python313.withPackages (ps: [ps.copier ps.plumbum ps.pytest]);
         copier = pkgs.python313.withPackages (ps: [ps.copier]);
-        pytest = pkgs.python313.withPackages (ps: [ps.copier ps.pytest ps.plumbum]);
       in {
         # Override pkgs argument
         _module.args.pkgs = import inputs.nixpkgs {
@@ -70,10 +70,12 @@
               task
               coreutils
               trunk
-              copier
               pytest
+              copier
             ];
 
+            PYRIGHT_PYTHON = pytest;
+
             shellHook = ''
               export TMPDIR=/tmp
             '';
@@ -102,8 +104,11 @@
               task
               coreutils
               trunk
+              pytest
             ];
 
+            PYRIGHT_PYTHON = pytest;
+
             shellHook = ''
               export TMPDIR=/tmp
             '';
@@ -116,7 +121,6 @@
               nix
               task
               coreutils
-              copier
               pytest
             ];
 

pyproject.toml

@@ -0,0 +1,10 @@
+[tool.pyright]
+# Analyze code only in these directories
+include = ["tests"]
+
+# Python version and platform to target
+pythonPlatform = "All"
+pythonVersion = "3.13"
+
+# Disable parsing dependencies for type information
+useLibraryCodeForTypes = false