Skip to content

Commit 0550363

Browse files
authored
Merge branch 'master' into fix-mediafileupload-invalid-file-exception
2 parents 5b2c8f2 + e4e4b40 commit 0550363

File tree

7 files changed

+16
-2
lines changed

7 files changed

+16
-2
lines changed

googleapiclient/discovery_cache/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def autodetect():
4444
from . import file_cache
4545

4646
return file_cache.cache
47-
except Exception as e:
48-
LOGGER.warning(e, exc_info=True)
47+
except Exception:
48+
LOGGER.info("file_cache is only supported with oauth2client<4.0.0",
49+
exc_info=False)
4950
return None

testing/constraints-3.10.txt

Whitespace-only changes.

testing/constraints-3.11.txt

Whitespace-only changes.

testing/constraints-3.6.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This constraints file is used to check that lower bounds
2+
# are correct in setup.py
3+
# List *all* library dependencies and extras in this file.
4+
# Pin the version to the lower bound.
5+
#
6+
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7+
# Then this file should have foo==1.14.0
8+
httplib2==0.15.0
9+
google-auth==1.16.0
10+
google-auth-httplib2==0.0.3
11+
google-api-core==1.21.0
12+
six==1.13.0
13+
uritemplate==3.0.0

testing/constraints-3.7.txt

Whitespace-only changes.

testing/constraints-3.8.txt

Whitespace-only changes.

testing/constraints-3.9.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)