MAINT: Update supported IPython/Notebook versions.

Author: Scott Sanderson

.travis.yml

@@ -6,8 +6,8 @@ python:
   - "3.5"
   - "3.6"
 env:
-  - NB_VERSION=4
   - NB_VERSION=5
+  - NB_VERSION=6
   - FLAKE8=true NB_VERSION=5
   - NOTEST=true NB_VERSION=5
 

notebook4_constraints.txt

@@ -0,0 +1 @@
+notebook<7

notebook6_constraints.txt

@@ -24,6 +24,7 @@
 from six import iteritems
 
 from IPython.utils.tempdir import TemporaryDirectory
+from notebook.tests.launchnotebook import assert_http_error
 from requests import HTTPError
 
 from ..constants import UNLIMITED
@@ -50,8 +51,12 @@
     TEST_DB_URL,
 )
 from ..utils.ipycompat import (
-    APITest, Config, FileContentsManager, GenericFileCheckpoints, to_os_path,
-    assert_http_error)
+    APITest,
+    Config,
+    FileContentsManager,
+    GenericFileCheckpoints,
+    to_os_path,
+)
 from ..utils.sync import walk, walk_dirs
 
 

pgcontents/tests/test_pgcontents_api.py

@@ -2,8 +2,6 @@
 Utilities for managing compat between notebook versions.
 """
 import notebook
-if notebook.version_info[0] >= 6:  # noqa
-    raise ImportError("Jupyter Notebook versions 6 and up are not supported.")
 
 from traitlets.config import Config
 from notebook.services.contents.checkpoints import (
@@ -21,7 +19,6 @@
 from notebook.services.contents.tests.test_contents_api import (
     APITest
 )
-from notebook.tests.launchnotebook import assert_http_error
 from notebook.utils import to_os_path
 from nbformat import from_dict, reads, writes
 from nbformat.v4.nbbase import (
@@ -45,7 +42,6 @@
 __all__ = [
     'APITest',
     'Any',
-    'assert_http_error',
     'Bool',
     'Checkpoints',
     'Config',

pgcontents/utils/ipycompat.py

@@ -45,9 +45,24 @@ def main():
             'Programming Language :: Python',
             'Topic :: Database',
         ],
-        install_requires=reqs,
+        install_requires=[
+            'SQLAlchemy>=1.0.5',
+            'alembic>=0.7.6',
+            'click>=3.3',
+            'cryptography>=1.4',
+            'psycopg2>=2.6.1',
+            'six>=1.9.0',
+            'notebook>=5.0',
+        ],
         extras_require={
-            'test': test_reqs,
+            'test': [
+                'notebook[test]',
+                'nose',
+                'nose-ignore-docstring',
+                'flake8',
+                'requests',
+                'mock',
+            ],
         },
         scripts=[
             'bin/pgcontents',

setup.py

@@ -1,23 +1,23 @@
 [tox]
-envlist=py{27,35}-notebook4,py{27,35,36}-notebook5,flake8,notest
+envlist=py{27,35,36}-notebook5,py{35,36}-notebook6,py36-latest,flake8,notest
 skip_missing_interpreters=True
 
 [testenv]
 whitelist_externals =
     createdb
 
 install_command =
-    py{27,35,36}-notebook4: pip install -c notebook4_constraints.txt {opts} {packages}
     py{27,35,36}-notebook5: pip install -c notebook5_constraints.txt {opts} {packages}
-    flake8,notest: pip install {opts} {packages}
+    py{35,36}-notebook6: pip install -c notebook6_constraints.txt {opts} {packages}
+    flake8,notest,py36-latest: pip install {opts} {packages}
 
 deps =
-    py{27,35,36}-notebook{4,5}: .[test]
+    py{27,35,36}-notebook{5,6}: .[test]
     flake8: flake8
     notest: .
 
 commands =
-    py{27,35,36}-notebook{4,5}: -createdb pgcontents_testing
-    py{27,35,36}-notebook{4,5}: nosetests pgcontents/tests
+    py{27,35,36}-notebook{5,6}: -createdb pgcontents_testing
+    py{27,35,36}-notebook{5,6}: nosetests pgcontents/tests
     flake8: flake8 pgcontents
     notest: python -c 'from pgcontents.utils.ipycompat import *'