From aec4ae41153a5149646340693978a3bcebb79668 Mon Sep 17 00:00:00 2001 From: Joe LaPenna Date: Fri, 7 Jun 2019 18:55:33 -0700 Subject: [PATCH 1/3] Update arrow and requests-oauthlib version deps --- requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 72874d7..964bf89 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ -arrow>=0.12,<0.13 +arrow>=0.12,<0.15 cherrypy>=17.3,<17.4 requests>=2.20.0 requests-oauth>=0.4.1,<0.5 -requests-oauthlib>=1.0,<1.1 +requests-oauthlib>=1.2,<1.3 From d929914cb92f685c9c8ac4a810b2e3afe127068b Mon Sep 17 00:00:00 2001 From: Joe LaPenna Date: Fri, 7 Jun 2019 20:12:53 -0700 Subject: [PATCH 2/3] Include client id in fetch_token --- nokia/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nokia/__init__.py b/nokia/__init__.py index 2469b5e..283bc49 100644 --- a/nokia/__init__.py +++ b/nokia/__init__.py @@ -83,7 +83,8 @@ def get_credentials(self, code): tokens = self._oauth().fetch_token( '%s/oauth2/token' % self.URL, code=code, - client_secret=self.consumer_secret) + client_secret=self.consumer_secret, + include_client_id=True) return NokiaCredentials( access_token=tokens['access_token'], From 6006ff81a2a4c203c3d6d06ada25cc31df021c6d Mon Sep 17 00:00:00 2001 From: Joe LaPenna Date: Tue, 18 Jun 2019 09:39:30 -0700 Subject: [PATCH 3/3] Stop supporting py34: Remove py34 from tox and travis configs. --- .travis.yml | 1 - tox.ini | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a266ead..8418683 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ python: - pypy - pypy3.5 - 2.7 - - 3.4 - 3.5 - 3.6 # Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs diff --git a/tox.ini b/tox.ini index decfe1c..0623cb0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pypy,pypy3,py37,py36,py35,py34,py27 +envlist = pypy,pypy3,py37,py36,py35,py27 [testenv] commands = coverage run --branch --source=nokia setup.py test