From 8bd5d10a630dd0c8b92ccb0151caf1e8d09bdc09 Mon Sep 17 00:00:00 2001
From: Ben Jeffery <ben.jeffery@bdi.ox.ac.uk>
Date: Thu, 3 Aug 2023 11:34:16 +0100
Subject: [PATCH] Fix 32bit CI

---
 .circleci/config.yml                             | 13 +++++++------
 .circleci/images/32bit/Dockerfile                |  2 +-
 python/requirements/CI-complete/requirements.txt |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4b68b468f..a8ab60c512 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,6 +11,7 @@ commands:
             sudo apt-get update
             sudo apt-get install -y ninja-build libcunit1-dev valgrind clang doxygen python3-pip
             # Install meson to the system packages so we can run it as root
+            pip install --upgrade pip wheel
             sudo pip install meson
             pip install numpy==1.18.5
             pip install --user -r python/requirements/CI-complete/requirements.txt
@@ -153,7 +154,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: cimg/python:3.7
+      - image: cimg/python:3.10
     working_directory: /home/circleci/tskit
     steps:
       - checkout
@@ -162,10 +163,10 @@ jobs:
           # It's sometimes necessary to nuke the cache, and the simplest
           # way to do it is to change the key. We can increment this
           # version number when we want to do this.
-          key: tskit-{{ .Branch }}-v6
+          key: tskit-{{ .Branch }}-v8
       - setup
       - save_cache:
-          key: tskit-{{ .Branch }}-v6
+          key: tskit-{{ .Branch }}-v8
           paths:
             - "/home/circleci/.local"
       - compile_and_test
@@ -194,16 +195,16 @@ jobs:
 
   build-32:
     docker:
-      - image: tskitimages/testing-32bit:2.0
+      - image: tskitimages/testing-32bit:3.0
     working_directory: /home/circleci/tskit
     steps:
       - checkout
       - run: sudo chown -R circleci:circleci *
       - restore_cache:
-          key: tskit-32-{{ .Branch }}-v7
+          key: tskit-32-{{ .Branch }}-v8
       - setup
       - save_cache:
-          key: tskit-32-{{ .Branch }}-v7
+          key: tskit-32-{{ .Branch }}-v8
           paths:
             - "/home/circleci/.local"
       # We need to install curl for the codecov upload.
diff --git a/.circleci/images/32bit/Dockerfile b/.circleci/images/32bit/Dockerfile
index f894020e09..f00fc9a99c 100644
--- a/.circleci/images/32bit/Dockerfile
+++ b/.circleci/images/32bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM i386/python:3.7-slim-bullseye
+FROM i386/python:3.10-slim-bullseye
 
 RUN apt-get update && apt-get install -y sudo rustc cargo libhdf5-dev libgsl-dev pkg-config libssl-dev
 RUN adduser --disabled-password --gecos "" circleci
diff --git a/python/requirements/CI-complete/requirements.txt b/python/requirements/CI-complete/requirements.txt
index a582f42387..176afd381a 100644
--- a/python/requirements/CI-complete/requirements.txt
+++ b/python/requirements/CI-complete/requirements.txt
@@ -3,7 +3,7 @@ black==21.12b0
 coverage==6.5.0
 dendropy==4.5.2
 flake8==5.0.4
-h5py==3.7.0
+h5py==3.9.0
 jsonschema==4.16.0
 kastore==0.3.2
 lshmm==0.0.4