From 26c5e719bcf5b0a32735e01229e840fdfefe80fe Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:07:24 +0100
Subject: [PATCH 1/7] Bump maturin, pyo3, add free-threaded 3.13t wheel

---
 .github/workflows/dists.yml | 2 +-
 Cargo.toml                  | 2 +-
 pyproject.toml              | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index 1fbcd80..bab8f02 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -48,7 +48,7 @@ jobs:
         target: ${{ matrix.target }}
         manylinux: ${{ matrix.manylinux || 'auto' }}
         # Keep in sync with tests.yml
-        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13'
+        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 3.13t'
         rust-toolchain: stable
         docker-options: -e CI
 
diff --git a/Cargo.toml b/Cargo.toml
index 071e538..4fe6041 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,5 +23,5 @@ neon = ["blake3/neon"]
 [dependencies]
 blake3 = { version = "1.5", features = ["mmap", "rayon"] }
 hex = "0.4.2"
-pyo3 = { version = "0.23.1", features = ["extension-module"] }
+pyo3 = { version = "0.23.3", features = ["extension-module"] }
 rayon = "1.2.1"
diff --git a/pyproject.toml b/pyproject.toml
index c595662..11e8107 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,3 @@
 [build-system]
-# TODO: Remove this pin once
-# https://github.com/PyO3/maturin/pull/2332#issuecomment-2507336466
-# is resolved, one way or the other.
-requires = ["maturin==1.7.5"]
+requires = ["maturin>=1.0,<2"]
 build-backend = "maturin"

From 66475ce1f14032eec751b76b125f8c21376f0e15 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:29:04 +0100
Subject: [PATCH 2/7] Disable 3.13t for windows

---
 .github/workflows/dists.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index bab8f02..415d510 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -48,7 +48,7 @@ jobs:
         target: ${{ matrix.target }}
         manylinux: ${{ matrix.manylinux || 'auto' }}
         # Keep in sync with tests.yml
-        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 3.13t'
+        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 ${{ matrix.os == 'windows-latest' && '' || '3.13t' }}'
         rust-toolchain: stable
         docker-options: -e CI
 

From 4fdf39d7f154bff59f11211a7a254df6c5268256 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:36:46 +0100
Subject: [PATCH 3/7] Revert "Disable 3.13t for windows"

This reverts commit 66475ce1f14032eec751b76b125f8c21376f0e15.
---
 .github/workflows/dists.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index 415d510..bab8f02 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -48,7 +48,7 @@ jobs:
         target: ${{ matrix.target }}
         manylinux: ${{ matrix.manylinux || 'auto' }}
         # Keep in sync with tests.yml
-        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 ${{ matrix.os == 'windows-latest' && '' || '3.13t' }}'
+        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 3.13t'
         rust-toolchain: stable
         docker-options: -e CI
 

From e1a8c6628109daa7898df283c886b1b55e77d56f Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:24:46 +0100
Subject: [PATCH 4/7] :construction: Debug suggestion

---
 .github/workflows/dists.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index bab8f02..f821d00 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -33,6 +33,10 @@ jobs:
         - { os: windows-latest, target: i686 }
 
     runs-on: ${{ matrix.os }}
+
+    env:
+      - PYO3_PRINT_CONFIG: 1
+
     steps:
     - uses: actions/checkout@v4
 
@@ -48,7 +52,7 @@ jobs:
         target: ${{ matrix.target }}
         manylinux: ${{ matrix.manylinux || 'auto' }}
         # Keep in sync with tests.yml
-        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 3.13t'
+        args: --release --out dist --interpreter '3.13'
         rust-toolchain: stable
         docker-options: -e CI
 

From f1155e29ba15af0ab4c47ee7d41041dc4c8c4fa5 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:28:00 +0100
Subject: [PATCH 5/7] :construction: Fix syntax

---
 .github/workflows/dists.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index f821d00..7509fcd 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      - PYO3_PRINT_CONFIG: 1
+      PYO3_PRINT_CONFIG: 1
 
     steps:
     - uses: actions/checkout@v4

From 9c7ac8c57d1f56a051f49a9f233b3f1e955b3eb4 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:42:48 +0100
Subject: [PATCH 6/7] :construction: Enable generate-import-lib pyo3 feature

---
 .github/workflows/dists.yml | 3 ---
 Cargo.toml                  | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index 7509fcd..d558fee 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -34,9 +34,6 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
-    env:
-      PYO3_PRINT_CONFIG: 1
-
     steps:
     - uses: actions/checkout@v4
 
diff --git a/Cargo.toml b/Cargo.toml
index 4fe6041..0cb3651 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,5 +23,5 @@ neon = ["blake3/neon"]
 [dependencies]
 blake3 = { version = "1.5", features = ["mmap", "rayon"] }
 hex = "0.4.2"
-pyo3 = { version = "0.23.3", features = ["extension-module"] }
+pyo3 = { version = "0.23.3", features = ["extension-module", "generate-import-lib"] }
 rayon = "1.2.1"

From 257b301c886f0f496658018e62433b42f5d5b8cb Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:51:24 +0100
Subject: [PATCH 7/7] Re-enable 3.13t wheel

---
 .github/workflows/dists.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/dists.yml b/.github/workflows/dists.yml
index d558fee..bab8f02 100644
--- a/.github/workflows/dists.yml
+++ b/.github/workflows/dists.yml
@@ -33,7 +33,6 @@ jobs:
         - { os: windows-latest, target: i686 }
 
     runs-on: ${{ matrix.os }}
-
     steps:
     - uses: actions/checkout@v4
 
@@ -49,7 +48,7 @@ jobs:
         target: ${{ matrix.target }}
         manylinux: ${{ matrix.manylinux || 'auto' }}
         # Keep in sync with tests.yml
-        args: --release --out dist --interpreter '3.13'
+        args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 3.13t'
         rust-toolchain: stable
         docker-options: -e CI