From 331e8e8ce604b58625fd7f2d1d531f7ee6295e46 Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:31:16 -0600
Subject: [PATCH 1/5] Start on python 3.13

---
 hatchery-bootstrap/Dockerfile | 4 ++--
 makefile                      | 6 +++---
 py313.conf                    | 5 +++++
 py313.local.conf              | 5 +++++
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 py313.conf
 create mode 100644 py313.local.conf

diff --git a/hatchery-bootstrap/Dockerfile b/hatchery-bootstrap/Dockerfile
index ce9ee38..7d6e034 100644
--- a/hatchery-bootstrap/Dockerfile
+++ b/hatchery-bootstrap/Dockerfile
@@ -1,8 +1,8 @@
-FROM --platform=linux/amd64 python:3.11.1-bullseye
+FROM --platform=linux/amd64 python:3.13.0a3-bullseye
 
 RUN curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh --output  ~/miniconda.sh
 RUN bash ~/miniconda.sh -b -p /opt/miniconda
 RUN . /opt/miniconda/bin/activate && \
     conda create -c numba/label/manylinux2014 -y -n buildenv llvmdev && \
     conda activate buildenv
-RUN python3.11 -m pip install numpy
+RUN python3.13 -m pip install --pre numpy
diff --git a/makefile b/makefile
index 2482a67..f889fde 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,12 @@
 .DEFAULT_GOAL=compile
 
 update:
-	docker pull --platform linux/amd64 python:3.11.1-bullseye
+	docker pull --platform linux/amd64 python:3.13.0a3-bullseye
 build:
 	docker build --no-cache -t hatchery-bootstrap hatchery-bootstrap
 clone:
-	./clone.sh py311.conf
+	./clone.sh py313.conf
 compile:
-	docker run -it -v ${PWD}:/root/hostpwd/ hatchery-bootstrap /root/hostpwd/compile.sh /root/hostpwd/py311.local.conf
+	docker run -it -v ${PWD}:/root/hostpwd/ hatchery-bootstrap /root/hostpwd/compile.sh /root/hostpwd/py313.local.conf
 compile_and_test:
 	docker run -it -v ${PWD}:/root/hostpwd/ hatchery-bootstrap /root/hostpwd/compile_and_test.sh /root/hostpwd/py311.local.conf
diff --git a/py313.conf b/py313.conf
new file mode 100644
index 0000000..1de10dc
--- /dev/null
+++ b/py313.conf
@@ -0,0 +1,5 @@
+export MY_LLVMLITE_COMMIT="main"
+export MY_LLVMLITE_URL="https://github.com/numba/llvmlite"
+export MY_NUMBA_COMMIT="main"
+export MY_NUMBA_URL="https://github.com/numba/numba"
+export MY_PYTHON="main"
\ No newline at end of file
diff --git a/py313.local.conf b/py313.local.conf
new file mode 100644
index 0000000..68a6980
--- /dev/null
+++ b/py313.local.conf
@@ -0,0 +1,5 @@
+export MY_LLVMLITE_COMMIT="main"
+export MY_LLVMLITE_URL="https://github.com/numba/llvmlite"
+export MY_NUMBA_COMMIT="main"
+export MY_NUMBA_URL="https://github.com/numba/numba"
+export MY_PYTHON="python3.13"
\ No newline at end of file

From edf83ae6af2da3c383a6e8d891dfaf91c892fa0f Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com>
Date: Thu, 14 Mar 2024 17:49:17 -0500
Subject: [PATCH 2/5] Pin to last known working numpy version for
 python-3.13.0a3

---
 hatchery-bootstrap/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hatchery-bootstrap/Dockerfile b/hatchery-bootstrap/Dockerfile
index 7d6e034..6e46782 100644
--- a/hatchery-bootstrap/Dockerfile
+++ b/hatchery-bootstrap/Dockerfile
@@ -5,4 +5,4 @@ RUN bash ~/miniconda.sh -b -p /opt/miniconda
 RUN . /opt/miniconda/bin/activate && \
     conda create -c numba/label/manylinux2014 -y -n buildenv llvmdev && \
     conda activate buildenv
-RUN python3.13 -m pip install --pre numpy
+RUN python3.13 -m pip install --pre numpy==1.26.3

From c8a99b18c0c89e51389ac67cf94173d7485aace6 Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:32:23 -0500
Subject: [PATCH 3/5] Update to py3.13a6

---
 compile-pypi.sh               | 2 +-
 hatchery-bootstrap/Dockerfile | 2 +-
 makefile                      | 2 +-
 py313.conf                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compile-pypi.sh b/compile-pypi.sh
index 3468441..0c31376 100755
--- a/compile-pypi.sh
+++ b/compile-pypi.sh
@@ -19,6 +19,6 @@ cd ..
 git clone $MY_NUMBA_URL
 cd numba
 git checkout $MY_NUMBA_COMMIT
-cd ..
 $MY_PYTHON -m pip install -e .
+cd ..
 exec bash
diff --git a/hatchery-bootstrap/Dockerfile b/hatchery-bootstrap/Dockerfile
index 6e46782..1082124 100644
--- a/hatchery-bootstrap/Dockerfile
+++ b/hatchery-bootstrap/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 python:3.13.0a3-bullseye
+FROM --platform=linux/amd64 python:3.13.0a6-bullseye
 
 RUN curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh --output  ~/miniconda.sh
 RUN bash ~/miniconda.sh -b -p /opt/miniconda
diff --git a/makefile b/makefile
index 69663c0..9dcb7ca 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL=compile-pypi
 
 update-pypi:
-	docker pull --platform linux/amd64 python:3.13.0a3-bullseye
+	docker pull --platform linux/amd64 python:3.13.0a6-bullseye
 update-aorg:
 	docker pull --platform linux/amd64 continuumio/miniconda3
 build-pypi:
diff --git a/py313.conf b/py313.conf
index 1de10dc..68a6980 100644
--- a/py313.conf
+++ b/py313.conf
@@ -2,4 +2,4 @@ export MY_LLVMLITE_COMMIT="main"
 export MY_LLVMLITE_URL="https://github.com/numba/llvmlite"
 export MY_NUMBA_COMMIT="main"
 export MY_NUMBA_URL="https://github.com/numba/numba"
-export MY_PYTHON="main"
\ No newline at end of file
+export MY_PYTHON="python3.13"
\ No newline at end of file

From 73c61adf39ff73e55e2eb683fa3623ab77ddaf2d Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:59:25 -0500
Subject: [PATCH 4/5] Move to Python3.13.0b4

---
 hatchery-bootstrap/Dockerfile | 2 +-
 makefile                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hatchery-bootstrap/Dockerfile b/hatchery-bootstrap/Dockerfile
index 1082124..f07d441 100644
--- a/hatchery-bootstrap/Dockerfile
+++ b/hatchery-bootstrap/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 python:3.13.0a6-bullseye
+FROM --platform=linux/amd64 python:3.13.0b4-bullseye
 
 RUN curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh --output  ~/miniconda.sh
 RUN bash ~/miniconda.sh -b -p /opt/miniconda
diff --git a/makefile b/makefile
index 9dcb7ca..a6f5677 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL=compile-pypi
 
 update-pypi:
-	docker pull --platform linux/amd64 python:3.13.0a6-bullseye
+	docker pull --platform linux/amd64 python:3.13.0b4-bullseye
 update-aorg:
 	docker pull --platform linux/amd64 continuumio/miniconda3
 build-pypi:

From a6a6eee395026bf818bf3cc8a12129e6f14c69df Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:33:06 -0500
Subject: [PATCH 5/5] Move to 3.13.0rc1

---
 compile-pypi.sh               | 16 ++++++++--------
 hatchery-bootstrap/Dockerfile |  2 +-
 makefile                      |  2 +-
 py313.local.conf              |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/compile-pypi.sh b/compile-pypi.sh
index 0c31376..98049d2 100755
--- a/compile-pypi.sh
+++ b/compile-pypi.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -x
+set -xe
 
 # Source the configuration file
 . $1
@@ -15,10 +15,10 @@ export LLVM_CONFIG=/opt/miniconda/envs/buildenv/bin/llvm-config
 CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" $MY_PYTHON setup.py install
 cd ..
 
-# numba
-git clone $MY_NUMBA_URL
-cd numba
-git checkout $MY_NUMBA_COMMIT
-$MY_PYTHON -m pip install -e .
-cd ..
-exec bash
+# # numba
+# git clone $MY_NUMBA_URL
+# cd numba
+# git checkout $MY_NUMBA_COMMIT
+# $MY_PYTHON -m pip install -e .
+# cd ..
+# exec bash
diff --git a/hatchery-bootstrap/Dockerfile b/hatchery-bootstrap/Dockerfile
index f07d441..6417f4f 100644
--- a/hatchery-bootstrap/Dockerfile
+++ b/hatchery-bootstrap/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 python:3.13.0b4-bullseye
+FROM --platform=linux/amd64 python:3.13.0rc1-bullseye
 
 RUN curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh --output  ~/miniconda.sh
 RUN bash ~/miniconda.sh -b -p /opt/miniconda
diff --git a/makefile b/makefile
index a6f5677..3743fb1 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL=compile-pypi
 
 update-pypi:
-	docker pull --platform linux/amd64 python:3.13.0b4-bullseye
+	docker pull --platform linux/amd64 python:3.13.0rc1-bullseye
 update-aorg:
 	docker pull --platform linux/amd64 continuumio/miniconda3
 build-pypi:
diff --git a/py313.local.conf b/py313.local.conf
index 68a6980..7587330 100644
--- a/py313.local.conf
+++ b/py313.local.conf
@@ -1,4 +1,4 @@
-export MY_LLVMLITE_COMMIT="main"
+export MY_LLVMLITE_COMMIT="v0.44.0dev0"
 export MY_LLVMLITE_URL="https://github.com/numba/llvmlite"
 export MY_NUMBA_COMMIT="main"
 export MY_NUMBA_URL="https://github.com/numba/numba"