build: work in progress on build updates

Author: gpeacock

.github/workflows/build.yml

@@ -42,153 +42,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@master
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          toolchain: ${{ matrix.rust_version }}
-          components: llvm-tools-preview
-
-      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@v2
-
-  clippy_check:
-    name: Clippy
-
-    if: |
-      github.event_name != 'pull_request' ||
-      github.event.pull_request.author_association == 'COLLABORATOR' ||
-      github.event.pull_request.author_association == 'MEMBER' ||
-      github.event.pull_request.user.login == 'dependabot[bot]' ||
-      contains(github.event.pull_request.labels.*.name, 'safe to test')
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: clippy
-
-      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@v2
-
-      - name: Run Clippy
-        run: cargo clippy --all-features --all-targets -- -Dwarnings
-
-  cargo_fmt:
-    name: Enforce Rust code format
-
-    if: |
-      github.event_name != 'pull_request' ||
-      github.event.pull_request.author_association == 'COLLABORATOR' ||
-      github.event.pull_request.author_association == 'MEMBER' ||
-      github.event.pull_request.user.login == 'dependabot[bot]' ||
-      contains(github.event.pull_request.labels.*.name, 'safe to test')
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: rustfmt
-
-      - name: Check format
-        run: cargo +nightly fmt --all -- --check
-
-  docs_rs:
-    name: Preflight docs.rs build
-
-    if: |
-      github.event_name != 'pull_request' ||
-      github.event.pull_request.author_association == 'COLLABORATOR' ||
-      github.event.pull_request.author_association == 'MEMBER' ||
-      github.event.pull_request.user.login == 'dependabot[bot]' ||
-      contains(github.event.pull_request.labels.*.name, 'safe to test')
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install nightly Rust toolchain
-        # Nightly is used here because the docs.rs build
-        # uses nightly and we use doc_cfg features that are
-        # not in stable Rust as of this writing (Rust 1.76).
-        uses: dtolnay/rust-toolchain@nightly
-
-      - name: Run cargo docs
-        # This is intended to mimic the docs.rs build
-        # environment. The goal is to fail PR validation
-        # if the subsequent release would result in a failed
-        # documentation build on docs.rs.
-        run: cargo +nightly doc --workspace --all-features --no-deps
-        env:
-          RUSTDOCFLAGS: --cfg docsrs
-          DOCS_RS: 1
-  cargo-deny:
-    name: License / vulnerability audit
-
-    if: |
-      github.event_name != 'pull_request' ||
-      github.event.pull_request.author_association == 'COLLABORATOR' ||
-      github.event.pull_request.author_association == 'MEMBER' ||
-      github.event.pull_request.user.login == 'dependabot[bot]' ||
-      contains(github.event.pull_request.labels.*.name, 'safe to test')
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        checks:
-          - advisories
-          - bans licenses sources
-
-    # Prevent sudden announcement of a new advisory from failing CI:
-    continue-on-error: ${{ matrix.checks == 'advisories' }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Audit crate dependencies
-        uses: EmbarkStudios/cargo-deny-action@v2
-        with:
-          command: check ${{ matrix.checks }}
-
-  unused_deps:
-    name: Check for unused dependencies
-
-    if: |
-      github.event_name != 'pull_request' ||
-      github.event.pull_request.author_association == 'COLLABORATOR' ||
-      github.event.pull_request.author_association == 'MEMBER' ||
-      github.event.pull_request.user.login == 'dependabot[bot]' ||
-      contains(github.event.pull_request.labels.*.name, 'safe to test')
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install nightly Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
-
-      - name: Run cargo-udeps
-        uses: aig787/cargo-udeps-action@v1
-        with:
-          version: latest
-          args: --all-targets --all-features
+          python-version: "3.10"
+          cache: "pip"
 
+      - run: python -m pip install --upgrade pip
+      - run: python -m pip install -r requirements.txt
+      - run: python -m pip install pytest
+      - run: pytest
   linux:
     runs-on: ubuntu-latest
 
@@ -208,35 +71,11 @@ jobs:
         with:
           python-version: "3.10"
           cache: "pip"
-      - run: pip install -r requirements.txt
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
-        if: ${{ matrix.target == 'aarch64' }}
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          maturin-version: "1.2.0"
-          args: --release --out dist --find-interpreter
-          sccache: "true"
-          manylinux: ${{ matrix.target == 'aarch64' && 'manylinux_2_28' || 'auto' }}
-          before-script-linux: |
-            pip install uniffi-bindgen==0.24.1
+      - run: 
+          pip install -r requirements.txt
+          python setup.py bdist_wheel
 
-            # ISSUE: https://github.com/sfackler/rust-openssl/issues/2036#issuecomment-1724324145
-            # If we're running on rhel centos, install needed packages.
-            if command -v yum &> /dev/null; then
-                yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
 
-                # If we're running on i686 we need to symlink libatomic
-                # in order to build openssl with -latomic flag.
-                if [[ ! -d "/usr/lib64" ]]; then
-                    ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so
-                fi
-            else
-                # If we're running on debian-based system.
-                apt update -y && apt-get install -y libssl-dev openssl pkg-config
-            fi
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -263,13 +102,10 @@ jobs:
           python-version: '3.10'
           architecture: ${{ matrix.target }}
           cache: "pip"
-      - run: pip install -r requirements.txt
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
-          sccache: 'true'
+      - run: 
+          pip install -r requirements.txt
+          python setup.py bdist_wheel
+
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -292,13 +128,9 @@ jobs:
         with:
           python-version: '3.10'
           cache: "pip"
-      - run: pip install -r requirements.txt
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        with:
-          target: x86_64
-          args: --release --out dist --find-interpreter
-          sccache: 'true'
+      - run: 
+          pip install -r requirements.txt
+          python setup.py bdist_wheel
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:

pyproject.toml

@@ -8,7 +8,7 @@ version = "0.10.0"
 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"}
+license-files = ["LICENSE-MIT", "LICENSE-APACHE"]
 authors = [{ name = "Gavin Peacock", email = "[email protected]" }]
 classifiers = [
     "Programming Language :: Python :: 3",

requirements.txt

@@ -1,6 +1,8 @@
 
 wheel==0.41.2  # For building wheels
 setuptools==68.0.0  # For building packages
+toml ==0.10.2  # For reading pyproject.toml files
+
 # Testing dependencies
 pytest==7.4.0 
  # only used in the training example

src/c2pa/__init__.py

@@ -1,2 +1,3 @@
+__version__ = "0.10.0"
 
 from .c2pa import *  # NOQA

src/c2pa/build.py

@@ -72,9 +72,28 @@ def download_artifacts() -> None:
         print(f"Unexpected error: {e}", file=sys.stderr)
         sys.exit(1)
 
+def inject_version():
+    """Inject the version from pyproject.toml into src/c2pa/__init__.py as __version__."""
+    import toml
+    pyproject_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "pyproject.toml"))
+    init_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "c2pa", "__init__.py"))
+    with open(pyproject_path, "r") as f:
+        pyproject = toml.load(f)
+    version = pyproject["project"]["version"]
+    # Read and update __init__.py
+    lines = []
+    if os.path.exists(init_path):
+        with open(init_path, "r") as f:
+            lines = [line for line in f if not line.startswith("__version__")]
+    lines.insert(0, f'__version__ = "{version}"\n')
+    with open(init_path, "w") as f:
+        f.writelines(lines)
+
 def initialize_build() -> None:
     """Initialize the build process by downloading artifacts."""
+    inject_version()
     download_artifacts()
 
 if __name__ == "__main__":
+    inject_version()
     download_artifacts()