Skip to content

Commit f19298c

Browse files
authored
Merge branch 'master' into cuda_support
2 parents 4f6290a + b0dd745 commit f19298c

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

configure.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ write_to_bazelrc "build:cuda --define=using_cuda=true --define=using_cuda_nvcc=t
9999
write_to_bazelrc "build:cuda --@local_config_cuda//:enable_cuda"
100100
write_to_bazelrc "build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain"
101101

102-
103102
write_to_bazelrc "build --experimental_repo_remote_exec"
104103
write_to_bazelrc "build --spawn_strategy=standalone"
105104
write_to_bazelrc "build --strategy=Genrule=standalone"

release/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def finalize_options(self):
5353
REQUIRED_PACKAGES = [
5454
'cirq-core==0.13.1', 'cirq-google>=0.13.1', 'sympy == 1.8',
5555
'googleapis-common-protos==1.52.0', 'google-api-core==1.21.0',
56-
'google-auth==1.18.0', 'protobuf==3.19.4'
56+
'google-auth==1.18.0', 'protobuf==3.19.5'
5757
]
5858

5959
# placed as extra to not have required overwrite existing nightly installs if

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ google-api-core==1.21.0
1212
google-auth==1.18.0
1313
google-api-python-client==1.8.0
1414
grpcio==1.34.1
15-
protobuf==3.19.4
15+
protobuf==3.19.5

0 commit comments

Comments
 (0)