From 3e314531d468df4f09c9644b516792cbfea574f1 Mon Sep 17 00:00:00 2001
From: AJ Alon <aj.alon@datarobot.com>
Date: Mon, 6 Apr 2026 13:32:58 -0700
Subject: [PATCH 1/3] Update Makefile to use hatch build/publish

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f86c713..000bc07 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,18 @@ clean:  ## Clean intermediate build files
 	rm -rf dist/
 .PHONY: clean
 
-build: clean dev  ## Build the package (source distribution)
-	python setup.py sdist
+build: clean  ## Build the package (source distribution + wheel)
+	hatch build
 .PHONY: build
 
 dev: clean  ## Setup development environment
-	pip install .[dev]
+	hatch env create
 .PHONY: dev
 
-test: dev ## Run tests
-	.tools/ci.sh
+test:  ## Run tests
+	hatch run test:test
 .PHONY: test
 
 release: build  ## Release to PyPi
-	twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
+	hatch publish
 .PHONY: release

From a72649a79fc95b1cb71905271054e2b0e9584181 Mon Sep 17 00:00:00 2001
From: AJ Alon <aj.alon@datarobot.com>
Date: Mon, 6 Apr 2026 13:37:38 -0700
Subject: [PATCH 2/3] Pin CI runners for Python 3.9 to avoid virtualenv
 incompatibility

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 297562c..4ef5548 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,11 +22,11 @@ jobs:
           - python: '3.10'
             os: ubuntu-latest
           - python: '3.9'
-            os: macos-latest
+            os: macos-13
           - python: '3.9'
-            os: windows-latest
+            os: windows-2022
           - python: '3.9'
-            os: ubuntu-latest
+            os: ubuntu-22.04
             versions: minimal
     runs-on: ${{matrix.os}}
     steps:

From bd6282d9284c7772576e9f308d2a3cf950c6ddb0 Mon Sep 17 00:00:00 2001
From: AJ Alon <aj.alon@datarobot.com>
Date: Mon, 6 Apr 2026 13:42:34 -0700
Subject: [PATCH 3/3] Pin virtualenv<21 for Python 3.9 CI jobs

virtualenv 21.0.0 dropped Python 3.9 support, causing hatch env
creation to fail with 'propose_interpreters' attribute error.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ef5548..161d18c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,11 +22,11 @@ jobs:
           - python: '3.10'
             os: ubuntu-latest
           - python: '3.9'
-            os: macos-13
+            os: macos-latest
           - python: '3.9'
-            os: windows-2022
+            os: windows-latest
           - python: '3.9'
-            os: ubuntu-22.04
+            os: ubuntu-latest
             versions: minimal
     runs-on: ${{matrix.os}}
     steps:
@@ -43,6 +43,10 @@ jobs:
       - name: Install Hatch
         run: |
           pip install hatch
+      - name: Pin virtualenv for Python 3.9
+        if: matrix.python == '3.9'
+        run: |
+          pip install 'virtualenv<21'
       - name: Install dependencies
         run: |
           hatch run test:pip freeze