Skip to content

Unsupport py34; Support newer arrow and requests-oauthlib dependencies #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 11, 2019
Merged

Unsupport py34; Support newer arrow and requests-oauthlib dependencies #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec4ae4
Update arrow and requests-oauthlib version deps
jlapenna Jun 8, 2019
d929914
Include client id in fetch_token
jlapenna Jun 8, 2019
6006ff8
Stop supporting py34: Remove py34 from tox and travis configs.
jlapenna Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion nokia/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down