zzz

.github/workflows/python-publish.yml

@@ -274,16 +274,32 @@ jobs:
       id-token: write
       contents: read
     steps:
-      # Download all wheels
-      - name: Download all wheels
+      - name: Create dist directory
+        run: mkdir -p dist
+
+      # Download all artifacts at once
+      - name: Download all artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: wheels-*
-          merge-multiple: true
           path: dist
 
-      - name: Display structure of downloaded files
-        run: ls -R dist
+      - name: Prepare dist directory
+        run: |
+          find dist -type f -name "*.whl" -exec mv {} dist/ \;
+          find dist -type f -name "*.tar.gz" -exec mv {} dist/ \;
+          rm -rf dist/*/
+          echo "Final dist directory contents:"
+          ls -la dist/
+
+      - name: Check if version exists
+        run: |
+          VERSION="${{ github.ref_name }}"
+          VERSION="${VERSION#v}"  # Remove 'v' prefix if present
+          if pip index versions self_encryption | grep -q "${VERSION}"; then
+            echo "Version ${VERSION} already exists on PyPI"
+            exit 1
+          fi
+
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

Cargo.toml

@@ -78,3 +78,4 @@ harness = false
 [lib]
 name = "self_encryption"
 crate-type = ["cdylib", "rlib"]
+path = "src/lib.rs"

pyproject.toml

@@ -22,4 +22,5 @@ self-encryption = "self_encryption.cli:cli"
 features = ["python"]
 module-name = "self_encryption._self_encryption"
 bindings = "pyo3"
+python-source = "python"
 

tests/test_bindings.py → python/tests/test_bindings.py

@@ -4,8 +4,6 @@
 from typing import List
 import pytest
 from self_encryption import (
-    DataMap,
-    XorName,
     encrypt_from_file,
     decrypt_from_storage,
     streaming_decrypt_from_storage,

tests/test_cli.py → python/tests/test_cli.py

@@ -2,7 +2,6 @@
 from click.testing import CliRunner
 from self_encryption.cli import cli
 import tempfile
-import os
 from pathlib import Path
 
 @pytest.fixture

src/lib.rs

@@ -94,7 +94,9 @@ mod encrypt;
 mod encryption;
 mod error;
 #[cfg(feature = "python")]
-mod python;
+mod bindings {
+    include!("../python/bindings/mod.rs");
+}
 pub mod test_helpers;
 mod utils;