fix: Dev rebuild

Author: tmathern

.github/workflows/build.yml

@@ -52,6 +52,7 @@ jobs:
       - run: python -m pip install -r requirements.txt
       - run: python -m pip install pytest
       - run: pytest
+
   linux:
     runs-on: ubuntu-latest
 
@@ -71,7 +72,7 @@ jobs:
         with:
           python-version: "3.10"
           cache: "pip"
-      - run: 
+      - run:
           pip install -r requirements.txt
           python setup.py bdist_wheel
 
@@ -102,7 +103,7 @@ jobs:
           python-version: '3.10'
           architecture: ${{ matrix.target }}
           cache: "pip"
-      - run: 
+      - run:
           pip install -r requirements.txt
           python setup.py bdist_wheel
 
@@ -128,7 +129,7 @@ jobs:
         with:
           python-version: '3.10'
           cache: "pip"
-      - run: 
+      - run:
           pip install -r requirements.txt
           python setup.py bdist_wheel
       - name: Upload wheels
@@ -207,12 +208,13 @@ jobs:
           merge-multiple: true
       - name: List contents of dist directory
         run: ls -la dist/
-      - name: Publish to PyPI
+      - name: Publish to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist
-          # verbose: true
-          # print-hash: true
+          # Uncomment to use TestPyPI
+          repository-url: https://test.pypi.org/legacy/
+          verbose: true
           # Uncomment below for test runs, otherwise fails on existing packages being reuploaded
           skip-existing: true
 

Makefile

@@ -6,7 +6,7 @@
 clean:
 	rm -rf artifacts/ build/ dist/
 
-clean-c2pa-env:
+clean-c2pa-env: clean
 	python3 -m pip uninstall -y c2pa
 	python3 -m pip cache purge
 
@@ -15,6 +15,9 @@ build-python:
 	python3 -m pip install -r requirements-dev.txt
 	pip install -e .
 
+rebuild: clean-c2pa-env download-native-artifacts build-python
+	@echo "Development rebuild done!"
+
 test:
 	python3 ./tests/test_unit_tests.py
 
@@ -39,3 +42,5 @@ publish: release
 format:
 	autopep8 --aggressive --aggressive --in-place src/c2pa/*.py
 
+download-native-artifacts:
+	python3 scripts/download_artifacts.py c2pa-v0.55.0

setup.py

@@ -19,6 +19,40 @@
 ARTIFACTS_DIR = Path('artifacts')  # Where downloaded libraries are stored
 PACKAGE_LIBS_DIR = Path('src/c2pa/libs')  # Where libraries will be copied for the wheel
 
+
+def get_platform_identifier(cpu_arch = None) -> str:
+    """Get a platform identifier (arch-os) for the current system,
+    matching downloaded identifiers used by the Github publisher.
+
+    Args:
+        Only used on macOS systems.:
+            cpu_arch: Optional CPU architecture for macOS. If not provided, returns universal build.
+
+    Returns one of:
+    - universal-apple-darwin (for Mac, when cpu_arch is None, fallback)
+    - aarch64-apple-darwin (for Mac ARM64)
+    - x86_64-apple-darwin (for Mac x86_64)
+    - x86_64-pc-windows-msvc (for Windows 64-bit)
+    - x86_64-unknown-linux-gnu (for Linux 64-bit)
+    """
+    system = platform.system().lower()
+
+    if system == "darwin":
+        if cpu_arch is None:
+            return "universal-apple-darwin"
+        elif cpu_arch == "arm64":
+            return "aarch64-apple-darwin"
+        elif cpu_arch == "x86_64":
+            return "x86_64-apple-darwin"
+        else:
+            raise ValueError(f"Unsupported CPU architecture for macOS: {cpu_arch}")
+    elif system == "windows":
+        return "x86_64-pc-windows-msvc"
+    elif system == "linux":
+        return "x86_64-unknown-linux-gnu"
+    else:
+        raise ValueError(f"Unsupported operating system: {system}")
+
 def get_current_platform():
     """Determine the current platform name."""
     if sys.platform == "win32":
@@ -93,7 +127,8 @@ def find_available_platforms():
 
 # For development installation
 if 'develop' in sys.argv or 'install' in sys.argv:
-    current_platform = get_current_platform()
+    current_platform = get_platform_identifier()
+    print("Installing in development mode for platform ", current_platform)
     copy_platform_libraries(current_platform)
 
 # For wheel building