Pixi tweaks (#58)

Author: crusaderky

.gitattributes

@@ -1,2 +1,2 @@
-# reduce the number of merge conflicts
-doc/whats-new.rst merge=union
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true

.github/workflows/docs.yml

@@ -17,9 +17,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: prefix-dev/setup-pixi@v0.8.10
+      - uses: prefix-dev/setup-pixi@v0
         with:
-          pixi-version: v0.56.0
+          pixi-version: v0.57.0
           cache: true
           environments: docs
 

.github/workflows/lint.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.10
+      - uses: prefix-dev/setup-pixi@v0
         with:
-          pixi-version: v0.56.0
+          pixi-version: v0.57.0
           cache: true
           environments: lint
       - name: Run linters

.github/workflows/pytest.yml

@@ -49,9 +49,9 @@ jobs:
         if: matrix.environment == 'upstream'
         run: rm pixi.lock
 
-      - uses: prefix-dev/setup-pixi@v0.8.10
+      - uses: prefix-dev/setup-pixi@v0
         with:
-          pixi-version: v0.56.0
+          pixi-version: v0.57.0
           environments: ${{ matrix.environment }}
           cache: ${{ matrix.environment != 'upstream' }}
           locked: ${{ matrix.environment != 'upstream' }}

.github/workflows/wheels.yml

@@ -20,9 +20,9 @@ jobs:
           fetch-depth: 0 # Fetch full git history for hatch-vcs
           fetch-tags: true # Fetch tags for hatch-vcs
 
-      - uses: prefix-dev/setup-pixi@v0.8.10
+      - uses: prefix-dev/setup-pixi@v0
         with:
-          pixi-version: v0.56.0
+          pixi-version: v0.57.0
           cache: true
           environments: dist
 

.gitignore

@@ -1,3 +1,7 @@
+# pixi environments
+.pixi/*
+!.pixi/config.toml
+
 *.pyc
 __pycache__
 

pixi.lock

@@ -135,7 +135,7 @@ enable_error_code = ["ignore-without-code", "possibly-undefined", "truthy-bool"]
 module = ["*.tests.*"]
 disallow_untyped_defs = false
 
-[tool.pixi.project]
+[tool.pixi.workspace]
 # TODO pick one depending if you want to test against python release candidates
 channels = ["https://prefix.dev/conda-forge"]
 # channels = ["https://prefix.dev/conda-forge", "conda-forge/label/python_rc"]