ci: Merge in latest main

Author: tmathern

.github/workflows/build-wheel.yml

@@ -121,7 +121,11 @@ jobs:
           # Verify wheel structure
           twine check dist/*
 
+<<<<<<< HEAD
       - name: Build macOS wheel
+=======
+      - name: Build macOS wheel (Universal)
+>>>>>>> main
         if: runner.os == 'macOS'
         run: |
           # Create necessary directories
@@ -147,6 +151,7 @@ jobs:
             exit 1
           fi
 
+<<<<<<< HEAD
           # Determine platform name based on target architecture
           if [ "${{ inputs.architecture }}" = "universal2" ]; then
             PLATFORM_NAME="macosx_10_9_universal2"
@@ -164,11 +169,19 @@ jobs:
 
           # Build wheel with appropriate platform name
           python setup.py bdist_wheel --plat-name $PLATFORM_NAME
+=======
+          # Build wheel
+          python setup.py bdist_wheel --plat-name macosx_10_9_universal2
+>>>>>>> main
 
           # Rename wheel to ensure unique filename
           cd dist
           for wheel in *.whl; do
+<<<<<<< HEAD
             mv "$wheel" "${wheel/$PLATFORM_NAME/$PLATFORM_NAME}"
+=======
+            mv "$wheel" "${wheel/macosx_10_9_universal2/macosx_10_9_universal2}"
+>>>>>>> main
           done
           cd ..
 

.github/workflows/build.yml

@@ -326,12 +326,20 @@ jobs:
           .\venv\Scripts\pytest .\tests\test_unit_tests.py -v
 
   build-macos-wheel:
+<<<<<<< HEAD
     name: Build macOS wheels
+=======
+    name: Build macOS wheel (Universal)
+>>>>>>> main
     uses: ./.github/workflows/build-wheel.yml
     needs: [tests-unix, read-version]
     with:
       python-version: "3.10"
+<<<<<<< HEAD
       runs-on: ${{ matrix.runs-on }}
+=======
+      runs-on: macos-latest
+>>>>>>> main
       artifact-name: wheels-macos-${{ matrix.target }}
       architecture: ${{ matrix.target }}
       c2pa-version: ${{ needs.read-version.outputs.c2pa-native-version }}
@@ -342,10 +350,13 @@ jobs:
         include:
           - target: universal2
             runs-on: macos-latest
+<<<<<<< HEAD
           - target: arm64
             runs-on: macos-latest
           - target: x86_64
             runs-on: macos-13
+=======
+>>>>>>> main
 
     if: |
       github.event_name != 'pull_request' ||
@@ -355,15 +366,25 @@ jobs:
       contains(github.event.pull_request.labels.*.name, 'safe to test')
 
   test-built-macos-wheel:
+<<<<<<< HEAD
     name: Test macOS built wheels
+=======
+    name: Test macOS built wheel (Universal)
+>>>>>>> main
     needs: build-macos-wheel
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
         include:
+<<<<<<< HEAD
           - target: arm64
             runs-on: macos-latest
           - target: x86_64
+=======
+          - target: universal2
+            runs-on: macos-latest
+          - target: universal2
+>>>>>>> main
             runs-on: macos-13
 
     if: |

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "c2pa-python"
-version = "0.14.0-alpha"
+version = "0.16.0-alpha"
 requires-python = ">=3.10"
 description = "Python bindings for the C2PA Content Authenticity Initiative (CAI) library"
 readme = { file = "README.md", content-type = "text/markdown" }