Skip to content

Commit c047f1c

Browse files
committed
chore: merge branch 'release/v2.0.0'
2 parents 648c06e + 24985dd commit c047f1c

16 files changed

Lines changed: 747 additions & 187 deletions

.github/workflows/ci.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,37 @@ jobs:
2929
retention-days: 1
3030

3131
test:
32+
services:
33+
kms:
34+
image: cosmian/kms:4.2.0
35+
env:
36+
COSMIAN_SERVER_URL: http://localhost:9998
37+
KMS_PUBLIC_PATH: /tmp
38+
KMS_PRIVATE_PATH: /tmp
39+
KMS_SHARED_PATH: /tmp
40+
ports:
41+
- 9998:9998
3242
runs-on: ubuntu-latest
3343
needs: build
3444
steps:
3545
- uses: actions/checkout@v3
3646
- uses: actions/setup-python@v3
3747
with:
38-
python-version: 3.7
48+
python-version: 3.8
3949
- name: Download artifact
4050
uses: actions/download-artifact@v3
4151
with:
4252
name: cloudproof_py_dist
4353
- name: Install dependencies
4454
run: |
4555
python -m pip install --upgrade pip
46-
pip install -r requirements.txt
4756
pip install mypy types-termcolor>=1.1 types_redis>=4.3
57+
scripts/ci_install_pyo3_builds.sh
4858
pip install cloudproof_py*.whl
49-
pip install ci_deps/*.whl
5059
- name: Type-check
5160
run: |
52-
mypy src/ tests/
61+
mypy src/cloudproof_py/findex/ src/cloudproof_py/cover_crypt/
62+
mypy tests/
5363
mypy examples/cli_demo
5464
mypy examples/findex_upsert_search
5565
mypy examples/cover_crypt

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
__pycache__/
55
.pytest_cache/
66
*.py[cod]
7+
*.docpy
78

89
# C extensions
910
*.so

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [2.0.0] - 2023-02-03
6+
7+
### Features
8+
9+
- Add KMS support
10+
- Add CoverCrypt (post-quantum resistant) support
11+
12+
### Changed
13+
14+
- `Findex.search` core function only returns `Location`s
15+
516
---
617

718
## [1.0.1] - 2023-01-13

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ This library depends on [CoverCrypt](https://github.com/Cosmian/cover_crypt) and
6969

7070
This table shows the minimum version correspondence between the various components.
7171

72-
| `cloudproof_py` | CoverCrypt | Findex |
73-
| --------------- | ---------- | ------ |
74-
| >=1.0.0 | 8.0.1 | 1.0.1 |
72+
| `cloudproof_py` | CoverCrypt | Findex | KMS |
73+
| --------------- | ---------- | ------ | ----- |
74+
| >=2.0.0 | 10.0.0 | 2.0.1 | 4.2.0 |
75+
| >=1.0.0 | 8.0.1 | 2.0.0 | - |
Binary file not shown.

examples/cli_demo/main.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,16 @@
4545
policy.add_axis(
4646
cover_crypt.PolicyAxis(
4747
"Country",
48-
["France", "Spain", "Germany"],
48+
[("France", False), ("Spain", False), ("Germany", False)],
4949
hierarchical=False,
5050
)
5151
)
5252
policy.add_axis(
53-
cover_crypt.PolicyAxis("Department", ["MKG", "HR", "SEC"], hierarchical=True)
53+
cover_crypt.PolicyAxis(
54+
"Department",
55+
[("MKG", False), ("HR", False), ("SEC", False)],
56+
hierarchical=True,
57+
)
5458
)
5559
cc_interface = cover_crypt.CoverCrypt()
5660
cc_master_key, cc_public_key = cc_interface.generate_master_keys(policy)

0 commit comments

Comments
 (0)