From faab81d8ddfc23defc0dffd097aa8510cc473773 Mon Sep 17 00:00:00 2001 From: Timofey Danshin Date: Thu, 13 Apr 2023 17:32:58 +0300 Subject: [PATCH 1/2] Add lockfile 2.0 version support --- rules_poetry/poetry.bzl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rules_poetry/poetry.bzl b/rules_poetry/poetry.bzl index ddb05df..f591f9b 100644 --- a/rules_poetry/poetry.bzl +++ b/rules_poetry/poetry.bzl @@ -115,6 +115,11 @@ def _impl(repository_ctx): } elif "hashes" in metadata: # Poetry 0.x format hashes = ["sha256:" + h for h in metadata["hashes"]] + elif metadata["lock-version"] in ["2.0"]: + hashes = {} + for package in lockfile["package"]: + key = package["name"] + hashes[key] = [pack["hash"] for pack in package["files"]] else: fail("Did not find file hashes in poetry.lock file") From 1adbb3741a55bf95238d3dd442f8dc492a2946bc Mon Sep 17 00:00:00 2001 From: Timofey Danshin Date: Thu, 13 Apr 2023 17:38:49 +0300 Subject: [PATCH 2/2] Fix tabs --- rules_poetry/poetry.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules_poetry/poetry.bzl b/rules_poetry/poetry.bzl index f591f9b..1e3e56e 100644 --- a/rules_poetry/poetry.bzl +++ b/rules_poetry/poetry.bzl @@ -117,9 +117,9 @@ def _impl(repository_ctx): hashes = ["sha256:" + h for h in metadata["hashes"]] elif metadata["lock-version"] in ["2.0"]: hashes = {} - for package in lockfile["package"]: - key = package["name"] - hashes[key] = [pack["hash"] for pack in package["files"]] + for package in lockfile["package"]: + key = package["name"] + hashes[key] = [pack["hash"] for pack in package["files"]] else: fail("Did not find file hashes in poetry.lock file")