Merge pull request #349 from OpenChemistry/fix-build

Fix builds (from @ercius branch)

Author: cjh1

.github/actions/docker_setup/action.yml

@@ -29,4 +29,6 @@ runs:
         username: ${{ inputs.DOCKERHUB_USERNAME }}
         password: ${{ inputs.DOCKERHUB_TOKEN }}
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v3
+      with: 
+        driver: docker

.github/workflows/build_wheels.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   # Only support 64-bit CPython > 3.6
-  CIBW_SKIP: "cp36-* pp* *-manylinux_i686 *-musllinux_* *-win32 cp313-*"
+  CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *-manylinux_i686 *-musllinux_* *-win32 cp314-*"
 
   # This has some of the software we need pre-installed on it
   CIBW_MANYLINUX_X86_64_IMAGE: openchemistry/stempy_wheel_builder_x86_64

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
         mpi: ['ON', 'OFF']
         ipykernel: ['', 'ipykernel']
         dev: ['', 'dev']
@@ -103,8 +103,8 @@ jobs:
           echo "LATEST_TAG=${LATEST_TAG}" >> $GITHUB_ENV
 
       - name: Build/push Dockerfile.base
-        uses: docker/build-push-action@v3
-        if: ${{ contains(github.event.head_commit.message, 'trigger-ci') || steps.changed-dockerfile-base.outputs.any_changed == 'true'}}
+        uses: docker/build-push-action@v6
+        # if: ${{ contains(github.event.head_commit.message, 'trigger-ci') || steps.changed-dockerfile-base.outputs.any_changed == 'true'}}
         with:
           context: .
           file: ./docker/Dockerfile.base
@@ -114,11 +114,14 @@ jobs:
             DEV=${{ matrix.dev }}
           tags: ${{ env.BASE_TAG }}
           target: ${{ env.BASE_TARGET }}
-          cache-to: type=gha, mode=max
-          cache-from: type=gha, mode=max
+          load: ${{ github.event_name == 'pull_request' }}
+
+      - name: Inspect
+        run: |
+          docker image inspect ${{ env.BASE_TAG }}
 
       - name: Build/push Dockerfile.stempy
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/Dockerfile.stempy
@@ -133,5 +136,3 @@ jobs:
             ${{ env.TAG }}
             ${{ env.LATEST_TAG }}
           target: build
-          cache-to: type=gha, mode=max
-          cache-from: type=gha, mode=max

docker/Dockerfile.base

@@ -1,5 +1,6 @@
+# update to use python 3.11
 ARG PYTHON_VERSION
-FROM python:${PYTHON_VERSION} as base
+FROM python:${PYTHON_VERSION}-bookworm as base
 
 ENV DEBIAN_FRONTEND noninteractive
 WORKDIR /build