From 9a7692b55996175d57dc4855b180106d236f8f79 Mon Sep 17 00:00:00 2001
From: "Bryan W. Weber" <bryan.w.weber@gmail.com>
Date: Sun, 21 Nov 2021 20:22:55 -0500
Subject: [PATCH] Update packaging workflow

---
 .github/workflows/python-package.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 73aa2968fcb..508faf08d68 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -25,16 +25,13 @@ jobs:
     - name: Update pip
       run: python3 -m pip install -U pip setuptools
     - name: Install dependencies
-      run: python3 -m pip install scons numpy cython build
+      run: python3 -m pip install scons build
     - name: Build the interface
-      run: python3 `which scons` build f90_interface=n debug=n googletest=none python_package=sdist use_pch=n
-    - name: Build the sdist
-      run: python3 -m build -s
-      working-directory: interfaces/python_sdist
+      run: python3 `which scons` sdist f90_interface=n python_package='none'
     - name: Archive the built sdist
       uses: actions/upload-artifact@v2
       with:
-        path: ./interfaces/python_sdist/dist/*.tar.gz
+        path: ./build/python_sdist/dist/*.tar.gz
         name: sdist
         if-no-files-found: error
 
@@ -44,7 +41,7 @@ jobs:
     needs: ["sdist"]
     strategy:
       matrix:
-        py: ["36", "37", "38", "39"]
+        py: ["36", "37", "38", "39", "310"]
         arch: ["x86_64", "i686", "aarch64", "ppc64le", "s390x"]
       fail-fast: true
     env:
@@ -76,7 +73,7 @@ jobs:
       with:
         platforms: all
     - name: Build wheels
-      uses: pypa/cibuildwheel@v1.12.0
+      uses: pypa/cibuildwheel@v2.2.2
       env:
         CIBW_BUILD: cp${{ matrix.py }}-*
         CIBW_ARCHS: ${{ matrix.arch }}
@@ -93,7 +90,7 @@ jobs:
     needs: ["sdist"]
     strategy:
       matrix:
-        py: ["36", "37", "38", "39"]
+        py: ["36", "37", "38", "39", "310"]
         arch: ["AMD64", "x86"]
       fail-fast: true
     env:
@@ -124,7 +121,7 @@ jobs:
         rm $BOOST_ROOT/download.7z
       shell: bash
     - name: Build wheels
-      uses: pypa/cibuildwheel@v1.12.0
+      uses: pypa/cibuildwheel@v2.2.2
       env:
         CIBW_ENVIRONMENT: "BOOST_INCLUDE=${BOOST_ROOT}"
         CIBW_ARCHS: ${{ matrix.arch }}
@@ -144,7 +141,7 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET: 10.9
     strategy:
       matrix:
-        py: ["36", "37", "38", "39"]
+        py: ["36", "37", "38", "39", "310"]
       fail-fast: true
     steps:
     - name: Download pre-built sdist
@@ -156,7 +153,7 @@ jobs:
     - name: Install Brew dependencies
       run: brew install boost
     - name: Build wheels
-      uses: pypa/cibuildwheel@v1.12.0
+      uses: pypa/cibuildwheel@v2.2.2
       env:
         CIBW_BUILD: cp${{ matrix.py }}-*
         CIBW_SKIP: cp35-*
@@ -174,7 +171,7 @@ jobs:
     needs: ["sdist"]
     strategy:
       matrix:
-        py: ["38", "39"]
+        py: ["38", "39", "310"]
       fail-fast: true
     env:
       SDKROOT: "macosx11.0"
@@ -192,7 +189,7 @@ jobs:
     - name: Install Brew dependencies
       run: brew install boost
     - name: Build wheels
-      uses: pypa/cibuildwheel@v1.12.0
+      uses: pypa/cibuildwheel@v2.2.2
       env:
         CIBW_ENVIRONMENT: 'BOOST_INCLUDE="$(brew --prefix)/include"'
         CIBW_ARCHS: "arm64"