Skip to content

Commit b803161

Browse files
minrkZsailer
authored andcommitted
require Python 3.5
3.4 doesn't have isawaitable remove unsupported combinations from test matrix
1 parent d95ccaa commit b803161

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ matrix:
6868
dist: xenial # required for Python >= 3.7 (travis-ci/travis-ci#9069)
6969
- python: 3.6
7070
env: GROUP=docs
71-
- python: 3.6
72-
env:
73-
- GROUP=python
74-
- EXTRA_PIP="tornado<5"
7571

7672
after_success:
7773
- codecov

jupyter_server/services/sessions/sessionmanager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ def row_to_model(self, row, tolerate_culled=False):
241241
if row['type'] == 'notebook':
242242
# Provide the deprecated API.
243243
model['notebook'] = {'path': row['path'], 'name': row['name']}
244-
return model
245-
244+
raise gen.Return(model)
245+
246246
def list_sessions(self):
247247
"""Returns a list of dictionaries containing all the information from
248248
the session database"""
@@ -256,7 +256,7 @@ def list_sessions(self):
256256
result.append(model)
257257
except KeyError:
258258
pass
259-
return result
259+
raise gen.Return(result)
260260

261261
@gen.coroutine
262262
def delete_session(self, session_id):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
9696
'test:sys_platform == "win32"': ['nose-exclude'],
9797
},
98-
python_requires='>=3.5',
98+
python_requires = '>=3.5',
9999
entry_points = {
100100
'console_scripts': [
101101
'jupyter-server = jupyter_server.serverapp:main',

0 commit comments

Comments
 (0)