From 731884e5fd766d9bee62ee69c0809fb72a397d64 Mon Sep 17 00:00:00 2001 From: David Cook Date: Fri, 8 Nov 2024 17:12:57 -0600 Subject: [PATCH] Setup for new release branch (#1130) * Bump version number * Update version table * Revise README * Add new release branch to Dependabot --- .github/dependabot.yml | 12 ++++++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 13 ++++++++----- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5d0ffc612..0514d2c23 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,15 @@ updates: directory: "/" schedule: interval: "weekly" + + - package-ecosystem: "cargo" + directory: "/" + schedule: + interval: "weekly" + target-branch: release/0.16 + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + target-branch: release/0.16 diff --git a/Cargo.lock b/Cargo.lock index c220cf35d..f74929d93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -678,7 +678,7 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "prio" -version = "0.16.7" +version = "0.17.0-alpha.0" dependencies = [ "aes", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index 9863eb40d..d244e6796 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "prio" -version = "0.16.7" +version = "0.17.0-alpha.0" authors = ["Josh Aas ", "Tim Geoghegan ", "Christopher Patton "] edition = "2021" exclude = ["/supply-chain"] diff --git a/README.md b/README.md index fbd85cdb4..5b6f84f58 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,14 @@ and Scalable Computation of Aggregate Statistics. ## Exposure Notifications Private Analytics -This crate was used in the [Exposure Notifications Private Analytics][enpa] -system. This is referred to in various places as Prio v2. See +Prior versions of this crate were used in the [Exposure Notifications Private +Analytics][enpa] system. This is referred to in various places as Prio v2. See [`prio-server`][prio-server] or the [ENPA whitepaper][enpa-whitepaper] for more details. ## Verifiable Distributed Aggregation Function -This crate also implements a [Verifiable Distributed Aggregation Function +This crate implements a [Verifiable Distributed Aggregation Function (VDAF)][vdaf] called "Prio3", implemented in the `vdaf` module, allowing Prio to be used in the [Distributed Aggregation Protocol][dap] protocol being developed in the PPM working group at the IETF. This support is still evolving along with @@ -26,7 +26,7 @@ the DAP and VDAF specifications. ### Draft versions and release branches -The `main` branch is under continuous development and will usually be partway between VDAF drafts. +The `main` branch is under continuous development and will sometimes be partway between VDAF drafts. libprio uses stable release branches to maintain implementations of different VDAF draft versions. Crate `prio` version `x.y.z` is released from a corresponding `release/x.y` branch. We try to maintain [Rust SemVer][semver] compatibility, meaning that API breaks only happen on minor version @@ -42,7 +42,8 @@ increases (e.g., 0.10 to 0.11). | 0.13 | `release/0.13` | [`draft-irtf-cfrg-vdaf-06`][vdaf-06] | [`draft-ietf-ppm-dap-05`][dap-05] | Yes | Unmaintained | | 0.14 | `release/0.14` | [`draft-irtf-cfrg-vdaf-06`][vdaf-06] | [`draft-ietf-ppm-dap-05`][dap-05] | Yes | Unmaintained | | 0.15 | `release/0.15` | [`draft-irtf-cfrg-vdaf-07`][vdaf-07] | [`draft-ietf-ppm-dap-07`][dap-07] | Yes | Unmaintained as of June 24, 2024 | -| 0.16 | `main` | [`draft-irtf-cfrg-vdaf-08`][vdaf-08] | [`draft-ietf-ppm-dap-09`][dap-09] | Yes | Supported | +| 0.16 | `release/0.16` | [`draft-irtf-cfrg-vdaf-08`][vdaf-08] | [`draft-ietf-ppm-dap-09`][dap-09] | Yes | Supported | +| 0.17 | `main` | [`draft-irtf-cfrg-vdaf-13`][vdaf-13] | [`draft-ietf-ppm-dap-13`][dap-13] | [No](https://github.com/divviup/libprio-rs/issues/1122) | Supported | [vdaf-01]: https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/01/ [vdaf-03]: https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/03/ @@ -51,6 +52,7 @@ increases (e.g., 0.10 to 0.11). [vdaf-06]: https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/06/ [vdaf-07]: https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/07/ [vdaf-08]: https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/08/ +[vdaf-13]: https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/13/ [dap-01]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/01/ [dap-02]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/02/ [dap-03]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/03/ @@ -58,6 +60,7 @@ increases (e.g., 0.10 to 0.11). [dap-05]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/05/ [dap-07]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/07/ [dap-09]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/09/ +[dap-13]: https://datatracker.ietf.org/doc/draft-ietf-ppm-dap/13/ [enpa]: https://www.abetterinternet.org/post/prio-services-for-covid-en/ [enpa-whitepaper]: https://covid19-static.cdn-apple.com/applications/covid19/current/static/contact-tracing/pdf/ENPA_White_Paper.pdf [prio-server]: https://github.com/divviup/prio-server