Merge branch 'main' into gpeacock/no_rust

Author: gpeacock

.github/workflows/build.yml

@@ -359,21 +359,28 @@ jobs:
 
   release:
     name: Release
-
     if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true'
-
     runs-on: ubuntu-latest
-    environment: Publish
+    environment: pypipublish
     needs: [linux, windows, macos_x86, macos_aarch64, sdist]
+    permissions:
+      id-token: write
+      contents: read
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           pattern: wheels-*
-          name: wheels
+          path: dist
+          merge-multiple: true
+      - name: List contents of dist directory
+        run: ls -la dist/
       - name: Publish to PyPI
-        uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.caipypi }}
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          command: upload
-          args: --non-interactive --skip-existing *
+          packages-dir: dist
+          # verbose: true
+          # print-hash: true
+          # Uncomment below for test runs, otherwise fails on existing packages being reuploaded
+          skip-existing: true
+

deny.toml

@@ -39,6 +39,7 @@ allow = [
   "Unicode-DFS-2016",
   "Unicode-3.0",
   "Zlib",
+  "CDLA-Permissive-2.0",
 ]
 confidence-threshold = 0.9
 

pyproject.toml

@@ -3,11 +3,12 @@ requires = ["setuptools>=68.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "c2pa"
+name = "c2pa-python"
 version = "0.10.0"
-description = "Python bindings for the C2PA library"
+requires-python = ">=3.8"
+description = "Python bindings for the C2PA Content Authenticity Initiative (CAI) library"
+readme = { file = "README.md", content-type = "text/markdown" }
 license = {file = "LICENSE-MIT"}
-readme = "README.md"
 authors = [{ name = "Gavin Peacock", email = "[email protected]" }]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -20,10 +21,9 @@ maintainers = [
 ]
 urls = {homepage = "https://contentauthenticity.org", repository = "https://github.com/contentauth/c2pa-python"}
 
-requires-python = ">=3.8"
-dependencies = [
-    "cryptography>=41.0.0",
-    "pytest>=7.4.0"
+[project.optional-dependencies]
+test = [
+  "pytest < 5.0.0"
 ]
 
 [project.scripts]
@@ -33,4 +33,5 @@ download-artifacts = "c2pa.build:download_artifacts"
 packages = ["src/c2pa"]
 
 [tool.hatch.build.hooks.custom]
-path = "c2pa/build.py"
+path = "c2pa/build.py"
+

tests/_test_api.py

@@ -63,7 +63,7 @@ def getitem(d, key):
 
 class TestC2paSdk(unittest.TestCase):
     def test_version(self):
-        assert version() == "0.8.2"
+        assert version() == "0.9.0"
 
     def test_sdk_version(self):
         assert "c2pa-rs/" in sdk_version()

tests/test_unit_tests.py

@@ -23,10 +23,10 @@
 
 testPath = os.path.join(PROJECT_PATH, "tests", "fixtures", "C.jpg")
 
-# class TestC2paSdk(unittest.TestCase):
-#     def test_version(self):
-#         print(sdk_version())
-#         self.assertIn("0.8.0", sdk_version())
+class TestC2paSdk(unittest.TestCase):
+    def test_version(self):
+        self.assertIn("0.9.0", sdk_version())
+
 
 class TestReader(unittest.TestCase):
     def setUp(self):