From 2e9e41ea10e39d0cc19528af67d3fee6995a98f0 Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Tue, 18 Feb 2025 11:26:30 -0800 Subject: [PATCH 1/6] chore: update to c2pa-rs 0.46.0 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c544682a..5745c6a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "c2pa-python" -version = "0.6.3" +version = "0.7.0" edition = "2021" authors = ["Gavin Peacock Date: Tue, 18 Feb 2025 12:44:52 -0800 Subject: [PATCH 2/6] chore: update to v4 actions upload/download --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8c4cb22..b1189eb7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -238,7 +238,7 @@ jobs: apt update -y && apt-get install -y libssl-dev openssl pkg-config fi - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -271,7 +271,7 @@ jobs: args: --release --out dist --find-interpreter sccache: 'true' - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -300,7 +300,7 @@ jobs: args: --release --out dist --find-interpreter sccache: 'true' - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -329,7 +329,7 @@ jobs: args: --release --out dist --find-interpreter sccache: 'true' - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -352,7 +352,7 @@ jobs: command: sdist args: --out dist - name: Upload sdist - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -366,7 +366,7 @@ jobs: environment: Publish needs: [linux, windows, macos_x86, macos_aarch64, sdist] steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: wheels - name: Publish to PyPI From 734473d61c93124d53dc77729a76bef61ee88b25 Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Tue, 18 Feb 2025 13:00:12 -0800 Subject: [PATCH 3/6] chore: bump the version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5745c6a1..05032b6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "c2pa-python" -version = "0.7.0" +version = "0.7.1" edition = "2021" authors = ["Gavin Peacock Date: Tue, 18 Feb 2025 15:00:02 -0800 Subject: [PATCH 4/6] chore: update unit test versions --- tests/test_api.py | 2 +- tests/test_unit_tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_api.py b/tests/test_api.py index 99f4824f..cef753e5 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -63,7 +63,7 @@ def getitem(d, key): class TestC2paSdk(unittest.TestCase): def test_version(self): - assert version() == "0.6.3" + assert version() == "0.7.1" def test_sdk_version(self): assert "c2pa-rs/" in sdk_version() diff --git a/tests/test_unit_tests.py b/tests/test_unit_tests.py index 8a5434ad..2bba9a2c 100644 --- a/tests/test_unit_tests.py +++ b/tests/test_unit_tests.py @@ -25,7 +25,7 @@ class TestC2paSdk(unittest.TestCase): def test_version(self): - self.assertIn("0.6.3", sdk_version()) + self.assertIn("0.7.1", sdk_version()) class TestReader(unittest.TestCase): From f8fa04838e00d93a705844b4fd059d1053b35ab0 Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Tue, 18 Feb 2025 15:29:11 -0800 Subject: [PATCH 5/6] chore: another attempt to fix CI --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1189eb7..bf7a4811 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -240,7 +240,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.target }} path: dist windows: @@ -273,7 +273,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.target }} path: dist macos_x86: @@ -368,6 +368,7 @@ jobs: steps: - uses: actions/download-artifact@v4 with: + pattern: wheels-* name: wheels - name: Publish to PyPI uses: PyO3/maturin-action@v1 From 153075cd2e81fd7294d25a82af8c2ed5e7fd6775 Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Tue, 18 Feb 2025 16:18:17 -0800 Subject: [PATCH 6/6] chore: ci fix for mac builds --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf7a4811..90fbf91b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -302,7 +302,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-mac-x86_64 path: dist macos_aarch64: @@ -331,7 +331,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-mac-aarch64 path: dist sdist: