Merge remote-tracking branch 'upstream/main' into release-ferveo-py

# Conflicts: # .github/workflows/maturin.yml # Cargo.lock
nucypher · May 4, 2023 · b2cc5a8 · b2cc5a8
2 parents cf43433 + aacdf04
commit b2cc5a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/maturin.yml b/.github/workflows/maturin.yml
@@ -21,7 +21,7 @@ jobs:
           #          aarch64,
           #          armv7,
           #          s390x,
-          #          ppc64le
+        #          ppc64le
         python-version: ${{ env.python-versions }}
     steps:
       - uses: actions/checkout@v3

diff --git a/ferveo/Cargo.toml b/ferveo/Cargo.toml
@@ -48,7 +48,6 @@ test-common = []
 [[example]]
 name = "bench_primitives_size"
 path = "examples/bench_primitives_size.rs"
-
 #[[bench]]
 #name = "pvdkg"
 #path = "benches/benchmarks/pvdkg.rs"