Bindings python

.gitlab-ci.yml

@@ -1,3 +1,4 @@
+---
 image: gitlab.cosmian.com:5000/core/ci-rust:latest
 
 variables:
@@ -67,7 +68,7 @@ is_publishable:
 .base_compile: &base_compile
   stage: build
   cache:
-    key: "${CI_COMMIT_REF_SLUG}"
+    key: ${CI_COMMIT_REF_SLUG}
     policy: pull
     paths:
       - $CARGO_HOME
@@ -144,6 +145,19 @@ build_android:
       - jniLibs
     expire_in: 3 mos
 
+build_python:
+  stage: build
+  image:
+    name: ghcr.io/pyo3/maturin
+    # override the image entrypoint
+    entrypoint: ['']
+  script:
+    - maturin build --release --features python
+  artifacts:
+    paths:
+      - target/wheels/*.whl
+    expire_in: 3 mos
+
 test_cloudproof_java:
   image: openjdk:8
   stage: test
@@ -159,12 +173,8 @@ test_cloudproof_java:
 test_python:
   stage: test
   script:
-    - maturin build --release --features python
-    - bash src/interfaces/pyo3/tests/test.sh
-  artifacts:
-    paths:
-      - target/wheels/*.whl
-    expire_in: 3 mos
+    - pip install --force-reinstall target/wheels/cover_crypt*.whl
+    - python3 src/interfaces/pyo3/tests/test_cover_crypt.py
 
 test_cloudproof_js:
   image: node:16
@@ -181,13 +191,13 @@ test_cloudproof_js:
 pack_all_artifacts:
   stage: pack
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/'
+    - if: $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/
   before_script:
     - apt update && apt install -y zip
   script:
     - zip -r ${CI_PROJECT_NAME}-${CI_COMMIT_TAG}-bin.zip pkg target jniLibs
   artifacts:
-    name: "cosmian_${CI_PROJECT_NAME}_${CI_COMMIT_TAG}"
+    name: cosmian_${CI_PROJECT_NAME}_${CI_COMMIT_TAG}
     paths:
       - ${CI_PROJECT_NAME}-${CI_COMMIT_TAG}-bin.zip
     expire_in: 3 mos
@@ -196,7 +206,7 @@ npm_publish:
   image: gitlab.cosmian.com:5000/core/ci-npm:latest
   stage: publish
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/'
+    - if: $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/
   script:
     - echo "//registry.npmjs.org/:_authToken=$NPM_ACCESS_TOKEN" > ~/.npmrc
     - wasm-pack build --target web --release --features wasm_bindgen
@@ -206,7 +216,7 @@ npm_publish:
 cargo_publish:
   stage: publish
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/'
+    - if: $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/
   script:
     - echo "[registry]" > ~/.cargo/credentials
     - echo "token = \"$CRATES_IO\"" >> ~/.cargo/credentials
@@ -217,11 +227,19 @@ cargo_publish:
     - cargo publish --token $CRATES_IO
     - rm -rf /tmp/${CI_PROJECT_NAME}
 
+python_publish:
+  stage: publish
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/
+  script:
+    - pip install twine
+    - twine upload -u "${PYPI_USERNAME}" -p "${PYPI_PASSWORD}" target/wheels/cover_crypt-${CI_COMMIT_TAG}*.whl
+
 # Finally, run benchmarks at once
 benchmarks:
   stage: publish
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/'
+    - if: $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/
   before_script:
     - apt update && apt install -y gnuplot
   script:

CHANGELOG.md

@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - improve serialization
+- new python interfaces based on objects rather than functions
 
 ### Fixed
 
@@ -57,6 +58,7 @@ All notable changes to this project will be documented in this file.
 ---
 
 ---
+
 ## [6.0.8] - 2022-10-17
 
 ### Added
@@ -68,14 +70,17 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 ### Removed
+
 ---
 
 ---
+
 ## [6.0.7] - 2022-10-14
 
 ### Added
 
 - expose boolean Access Policy parsing in WASM
+
 ### Fixed
 
 ### Removed

Cargo.toml

@@ -44,7 +44,8 @@ zeroize = "1.5"
 # Optional ones
 js-sys = { version = "0.3", optional = true }
 lazy_static = { version = "1.4", optional = true }
-pyo3 = { version = "0.16.3", features = ["extension-module"], optional = true }
+# Build python package for version 3.7 and above: https://pyo3.rs/v0.17.3/features.html
+pyo3 = { version = "0.17.3", features = ["extension-module", "abi3", "abi3-py37"], optional = true }
 wasm-bindgen = { version = "0.2", features = [
   "serde-serialize",
 ], optional = true }

pyproject.toml

@@ -1,10 +1,14 @@
 [build-system]
-requires = ["maturin>=0.12,<0.13"]
+requires = ["maturin>=0.13,<0.14"]
 build-backend = "maturin"
 
+[tool.maturin]
+# https://github.com/pypa/manylinux#manylinux
+compatibility = "manylinux_2_17"
+
 [project]
 name = "cover_crypt"
-requires-python = ">=3.6"
+requires-python = ">=3.7"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",

src/error.rs

@@ -30,7 +30,7 @@ pub enum Error {
     #[error("could not decode number of attributes in encrypted message")]
     DecodingAttributeNumber,
     #[error(
-        "Unable to decrypt the header size. User decryption key has not the right policy to \
+        "Unable to decrypt the header. User decryption key has not the right policy to \
          decrypt this input."
     )]
     InsufficientAccessPolicy,