From 1f0e502bf5bad18f7976bab1ed5a03e36e5012c5 Mon Sep 17 00:00:00 2001
From: crusaderky <crusaderky@gmail.com>
Date: Fri, 8 May 2026 13:12:49 +0100
Subject: [PATCH 1/2] Support pixi in dask/dask CI

---
 .gitattributes |  2 ++
 .gitignore     |  3 +++
 pixi.toml      | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 pixi.toml

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..997504b465
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff
diff --git a/.gitignore b/.gitignore
index 77ba0b205b..5af1805c1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ test_short_report.html
 
 # Test failures will dump the cluster state in here
 test_cluster_dump/
+# pixi environments
+.pixi/*
+!.pixi/config.toml
diff --git a/pixi.toml b/pixi.toml
new file mode 100644
index 0000000000..2cec1a0b3d
--- /dev/null
+++ b/pixi.toml
@@ -0,0 +1,34 @@
+# This file is used by pixi-build in other projects (namely, dask/dask) 
+# to generate a conda package of distributed from git tip
+[workspace]
+channels = ["conda-forge"]
+platforms = ["linux-64", "osx-arm64", "win-64"]
+preview = ["pixi-build"]
+
+[package]
+name = "distributed"
+# FIXME work around poor pixi-build support for SCM versioning
+version = "2099.0.0"
+
+[package.build]
+backend = { name = "pixi-build-python", version = "*" }
+source.path = "."
+
+[package.host-dependencies]
+setuptools = "*"
+setuptools-scm = "*"
+
+[package.run-dependencies]
+# Don't pin dask/dask here to avoid headaches 
+# when installing from git tip with pixi-build
+dask-core = "*"
+# Skip dependencies redundant with dask-core
+jinja2 = ">=2.10.3"
+locket = ">=1.0.0"
+msgpack-python = ">=1.0.2"
+psutil = ">=5.8.0"
+sortedcontainers = ">=2.0.5"
+tblib = ">=1.6.0,!=3.2.0,!=3.2.1"
+tornado = ">=6.2.0"
+urllib3 = ">=1.26.5"
+zict = ">=3.0.0"

From ecf6c61c68a11dd3b20f78429d95b00b485194b7 Mon Sep 17 00:00:00 2001
From: crusaderky <crusaderky@gmail.com>
Date: Thu, 14 May 2026 17:14:44 +0100
Subject: [PATCH 2/2] Change conda channel

---
 pixi.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixi.toml b/pixi.toml
index 2cec1a0b3d..4e42aed97d 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -1,7 +1,7 @@
 # This file is used by pixi-build in other projects (namely, dask/dask) 
 # to generate a conda package of distributed from git tip
 [workspace]
-channels = ["conda-forge"]
+channels = ["https://prefix.dev/conda-forge"]
 platforms = ["linux-64", "osx-arm64", "win-64"]
 preview = ["pixi-build"]