From dfdeb0b07666bb535025cd7dafda931a0c44a98c Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Sat, 28 Jun 2025 10:24:36 +0100 Subject: [PATCH 1/4] Remove tests/testutils/setuptools.py It's monkey patching something that is no longer used by buildstream --- tests/testutils/setuptools.py | 55 ----------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 tests/testutils/setuptools.py diff --git a/tests/testutils/setuptools.py b/tests/testutils/setuptools.py deleted file mode 100644 index d14c70b26..000000000 --- a/tests/testutils/setuptools.py +++ /dev/null @@ -1,55 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -import os -import pytest -import pkg_resources - - -# A mock setuptools dist object. -class MockDist: - def __init__(self, datafiles, module_name): - self.datafiles = datafiles - self.module_name = module_name - - def get_resource_filename(self, *_args, **_kwargs): - return os.path.join(self.datafiles, self.module_name) - - -# A mock setuptools entry object. -class MockEntry: - def __init__(self, datafiles, module_name): - self.dist = MockDist(datafiles, module_name) - self.module_name = module_name - - -# Patch setuptools.get_entry_info -# -# Use result = entry_fixture(datafiles, entry_point, lookup_string) to -# patch setuptools for external plugin loading. -# -@pytest.fixture() -def entry_fixture(monkeypatch): - def patch(datafiles, entry_point, lookup_string): - dist, package = lookup_string.split(":") - - def mock_entry(pdist, pentry_point, ppackage): - assert pdist == dist - assert pentry_point == entry_point - assert ppackage == package - - return MockEntry(datafiles, package) - - monkeypatch.setattr(pkg_resources, "get_entry_info", mock_entry) - - return patch From 99e6e3f03c0380d3b42ba55bd2fd06d61942bfbb Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Tue, 24 Jun 2025 10:48:32 +0100 Subject: [PATCH 2/4] tests: use importlib.metadata instad of pkg_resources --- requirements/dev-requirements.in | 1 - requirements/dev-requirements.txt | 1 - tests/conftest.py | 9 +++++++-- tests/testutils/site.py | 4 ++-- tox.ini | 1 + 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/requirements/dev-requirements.in b/requirements/dev-requirements.in index d25bd6178..aa86c12fc 100644 --- a/requirements/dev-requirements.in +++ b/requirements/dev-requirements.in @@ -7,4 +7,3 @@ pytest-env pytest-xdist pytest-timeout pyftpdlib -setuptools diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 369044e15..1833daf09 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -7,7 +7,6 @@ pytest-env==1.1.5 pytest-xdist==3.6.1 pytest-timeout==2.3.1 pyftpdlib==2.0.1 -setuptools==75.6.0 ## The following requirements were added by pip freeze: astroid==3.3.7 dill==0.3.9 diff --git a/tests/conftest.py b/tests/conftest.py index 79c5a489d..aa8e60838 100755 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,8 +16,8 @@ # Tristan Maat # import os +import sys -import pkg_resources import pytest from buildstream._testing import register_repo_kind, sourcetests_collection_hook @@ -29,6 +29,11 @@ from tests.testutils.repo.tar import Tar +if sys.version_info >= (3, 10): + from importlib.metadata import entry_points +else: + from importlib_metadata import entry_points + # # This file is loaded by pytest, we use it to add a custom @@ -132,7 +137,7 @@ def remote_services(request): def pytest_sessionstart(session): if session.config.getvalue("plugins"): # Enable all plugins that implement the 'buildstream.tests.source_plugins' hook - for entrypoint in pkg_resources.iter_entry_points("buildstream.tests.source_plugins"): + for entrypoint in entry_points(group="buildstream.tests.source_plugins"): module = entrypoint.load() module.register_sources() diff --git a/tests/testutils/site.py b/tests/testutils/site.py index 57857ee61..c9b96802f 100644 --- a/tests/testutils/site.py +++ b/tests/testutils/site.py @@ -20,10 +20,10 @@ # to test that BuildStream works when integrated in your system. # def pip_sample_packages(): - import pkg_resources + import importlib.metadata required = {"sample-plugins"} - installed = {pkg.key for pkg in pkg_resources.working_set} # pylint: disable=not-an-iterable + installed = {dist.name for dist in importlib.metadata.distributions()} missing = required - installed if missing: diff --git a/tox.ini b/tox.ini index 2967e9bc8..617a1a5f9 100644 --- a/tox.ini +++ b/tox.ini @@ -167,6 +167,7 @@ commands = deps = -rrequirements/requirements.txt -rrequirements/dev-requirements.txt + setuptools Cython # From 8784b5c570e5d651137cd16d0ce8ea828942d3e3 Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Thu, 12 Jun 2025 10:18:41 +0100 Subject: [PATCH 3/4] _protos: regenerate with grpcio-tools 1.73 This makes it compatible with protobuf 30+, a.k.a. 6, a.k.a. 6.30+ --- requirements/requirements.in | 2 +- .../bazel/remote/asset/v1/remote_asset_pb2.py | 8 ++++---- .../bazel/remote/asset/v1/remote_asset_pb2.pyi | 15 ++++++++------- .../remote/asset/v1/remote_asset_pb2_grpc.py | 2 +- .../remote/execution/v2/remote_execution_pb2.py | 8 ++++---- .../remote/execution/v2/remote_execution_pb2.pyi | 9 +++++---- .../execution/v2/remote_execution_pb2_grpc.py | 2 +- .../_protos/build/bazel/semver/semver_pb2.py | 8 ++++---- .../_protos/build/bazel/semver/semver_pb2_grpc.py | 2 +- .../_protos/build/buildgrid/local_cas_pb2.py | 8 ++++---- .../_protos/build/buildgrid/local_cas_pb2.pyi | 5 +++-- .../_protos/build/buildgrid/local_cas_pb2_grpc.py | 2 +- .../_protos/buildstream/v2/artifact_pb2.py | 8 ++++---- .../_protos/buildstream/v2/artifact_pb2.pyi | 3 ++- .../_protos/buildstream/v2/artifact_pb2_grpc.py | 2 +- .../_protos/buildstream/v2/source_pb2.py | 8 ++++---- .../_protos/buildstream/v2/source_pb2.pyi | 3 ++- .../_protos/buildstream/v2/source_pb2_grpc.py | 2 +- .../_protos/google/api/annotations_pb2.py | 8 ++++---- .../_protos/google/api/annotations_pb2_grpc.py | 2 +- src/buildstream/_protos/google/api/http_pb2.py | 8 ++++---- src/buildstream/_protos/google/api/http_pb2.pyi | 3 ++- .../_protos/google/api/http_pb2_grpc.py | 2 +- .../_protos/google/bytestream/bytestream_pb2.py | 8 ++++---- .../google/bytestream/bytestream_pb2_grpc.py | 2 +- .../_protos/google/longrunning/operations_pb2.py | 8 ++++---- .../_protos/google/longrunning/operations_pb2.pyi | 3 ++- .../google/longrunning/operations_pb2_grpc.py | 2 +- src/buildstream/_protos/google/rpc/code_pb2.py | 8 ++++---- .../_protos/google/rpc/code_pb2_grpc.py | 2 +- src/buildstream/_protos/google/rpc/status_pb2.py | 8 ++++---- src/buildstream/_protos/google/rpc/status_pb2.pyi | 3 ++- .../_protos/google/rpc/status_pb2_grpc.py | 2 +- 33 files changed, 87 insertions(+), 79 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 0143405be..bb4f1d56d 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -4,7 +4,7 @@ Jinja2 >= 2.10 importlib_metadata >= 3.6; python_version < "3.10" packaging pluginbase -protobuf <6.0dev,>=5.26.1 +protobuf<7.0.0,>=6.30.0 psutil ruamel.yaml >= 0.16.7 ruamel.yaml.clib >= 0.1.2 diff --git a/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.py b/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.py index ce8f6c62e..025307606 100644 --- a/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.py +++ b/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: build/bazel/remote/asset/v1/remote_asset.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'build/bazel/remote/asset/v1/remote_asset.proto' ) diff --git a/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.pyi b/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.pyi index 660fa2de4..1440deaad 100644 --- a/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.pyi +++ b/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2.pyi @@ -6,7 +6,8 @@ from google.rpc import status_pb2 as _status_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor @@ -32,7 +33,7 @@ class FetchBlobRequest(_message.Message): uris: _containers.RepeatedScalarFieldContainer[str] qualifiers: _containers.RepeatedCompositeFieldContainer[Qualifier] digest_function: _remote_execution_pb2.DigestFunction.Value - def __init__(self, instance_name: _Optional[str] = ..., timeout: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., oldest_content_accepted: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... + def __init__(self, instance_name: _Optional[str] = ..., timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., oldest_content_accepted: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... class FetchBlobResponse(_message.Message): __slots__ = ("status", "uri", "qualifiers", "expires_at", "blob_digest", "digest_function") @@ -48,7 +49,7 @@ class FetchBlobResponse(_message.Message): expires_at: _timestamp_pb2.Timestamp blob_digest: _remote_execution_pb2.Digest digest_function: _remote_execution_pb2.DigestFunction.Value - def __init__(self, status: _Optional[_Union[_status_pb2.Status, _Mapping]] = ..., uri: _Optional[str] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expires_at: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., blob_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... + def __init__(self, status: _Optional[_Union[_status_pb2.Status, _Mapping]] = ..., uri: _Optional[str] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expires_at: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., blob_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... class FetchDirectoryRequest(_message.Message): __slots__ = ("instance_name", "timeout", "oldest_content_accepted", "uris", "qualifiers", "digest_function") @@ -64,7 +65,7 @@ class FetchDirectoryRequest(_message.Message): uris: _containers.RepeatedScalarFieldContainer[str] qualifiers: _containers.RepeatedCompositeFieldContainer[Qualifier] digest_function: _remote_execution_pb2.DigestFunction.Value - def __init__(self, instance_name: _Optional[str] = ..., timeout: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., oldest_content_accepted: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... + def __init__(self, instance_name: _Optional[str] = ..., timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., oldest_content_accepted: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... class FetchDirectoryResponse(_message.Message): __slots__ = ("status", "uri", "qualifiers", "expires_at", "root_directory_digest", "digest_function") @@ -80,7 +81,7 @@ class FetchDirectoryResponse(_message.Message): expires_at: _timestamp_pb2.Timestamp root_directory_digest: _remote_execution_pb2.Digest digest_function: _remote_execution_pb2.DigestFunction.Value - def __init__(self, status: _Optional[_Union[_status_pb2.Status, _Mapping]] = ..., uri: _Optional[str] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expires_at: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., root_directory_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... + def __init__(self, status: _Optional[_Union[_status_pb2.Status, _Mapping]] = ..., uri: _Optional[str] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expires_at: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., root_directory_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... class PushBlobRequest(_message.Message): __slots__ = ("instance_name", "uris", "qualifiers", "expire_at", "blob_digest", "references_blobs", "references_directories", "digest_function") @@ -100,7 +101,7 @@ class PushBlobRequest(_message.Message): references_blobs: _containers.RepeatedCompositeFieldContainer[_remote_execution_pb2.Digest] references_directories: _containers.RepeatedCompositeFieldContainer[_remote_execution_pb2.Digest] digest_function: _remote_execution_pb2.DigestFunction.Value - def __init__(self, instance_name: _Optional[str] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expire_at: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., blob_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., references_blobs: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., references_directories: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... + def __init__(self, instance_name: _Optional[str] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expire_at: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., blob_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., references_blobs: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., references_directories: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... class PushBlobResponse(_message.Message): __slots__ = () @@ -124,7 +125,7 @@ class PushDirectoryRequest(_message.Message): references_blobs: _containers.RepeatedCompositeFieldContainer[_remote_execution_pb2.Digest] references_directories: _containers.RepeatedCompositeFieldContainer[_remote_execution_pb2.Digest] digest_function: _remote_execution_pb2.DigestFunction.Value - def __init__(self, instance_name: _Optional[str] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expire_at: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., root_directory_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., references_blobs: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., references_directories: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... + def __init__(self, instance_name: _Optional[str] = ..., uris: _Optional[_Iterable[str]] = ..., qualifiers: _Optional[_Iterable[_Union[Qualifier, _Mapping]]] = ..., expire_at: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., root_directory_digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ..., references_blobs: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., references_directories: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., digest_function: _Optional[_Union[_remote_execution_pb2.DigestFunction.Value, str]] = ...) -> None: ... class PushDirectoryResponse(_message.Message): __slots__ = () diff --git a/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2_grpc.py b/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2_grpc.py index ad2feca8e..71b53ad5b 100644 --- a/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2_grpc.py +++ b/src/buildstream/_protos/build/bazel/remote/asset/v1/remote_asset_pb2_grpc.py @@ -5,7 +5,7 @@ from buildstream._protos.build.bazel.remote.asset.v1 import remote_asset_pb2 as build_dot_bazel_dot_remote_dot_asset_dot_v1_dot_remote__asset__pb2 -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py index 147dd4c31..d083938ca 100644 --- a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py +++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: build/bazel/remote/execution/v2/remote_execution.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'build/bazel/remote/execution/v2/remote_execution.proto' ) diff --git a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.pyi b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.pyi index 14badbac9..91f7cab0b 100644 --- a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.pyi +++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.pyi @@ -10,7 +10,8 @@ from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor @@ -28,7 +29,7 @@ class Action(_message.Message): do_not_cache: bool salt: bytes platform: Platform - def __init__(self, command_digest: _Optional[_Union[Digest, _Mapping]] = ..., input_root_digest: _Optional[_Union[Digest, _Mapping]] = ..., timeout: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., do_not_cache: bool = ..., salt: _Optional[bytes] = ..., platform: _Optional[_Union[Platform, _Mapping]] = ...) -> None: ... + def __init__(self, command_digest: _Optional[_Union[Digest, _Mapping]] = ..., input_root_digest: _Optional[_Union[Digest, _Mapping]] = ..., timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., do_not_cache: bool = ..., salt: _Optional[bytes] = ..., platform: _Optional[_Union[Platform, _Mapping]] = ...) -> None: ... class Command(_message.Message): __slots__ = ("arguments", "environment_variables", "output_files", "output_directories", "output_paths", "platform", "working_directory", "output_node_properties", "output_directory_format") @@ -108,7 +109,7 @@ class NodeProperties(_message.Message): properties: _containers.RepeatedCompositeFieldContainer[NodeProperty] mtime: _timestamp_pb2.Timestamp unix_mode: _wrappers_pb2.UInt32Value - def __init__(self, properties: _Optional[_Iterable[_Union[NodeProperty, _Mapping]]] = ..., mtime: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., unix_mode: _Optional[_Union[_wrappers_pb2.UInt32Value, _Mapping]] = ...) -> None: ... + def __init__(self, properties: _Optional[_Iterable[_Union[NodeProperty, _Mapping]]] = ..., mtime: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., unix_mode: _Optional[_Union[_wrappers_pb2.UInt32Value, _Mapping]] = ...) -> None: ... class FileNode(_message.Message): __slots__ = ("name", "digest", "is_executable", "node_properties") @@ -174,7 +175,7 @@ class ExecutedActionMetadata(_message.Message): output_upload_start_timestamp: _timestamp_pb2.Timestamp output_upload_completed_timestamp: _timestamp_pb2.Timestamp auxiliary_metadata: _containers.RepeatedCompositeFieldContainer[_any_pb2.Any] - def __init__(self, worker: _Optional[str] = ..., queued_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., worker_start_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., worker_completed_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., input_fetch_start_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., input_fetch_completed_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., execution_start_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., execution_completed_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., virtual_execution_duration: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., output_upload_start_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., output_upload_completed_timestamp: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., auxiliary_metadata: _Optional[_Iterable[_Union[_any_pb2.Any, _Mapping]]] = ...) -> None: ... + def __init__(self, worker: _Optional[str] = ..., queued_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., worker_start_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., worker_completed_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., input_fetch_start_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., input_fetch_completed_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., execution_start_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., execution_completed_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., virtual_execution_duration: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., output_upload_start_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., output_upload_completed_timestamp: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., auxiliary_metadata: _Optional[_Iterable[_Union[_any_pb2.Any, _Mapping]]] = ...) -> None: ... class ActionResult(_message.Message): __slots__ = ("output_files", "output_file_symlinks", "output_symlinks", "output_directories", "output_directory_symlinks", "exit_code", "stdout_raw", "stdout_digest", "stderr_raw", "stderr_digest", "execution_metadata") diff --git a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py index 2f8680032..27e22280b 100644 --- a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py +++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py @@ -6,7 +6,7 @@ from buildstream._protos.build.bazel.remote.execution.v2 import remote_execution_pb2 as build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2 from buildstream._protos.google.longrunning import operations_pb2 as google_dot_longrunning_dot_operations__pb2 -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/build/bazel/semver/semver_pb2.py b/src/buildstream/_protos/build/bazel/semver/semver_pb2.py index 325c2ea33..976e4f606 100644 --- a/src/buildstream/_protos/build/bazel/semver/semver_pb2.py +++ b/src/buildstream/_protos/build/bazel/semver/semver_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: build/bazel/semver/semver.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'build/bazel/semver/semver.proto' ) diff --git a/src/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py b/src/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py index 544c9fc9f..ec35ba50e 100644 --- a/src/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py +++ b/src/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py b/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py index 13da13f42..1575b8e19 100644 --- a/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py +++ b/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: build/buildgrid/local_cas.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'build/buildgrid/local_cas.proto' ) diff --git a/src/buildstream/_protos/build/buildgrid/local_cas_pb2.pyi b/src/buildstream/_protos/build/buildgrid/local_cas_pb2.pyi index 0dcaf3fb3..e192ab270 100644 --- a/src/buildstream/_protos/build/buildgrid/local_cas_pb2.pyi +++ b/src/buildstream/_protos/build/buildgrid/local_cas_pb2.pyi @@ -4,7 +4,8 @@ from google.protobuf import duration_pb2 as _duration_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor @@ -219,7 +220,7 @@ class Remote(_message.Message): retry_limit: int retry_delay: _duration_pb2.Duration request_timeout: _duration_pb2.Duration - def __init__(self, url: _Optional[str] = ..., instance_name: _Optional[str] = ..., server_cert: _Optional[bytes] = ..., client_key: _Optional[bytes] = ..., client_cert: _Optional[bytes] = ..., access_token_path: _Optional[str] = ..., access_token_reload_interval: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., keepalive_time: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., retry_limit: _Optional[int] = ..., retry_delay: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ..., request_timeout: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ...) -> None: ... + def __init__(self, url: _Optional[str] = ..., instance_name: _Optional[str] = ..., server_cert: _Optional[bytes] = ..., client_key: _Optional[bytes] = ..., client_cert: _Optional[bytes] = ..., access_token_path: _Optional[str] = ..., access_token_reload_interval: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., keepalive_time: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., retry_limit: _Optional[int] = ..., retry_delay: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., request_timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ...) -> None: ... class GetInstanceNameForRemotesRequest(_message.Message): __slots__ = ("instance_name", "content_addressable_storage", "remote_asset", "action_cache", "execution") diff --git a/src/buildstream/_protos/build/buildgrid/local_cas_pb2_grpc.py b/src/buildstream/_protos/build/buildgrid/local_cas_pb2_grpc.py index f890b7c02..7fcd26979 100644 --- a/src/buildstream/_protos/build/buildgrid/local_cas_pb2_grpc.py +++ b/src/buildstream/_protos/build/buildgrid/local_cas_pb2_grpc.py @@ -5,7 +5,7 @@ from buildstream._protos.build.buildgrid import local_cas_pb2 as build_dot_buildgrid_dot_local__cas__pb2 -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py index cce08c186..5da3633cc 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py +++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: buildstream/v2/artifact.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'buildstream/v2/artifact.proto' ) diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi b/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi index 3f80ffa4b..bd7c364ca 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi +++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi @@ -3,7 +3,8 @@ from google.api import annotations_pb2 as _annotations_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py index 546aaff8e..7b0e064bf 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py +++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2.py b/src/buildstream/_protos/buildstream/v2/source_pb2.py index 25a1dcc34..7746988e6 100644 --- a/src/buildstream/_protos/buildstream/v2/source_pb2.py +++ b/src/buildstream/_protos/buildstream/v2/source_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: buildstream/v2/source.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'buildstream/v2/source.proto' ) diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2.pyi b/src/buildstream/_protos/buildstream/v2/source_pb2.pyi index 05bb448d1..7434b3d1d 100644 --- a/src/buildstream/_protos/buildstream/v2/source_pb2.pyi +++ b/src/buildstream/_protos/buildstream/v2/source_pb2.pyi @@ -2,7 +2,8 @@ from build.bazel.remote.execution.v2 import remote_execution_pb2 as _remote_exec from google.api import annotations_pb2 as _annotations_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py index 1a5d0b008..92315b89b 100644 --- a/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py +++ b/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/google/api/annotations_pb2.py b/src/buildstream/_protos/google/api/annotations_pb2.py index 84e221d89..d9c7af6c4 100644 --- a/src/buildstream/_protos/google/api/annotations_pb2.py +++ b/src/buildstream/_protos/google/api/annotations_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: google/api/annotations.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'google/api/annotations.proto' ) diff --git a/src/buildstream/_protos/google/api/annotations_pb2_grpc.py b/src/buildstream/_protos/google/api/annotations_pb2_grpc.py index 20414b108..4124ed3e6 100644 --- a/src/buildstream/_protos/google/api/annotations_pb2_grpc.py +++ b/src/buildstream/_protos/google/api/annotations_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/google/api/http_pb2.py b/src/buildstream/_protos/google/api/http_pb2.py index 4c8494956..92a80ea07 100644 --- a/src/buildstream/_protos/google/api/http_pb2.py +++ b/src/buildstream/_protos/google/api/http_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: google/api/http.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'google/api/http.proto' ) diff --git a/src/buildstream/_protos/google/api/http_pb2.pyi b/src/buildstream/_protos/google/api/http_pb2.pyi index 9a28694a4..fe6068b9c 100644 --- a/src/buildstream/_protos/google/api/http_pb2.pyi +++ b/src/buildstream/_protos/google/api/http_pb2.pyi @@ -1,7 +1,8 @@ from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor diff --git a/src/buildstream/_protos/google/api/http_pb2_grpc.py b/src/buildstream/_protos/google/api/http_pb2_grpc.py index 9c8eb1768..50a0619bd 100644 --- a/src/buildstream/_protos/google/api/http_pb2_grpc.py +++ b/src/buildstream/_protos/google/api/http_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/google/bytestream/bytestream_pb2.py b/src/buildstream/_protos/google/bytestream/bytestream_pb2.py index ab047f310..0ca25499e 100644 --- a/src/buildstream/_protos/google/bytestream/bytestream_pb2.py +++ b/src/buildstream/_protos/google/bytestream/bytestream_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: google/bytestream/bytestream.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'google/bytestream/bytestream.proto' ) diff --git a/src/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py b/src/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py index 164d68fef..a850e1387 100644 --- a/src/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py +++ b/src/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py @@ -5,7 +5,7 @@ from buildstream._protos.google.bytestream import bytestream_pb2 as google_dot_bytestream_dot_bytestream__pb2 -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/google/longrunning/operations_pb2.py b/src/buildstream/_protos/google/longrunning/operations_pb2.py index e1e27af54..741077d97 100644 --- a/src/buildstream/_protos/google/longrunning/operations_pb2.py +++ b/src/buildstream/_protos/google/longrunning/operations_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: google/longrunning/operations.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'google/longrunning/operations.proto' ) diff --git a/src/buildstream/_protos/google/longrunning/operations_pb2.pyi b/src/buildstream/_protos/google/longrunning/operations_pb2.pyi index 8e94303cb..2e005a3b7 100644 --- a/src/buildstream/_protos/google/longrunning/operations_pb2.pyi +++ b/src/buildstream/_protos/google/longrunning/operations_pb2.pyi @@ -5,7 +5,8 @@ from google.rpc import status_pb2 as _status_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor diff --git a/src/buildstream/_protos/google/longrunning/operations_pb2_grpc.py b/src/buildstream/_protos/google/longrunning/operations_pb2_grpc.py index fa1bfe4c9..550725d96 100644 --- a/src/buildstream/_protos/google/longrunning/operations_pb2_grpc.py +++ b/src/buildstream/_protos/google/longrunning/operations_pb2_grpc.py @@ -6,7 +6,7 @@ from buildstream._protos.google.longrunning import operations_pb2 as google_dot_longrunning_dot_operations__pb2 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/google/rpc/code_pb2.py b/src/buildstream/_protos/google/rpc/code_pb2.py index bb6a169b3..df8d6d5f5 100644 --- a/src/buildstream/_protos/google/rpc/code_pb2.py +++ b/src/buildstream/_protos/google/rpc/code_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: google/rpc/code.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'google/rpc/code.proto' ) diff --git a/src/buildstream/_protos/google/rpc/code_pb2_grpc.py b/src/buildstream/_protos/google/rpc/code_pb2_grpc.py index 1a1ef383c..76867435e 100644 --- a/src/buildstream/_protos/google/rpc/code_pb2_grpc.py +++ b/src/buildstream/_protos/google/rpc/code_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/buildstream/_protos/google/rpc/status_pb2.py b/src/buildstream/_protos/google/rpc/status_pb2.py index d89b20312..f1302c77a 100644 --- a/src/buildstream/_protos/google/rpc/status_pb2.py +++ b/src/buildstream/_protos/google/rpc/status_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: google/rpc/status.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 6.31.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -11,9 +11,9 @@ from google.protobuf.internal import builder as _builder _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, - 5, - 28, - 1, + 6, + 31, + 0, '', 'google/rpc/status.proto' ) diff --git a/src/buildstream/_protos/google/rpc/status_pb2.pyi b/src/buildstream/_protos/google/rpc/status_pb2.pyi index 065622382..f40c561a9 100644 --- a/src/buildstream/_protos/google/rpc/status_pb2.pyi +++ b/src/buildstream/_protos/google/rpc/status_pb2.pyi @@ -2,7 +2,8 @@ from google.protobuf import any_pb2 as _any_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union +from collections.abc import Iterable as _Iterable, Mapping as _Mapping +from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor diff --git a/src/buildstream/_protos/google/rpc/status_pb2_grpc.py b/src/buildstream/_protos/google/rpc/status_pb2_grpc.py index da039705c..11b8a10a0 100644 --- a/src/buildstream/_protos/google/rpc/status_pb2_grpc.py +++ b/src/buildstream/_protos/google/rpc/status_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.68.0' +GRPC_GENERATED_VERSION = '1.73.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False From 5d93960b99e098cfff8f853adb64899826625e08 Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Sat, 14 Jun 2025 09:11:18 +0100 Subject: [PATCH 4/4] Update requirements --- requirements/cov-requirements.txt | 18 +++++++++++------- requirements/dev-requirements.txt | 30 ++++++++++++++++-------------- requirements/requirements.txt | 18 ++++++++++-------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt index ca84e6c85..233c86940 100644 --- a/requirements/cov-requirements.txt +++ b/requirements/cov-requirements.txt @@ -1,8 +1,12 @@ -coverage==7.6.7 -pytest-cov==6.0.0 -pytest==8.3.3 -Cython==3.0.11 +coverage==7.9.1 +pytest-cov==6.2.1 +pytest==8.4.0 +Cython==3.1.2 ## The following requirements were added by pip freeze: -iniconfig==2.0.0 -packaging==24.2 -pluggy==1.5.0 +exceptiongroup==1.3.0 +iniconfig==2.1.0 +packaging==25.0 +pluggy==1.6.0 +Pygments==2.19.1 +tomli==2.2.1 +typing_extensions==4.14.0 diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 1833daf09..2a30c47ed 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,23 +1,25 @@ pexpect==4.9.0 -pylint==3.3.1 +pylint==3.3.7 # Pytest 6.0.0 doesn't play well with pylint -pytest==8.3.3 +pytest==8.4.0 pytest-datafiles==3.0.0 pytest-env==1.1.5 -pytest-xdist==3.6.1 -pytest-timeout==2.3.1 +pytest-xdist==3.7.0 +pytest-timeout==2.4.0 pyftpdlib==2.0.1 ## The following requirements were added by pip freeze: -astroid==3.3.7 -dill==0.3.9 +astroid==3.3.10 +dill==0.4.0 +exceptiongroup==1.3.0 execnet==2.1.1 -iniconfig==2.0.0 -isort==5.13.2 +iniconfig==2.1.0 +isort==6.0.1 mccabe==0.7.0 -packaging==24.2 -platformdirs==4.3.6 -pluggy==1.5.0 +packaging==25.0 +platformdirs==4.3.8 +pluggy==1.6.0 ptyprocess==0.7.0 -pyasynchat==1.0.4 -pyasyncore==1.0.4 -tomlkit==0.13.2 +Pygments==2.19.1 +tomli==2.2.1 +tomlkit==0.13.3 +typing_extensions==4.14.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 910b71755..376130a9d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,13 +1,15 @@ -click==8.1.7 -grpcio==1.68.0 -Jinja2==3.1.4 -packaging==24.2 +click==8.1.8 +grpcio==1.73.0 +Jinja2==3.1.6 +importlib_metadata==8.7.0 +packaging==25.0 pluginbase==1.0.1 -protobuf==5.28.3 -psutil==6.1.0 -ruamel.yaml==0.18.6 +protobuf==6.31.1 +psutil==7.0.0 +ruamel.yaml==0.18.14 ruamel.yaml.clib==0.2.12 -pyroaring==1.0.0 +pyroaring==1.0.1 ujson==5.10.0 ## The following requirements were added by pip freeze: MarkupSafe==3.0.2 +zipp==3.23.0