Skip to content

Commit 44a2e80

Browse files
authored
Merge pull request #319 from digital-asset/python-upgrade-ledger-api-deps
python: Upgrade Ledger API protobufs to a snapshot version to pull in pre-release APIs.
2 parents 12415c8 + 0ff2061 commit 44a2e80

39 files changed

+2740
-96
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.0
1+
7.6.1

_build/daml-connect/daml-connect.conf

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_build/daml-connect/protos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def dump(self, buf: "TextIO") -> None:
258258
buf.write(f"# {line}\n")
259259
buf.write('#\n')
260260
buf.write("# This file is automatically generated. To regenerate, run\n")
261-
buf.write(f"# _build/daml-connect/manage update {self.version}\n")
261+
buf.write(f"# _build/daml-connect/protos.py update {self.version}\n")
262262
buf.write(f"version {self.version}\n")
263263

264264
# for convenience and determinism, sort the remaining lines by file name

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[tool.poetry]
55
name = "dazl"
6-
version = "7.6.0"
6+
version = "7.6.1"
77
description = "high-level Ledger API client for Daml ledgers"
88
license = "Apache-2.0"
99
authors = ["Davin K. Tanabe <davin.tanabe@digitalasset.com>"]

python/_dazl_pb/protoc/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def main(request: CodeGeneratorRequest) -> CodeGeneratorResponse:
2424
return response
2525
"""
2626

27+
from functools import wraps
2728
import os
2829
from pathlib import Path
2930
import site
@@ -70,6 +71,7 @@ def protoc_plugin(
7071
program/script.
7172
"""
7273

74+
@wraps(fn)
7375
def _body() -> "NoReturn":
7476
try:
7577
data = sys.stdin.buffer.read()
@@ -107,8 +109,6 @@ def run_plugin_built_in(
107109

108110
# re-run the built-in code generator, but with the arguments that we were given
109111
invocation = [
110-
"python3",
111-
"-m",
112112
"_dazl_pb.protoc",
113113
f"--descriptor_set_in={input_file}",
114114
f"--{plugin_name}_out={output_dir}",
@@ -117,7 +117,7 @@ def run_plugin_built_in(
117117

118118
exit_code = _main(invocation)
119119
if exit_code:
120-
raise Exception(f"oh no {exit_code}")
120+
raise Exception(f"failed to run {invocation} (exit code {exit_code})")
121121

122122
files = [
123123
CodeGeneratorResponse.File(name=str(p.relative_to(output_dir)), content=p.read_text())

python/dazl/_gen/com/daml/ledger/api/v1/__init__.py

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/dazl/_gen/com/daml/ledger/api/v1/admin/__init__.py

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/dazl/_gen/com/daml/ledger/api/v1/admin/config_management_service_pb2_grpc.py

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)