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(
1616 platforms='Posix; MacOS X; Windows',
1717 include_package_data=True,
1818 install_requires=(
19+ <<<<<<< HEAD
1920 '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
2024 'libcst >= 0.2.5',
2125 'proto-plus >= 1.1.0',
2226 {% - if api .requires_package (('google' , 'iam' , 'v1' )) %}
Original file line number Diff line number Diff line change @@ -98,10 +98,6 @@ def showcase_library(
9898 # Install the library.
9999 session .install (tmp_dir )
100100
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-
105101 yield tmp_dir
106102
107103
Original file line number Diff line number Diff line change 11click == 7.1.2
2- google-api-core == 1.21 .0
2+ google-api-core == 1.22 .0
33googleapis-common-protos == 1.52.0
44jinja2 == 2.11.2
55MarkupSafe == 1.1.1
You can’t perform that action at this time.
0 commit comments