Skip to content

Commit

Permalink
Fix 32bit CI
Browse files Browse the repository at this point in the history
  • Loading branch information
benjeffery committed Aug 3, 2023
1 parent bef0b4a commit 67be0fc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ commands:
name: Install dependencies and set path
command: |
sudo apt-get update
sudo apt-get install -y ninja-build libcunit1-dev valgrind clang doxygen python3-pip
sudo apt-get install -y ninja-build libcunit1-dev valgrind clang doxygen python3-pip llvm
# 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
# Remove tskit installed by msprime
pip uninstall tskit -y
Expand Down Expand Up @@ -153,7 +153,7 @@ commands:
jobs:
build:
docker:
- image: cimg/python:3.7
- image: cimg/python:3.10
working_directory: /home/circleci/tskit
steps:
- checkout
Expand All @@ -162,10 +162,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
Expand Down Expand Up @@ -194,16 +194,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.
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/32bit/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions python/requirements/CI-complete/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ 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
msgpack==1.0.4
msprime==1.2.0
networkx==2.6.3 # Held at 2.6.3 for Python 3.7 compatibility
networkx==3.1
newick==1.3.2
numpy==1.21.6 # Held at 1.21.6 for Python 3.7 compatibility
numpy==1.25.2
portion==2.3.0
pyparsing==3.0.9
pysam==0.19.1
Expand Down

0 comments on commit 67be0fc

Please sign in to comment.