Fix 32bit CI

Author: benjeffery

.circleci/config.yml

@@ -11,8 +11,9 @@ 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 numpy #Needed for some build steps in requirements.txt
             pip install --user -r python/requirements/CI-complete/requirements.txt
             # Remove tskit installed by msprime
             pip uninstall tskit -y
@@ -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,20 +195,21 @@ jobs:
 
   build-32:
     docker:
-      - image: tskitimages/testing-32bit:2.0
+      - image: tskitimages/testing-32bit:4.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.
-      - run: sudo apt-get install -y curl
+      - run: |
+          sudo apt-get install -y curl wget
       - compile_and_test
 
 workflows:

.circleci/images/32bit/Dockerfile

@@ -1,6 +1,6 @@
-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 apt-get update && apt-get install -y sudo rustc cargo libhdf5-dev libgsl-dev pkg-config libssl-dev llvm build-essential
 RUN adduser --disabled-password --gecos "" circleci
 RUN echo 'circleci     ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 

python/requirements/CI-complete/requirements.txt

@@ -1,23 +1,15 @@
-biopython==1.79
-black==21.12b0
-coverage==6.5.0
-dendropy==4.5.2
-flake8==5.0.4
-h5py==3.7.0
-jsonschema==4.16.0
+biopython==1.81
+coverage==7.2.7
+dendropy==4.6.1
+h5py==3.9.0
 kastore==0.3.2
 lshmm==0.0.4
-msgpack==1.0.4
+msgpack==1.0.5
 msprime==1.2.0
-networkx==2.6.3 # Held at 2.6.3 for Python 3.7 compatibility
-newick==1.3.2
-numpy==1.21.6 # Held at 1.21.6 for Python 3.7 compatibility
-portion==2.3.0
-pyparsing==3.0.9
-pysam==0.19.1
-pytest==7.1.3
-pytest-cov==4.0.0
-pytest-xdist==2.5.0
-svgwrite==1.4.3
+networkx==3.1
+portion==2.4.1
+pytest==7.4.0
+pytest-cov==4.1.0
+pytest-xdist==3.3.1
 tszip==0.2.2
-xmlunittest==0.5.0
+xmlunittest==0.5.0