From 67d38d814c2177b0fd3a51485b0fe727076c0b15 Mon Sep 17 00:00:00 2001 From: alvyjudy <53921639+alvyjudy@users.noreply.github.com> Date: Wed, 10 Jun 2020 22:23:31 -0400 Subject: [PATCH 1/3] docs: update docstring of to_json() method (#511) from #494, this PR updated the docstring of ``to_json`` method in the credential so that it points user to ``from_authorized_user_info`` instead of the non-existent ``from_json`` --- google/oauth2/credentials.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/google/oauth2/credentials.py b/google/oauth2/credentials.py index d39848b41..757219671 100644 --- a/google/oauth2/credentials.py +++ b/google/oauth2/credentials.py @@ -300,8 +300,9 @@ def to_json(self, strip=None): generated JSON. Returns: - str: A JSON representation of this instance, suitable to pass to - from_json(). + str: A JSON representation of this instance. When converted into + a dictionary, it can be passed to from_authorized_user_info() + to create a new credential instance. """ prep = { "token": self.token, From 9434868a6789464549af1d4562f62d8a899b6809 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Thu, 11 Jun 2020 16:05:28 -0700 Subject: [PATCH 2/3] fix: narrow acceptable RSA versions to maintain Python 2 compatability (#528) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Narrow acceptable RSA versions to maintain Python 2 compat * Update setup.py Co-authored-by: Kamil Breguła * Use a more specific pin to support new versions that may support python 2. * Update setup.py Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> * how many commits to get the format correct? Co-authored-by: Kamil Breguła Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f518ec10d..0762da867 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,9 @@ DEPENDENCIES = ( "cachetools>=2.0.0,<5.0", "pyasn1-modules>=0.2.1", - "rsa>=3.1.4,<5.0", + # rsa 4.1, 4.1.1, 4.2 are broken on Py2: https://github.com/sybrenstuvel/python-rsa/issues/152 + 'rsa>=3.1.4,!=4.1,!=4.1.1,!=4.2,<5; python_version < "3"', + 'rsa>=3.1.4,<5; python_version >= "3"', "setuptools>=40.3.0", "six>=1.9.0", ) From 85c2bac0feca0c41d78c72be47f79491be836129 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 23:22:10 +0000 Subject: [PATCH 3/3] chore: release 1.17.1 (#529) :robot: I have created a release \*beep\* \*boop\* --- ### [1.17.1](https://www.github.com/googleapis/google-auth-library-python/compare/v1.17.0...v1.17.1) (2020-06-11) ### Bug Fixes * narrow acceptable RSA versions to maintain Python 2 compatability ([#528](https://www.github.com/googleapis/google-auth-library-python/issues/528)) ([9434868](https://www.github.com/googleapis/google-auth-library-python/commit/9434868a6789464549af1d4562f62d8a899b6809)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a84ed94b4..34018f4a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-auth/#history +### [1.17.1](https://www.github.com/googleapis/google-auth-library-python/compare/v1.17.0...v1.17.1) (2020-06-11) + + +### Bug Fixes + +* narrow acceptable RSA versions to maintain Python 2 compatability ([#528](https://www.github.com/googleapis/google-auth-library-python/issues/528)) ([9434868](https://www.github.com/googleapis/google-auth-library-python/commit/9434868a6789464549af1d4562f62d8a899b6809)) + ## [1.17.0](https://www.github.com/googleapis/google-auth-library-python/compare/v1.16.1...v1.17.0) (2020-06-10) diff --git a/setup.py b/setup.py index 0762da867..a278ac273 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ with io.open("README.rst", "r") as fh: long_description = fh.read() -version = "1.17.0" +version = "1.17.1" setup( name="google-auth",