File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,11 @@ setuptools.setup(
16
16
platforms='Posix; MacOS X; Windows',
17
17
include_package_data=True,
18
18
install_requires=(
19
+ <<<<<<< HEAD
19
20
'google-api-core[grpc] >= 1.21.0, < 2.0.0dev',
21
+ =======
22
+ 'google-api-core[grpc] >= 1.22.0, < 2.0.0dev',
23
+ >>>>>>> 4a11c8b... chore(deps): bump api-core version
20
24
'libcst >= 0.2.5',
21
25
'proto-plus >= 1.1.0',
22
26
{% - if api .requires_package (('google' , 'iam' , 'v1' )) %}
Original file line number Diff line number Diff line change @@ -98,10 +98,6 @@ def showcase_library(
98
98
# Install the library.
99
99
session .install (tmp_dir )
100
100
101
- # REMOVE ME: temporarily install api-core and auth from branches
102
- session .install ("--force-reinstall" , "git+https://github.com/googleapis/python-api-core/@quota-project-override" )
103
- session .install ("--force-reinstall" , "git+https://github.com/googleapis/google-auth-library-python.git@more-quota-project" )
104
-
105
101
yield tmp_dir
106
102
107
103
Original file line number Diff line number Diff line change 1
1
click == 7.1.2
2
- google-api-core == 1.21 .0
2
+ google-api-core == 1.22 .0
3
3
googleapis-common-protos == 1.52.0
4
4
jinja2 == 2.11.2
5
5
MarkupSafe == 1.1.1
You can’t perform that action at this time.
0 commit comments