MiraGeoscience · saicheranb · Sep 2, 2025 · Sep 2, 2025 · Sep 3, 2025 · Sep 3, 2025
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,6 @@
 *.geoh5 filter=lfs diff=lfs merge=lfs -text
 *.h5 filter=lfs diff=lfs merge=lfs -text
 *.min.js filter=lfs diff=lfs merge=lfs -text
+
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true
diff --git a/.github/workflows/python_analysis.yml b/.github/workflows/python_analysis.yml
@@ -26,14 +26,14 @@ jobs:
     name: Static analysis
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@main
     with:
-      package-manager: 'conda'
+      package-manager: 'pixi'
       app-name: 'geoapps_utils'
       python-version: '3.10'
   call-workflow-pytest:
     name: Pytest
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
     with:
-      package-manager: 'conda'
+      package-manager: 'pixi'
       python-versions: '["3.10", "3.11", "3.12"]'
       os: '["windows-latest", "ubuntu-latest"]'
       cache-number: 1

diff --git a/.gitignore b/.gitignore
@@ -142,8 +142,12 @@ dmypy.json
 # geoh5 locks
 *.geoh5.lock
 
-# tempory generated files
-pyproject-sha.toml
-/poetry.lock
-#version ignore
+# auto-generated version file
 geoapps_utils/_version.py
+
+# not using poetry to lock, but pixi
+poetry.lock
+
+# pixi environments
+.pixi/*
+!.pixi/config.toml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,7 +58,7 @@ repos:
     hooks:
     -   id: pylint
         name: pylint
-        entry: .\\devtools\\conda_env_pylint.bat
+        entry: pixi run --locked pylint
         language: system
         require_serial: true  # pylint does its own parallelism
         types: [python]
@@ -67,7 +67,7 @@ repos:
     rev: v2.4.1
     hooks:
     -   id: codespell
-        exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$
+        exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst|^pixi.lock)$
         entry: codespell -I .codespellignore
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0

diff --git a/Install_or_Update.bat b/Install_or_Update.bat
diff --git a/devtools/conda_env_pylint.bat b/devtools/conda_env_pylint.bat
diff --git a/environments/env-python-3.10.yml b/environments/env-python-3.10.yml
diff --git a/environments/env-python-3.11.yml b/environments/env-python-3.11.yml
diff --git a/environments/env-python-3.12.yml b/environments/env-python-3.12.yml
diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml
diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml