Small fixes

Author: pavelzw

.github/workflows/ci-copier.yml

@@ -11,8 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  pre-commit-checks:
-    name: Pre-commit Checks
+  pre-commit:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
@@ -26,7 +25,6 @@ jobs:
         run: pixi run pre-commit-run --color=always --show-diff-on-failure
 
   pytest:
-    name: pytest
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
@@ -41,7 +39,10 @@ jobs:
             ~/.cache/pre-commit
           key: project-generation-pre-commit-${{ hashFiles('template/.pre-commit-config.yaml.jinja') }}
       - name: Test
-        run: pixi run test
+        run: pixi run test --color=yes
+        env:
+          # needed for test_template_update
+          GH_TOKEN: ${{ github.token }}
 
   test-generated-package-ci:
     name: Test CI of generated package (minimal-python = ${{ matrix.minimal-python-version }})
@@ -69,7 +70,7 @@ jobs:
           git config --global user.email "landocalrissian@example.com"
           git config --global user.name "Lando Calrissian"
           # Generate package with default settings + Windows CI.
-          copier copy \
+          pixi run copier copy \
             --data project_name="Package" \
             --data project_short_description="Example Package" \
             --data github_user="LandoCalrissian" \

copier.yml

@@ -61,5 +61,5 @@ use_devcontainer:
   default: no
 
 _tasks:
-  -  '"{{ _copier_python }}" -I -c "import sys; sys.path.insert(0, \"{{ _copier_conf.src_path }}\"); import runpy;
+  - '"{{ _copier_python }}" -I -c "import sys; sys.path.insert(0, \"{{ _copier_conf.src_path }}\"); import runpy;
     runpy.run_module(\"tasks\", run_name=\"__main__\")"'

pixi.lock

@@ -10,6 +10,9 @@ copier = ">=9.3.1,<10"
 pytest = ">=8.2,<9"
 "ruamel.yaml" = ">=0.17,<0.18"
 "ruamel.yaml.jinja2" = ">=0.2.4,<0.3"
+mypy = "*"
+pre-commit = "*"
+gh = "*"
 
 [feature.lint.dependencies]
 pre-commit = "*"

pixi.toml

@@ -12,8 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  pre-commit-checks:
-    name: Pre-commit Checks
+  pre-commit:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
@@ -26,9 +25,7 @@ jobs:
       - name: pre-commit
         run: pixi run pre-commit-run --color=always --show-diff-on-failure
 {%- endraw %}
-
-  unit-tests:
-    name: pytest
+  pytest:
     timeout-minutes: 30
     runs-on: {% if add_windows_tests_to_ci %}{% raw %}${{ matrix.os }}{% endraw %}{% else %}ubuntu-latest{% endif %}
     strategy:

template/.github/workflows/ci.yml.jinja

@@ -33,9 +33,7 @@ def test_precommit(generated_project):
         result.check_returncode()
 
 
-@pytest.mark.parametrize(
-    "use_devcontainer", [True, False]
-)
+@pytest.mark.parametrize("use_devcontainer", [True, False])
 def test_devcontainer(generate_project, use_devcontainer):
     path = generate_project({"use_devcontainer": use_devcontainer})
     paths = [
@@ -65,9 +63,7 @@ def test_minimal_python_version(generate_project, minimal_python_version: str):
         : all_supported_python_versions.index(minimal_python_version_str)
     ]
 
-    path = generate_project(
-        {"minimal_python_version": minimal_python_version}
-    )
+    path = generate_project({"minimal_python_version": minimal_python_version})
     with open(path / "pyproject.toml") as f:
         pyproject_toml_content = f.read()
     assert (

tests/test_template.py

@@ -43,7 +43,9 @@ def git_init_add(to_add="."):
 
 @contextlib.contextmanager
 def remove_pixi_env_vars():
-    pixi_vars = {key: value for key, value in os.environ.items() if key.startswith("PIXI_")}
+    pixi_vars = {
+        key: value for key, value in os.environ.items() if key.startswith("PIXI_")
+    }
     for key in pixi_vars:
         del os.environ[key]
     yield