Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Fix #53, Fix #56: Don't corrupt notebook.json when no oauth_client_id #57

Merged
jezdez merged 7 commits into from
Feb 7, 2018
Merged

Fix #53, Fix #56: Don't corrupt notebook.json when no oauth_client_id #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd67af3
Attempt to fix Travis CI config
mdboom Feb 5, 2018
7945e42
Remove pypy3 configuration from test
mdboom Feb 5, 2018
d7ce3e9
Use "cache: pip" shortcut
mdboom Feb 6, 2018
561dcb1
Don't explicitly install tornado
mdboom Feb 6, 2018
c175659
Fix #53, Fix #56: Don't corrupt notebook.json when no oauth_client_id
mdboom Feb 5, 2018
0d2816e
Use six for correct Python2/3 compatibility
mdboom Feb 6, 2018
0ff0389
Add six to the explicit dependencies
mdboom Feb 7, 2018
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
19 changes: 8 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
language: python
python: 3.5
python:
- 2.7
- 3.4
- 3.5
- 3.6
- pypy
sudo: false
cache:
directories:
- "~/.cache/pip"
env:
- TOXENV=py27
- TOXENV=py33
- TOXENV=py34
- TOXENV=py35
- TOXENV=pypy
cache: pip
install:
- pip install tox codecov
script:
- tox -v
- tox -v -e py
after_success:
- codecov
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'notebook >= 4.2',
'jupyter',
'requests',
'six',
'widgetsnbextension',
],
url='https://github.com/mozilla/jupyter-notebook-gist',
Expand Down
6 changes: 5 additions & 1 deletion src/jupyter_notebook_gist/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import six
from traitlets.config import LoggingConfigurable
from traitlets.traitlets import Unicode

Expand All @@ -19,6 +20,9 @@ def __init__(self, *args, **kwargs):
super(NotebookGist, self).__init__(*args, **kwargs)
# update the frontend settings with the currently passed
# OAUTH client id
client_id = self.config.NotebookGist.oauth_client_id
if not isinstance(client_id, six.string_types):
client_id = None
self.config_manager.update('notebook', {
'oauth_client_id': self.config.NotebookGist.oauth_client_id,
'oauth_client_id': client_id,
})
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[tox]
recreate = true
usedevelop = true
envlist = py27, py33, py34, py35, pypy
envlist = py27, py34, py35, py36, pypy

[testenv]
commands =
Expand All @@ -17,7 +17,7 @@ deps:
pytest-coverage
pytest-isort
pytest-cache>=1.0
flake8<3.0.0
flake8>=3.5
pytest-flake8>=0.5
pytest>=2.8.0

Expand Down