Added tests for newer versions of ipython and python

.travis.yml

@@ -1,11 +1,20 @@
 language: python
 sudo: false
-python:
-  - "2.7"
-  - "3.4"
-env:
-  - IPYTHON=3
-  - IPYTHON=4
+
+matrix:
+  include:
+    - python: 2.7
+      env: IPYTHON=3
+    - python: 2.7
+      env: IPYTHON=4
+
+    - python: 3.4
+      env: IPYTHON=3
+    - python: 3.4
+      env: IPYTHON=4
+
+    - python: 3.6
+      env: IPYTHON=6
 
 addons:
   postgresql: "9.3"
@@ -16,6 +25,7 @@ install:
 script:
   - if [[ $TRAVIS_PYTHON_VERSION = '2.7' ]]; then tox -e py27-ipython$IPYTHON,flake8; fi
   - if [[ $TRAVIS_PYTHON_VERSION = '3.4' ]]; then tox -e py34-ipython$IPYTHON,flake8; fi
+  - if [[ $TRAVIS_PYTHON_VERSION = '3.6' ]]; then tox -e py36-ipython$IPYTHON; fi
 
 branches:
   only:

pgcontents/pgmanager.py

@@ -73,7 +73,11 @@ def _checkpoints_class_default(self):
         return PostgresCheckpoints
 
     def _checkpoints_kwargs_default(self):
-        kw = super(PostgresContentsManager, self)._checkpoints_kwargs_default()
+        try:
+            klass = PostgresContentsManager
+            kw = super(klass, self)._checkpoints_kwargs_default()
+        except AttributeError:
+            kw = {'parent': self, 'log': self.log}
         kw.update({
             'create_user_on_startup': self.create_user_on_startup,
             'crypto': self.crypto,

pgcontents/tests/test_pgcontents_api.py

@@ -51,7 +51,7 @@
 )
 from ..utils.ipycompat import (
     APITest, Config, FileContentsManager, GenericFileCheckpoints, to_os_path,
-)
+    IPY3)
 from ..utils.sync import walk, walk_dirs
 
 
@@ -163,6 +163,38 @@ def test_list_checkpoints_sorting(self):
             )
         )
 
+    # skip test as it is not satisfyable across supported notebook versions
+    def test_delete_non_empty_dir(self):
+        # ContentsManager has different behaviour in notebook 5.5+
+        # https://github.com/jupyter/notebook/pull/3108
+
+        # Old behaviour
+        # from notebook.tests.launchnotebook import assert_http_error
+
+        if isinstance(self.notebook.contents_manager, PostgresContentsManager):
+            _test_delete_non_empty_dir_fail(self)
+        else:
+            _test_delete_non_empty_dir_pass(self)
+
+
+def _test_delete_non_empty_dir_fail(self):
+    if IPY3:
+        return
+    from notebook.tests.launchnotebook import assert_http_error
+    with assert_http_error(400):
+        self.api.delete(u'å b')
+
+
+def _test_delete_non_empty_dir_pass(self):
+    if IPY3:
+        return
+    from notebook.tests.launchnotebook import assert_http_error
+    # Test that non empty directory can be deleted
+    self.api.delete(u'å b')
+    # Check if directory has actually been deleted
+    with assert_http_error(404):
+        self.api.list(u'å b')
+
 
 def postgres_contents_config():
     """
@@ -441,12 +473,12 @@ def _method(self, api_path, *args):
         'isfile',
         'isdir',
     ]
-    l = locals()
+    locs = locals()
     for method_name in __methods_to_multiplex:
-        l[method_name] = __api_path_dispatch(method_name)
+        locs[method_name] = __api_path_dispatch(method_name)
     del __methods_to_multiplex
     del __api_path_dispatch
-    del l
+    del locs
 
     # Override to not delete the root of the file subsystem.
     def test_delete_dirs(self):

pgcontents/utils/ipycompat.py

@@ -3,7 +3,7 @@
 """
 import IPython
 
-SUPPORTED_VERSIONS = {3, 4, 5}
+SUPPORTED_VERSIONS = {3, 4, 5, 6}
 IPY_MAJOR = IPython.version_info[0]
 if IPY_MAJOR not in SUPPORTED_VERSIONS:
     raise ImportError("IPython version %d is not supported." % IPY_MAJOR)
@@ -47,8 +47,8 @@
     )
 else:
     import notebook
-    if notebook.version_info[0] >= 5:
-        raise ImportError("Notebook versions 5 and up are not supported.")
+    if notebook.version_info[0] >= 6:
+        raise ImportError("Notebook versions 6 and up are not supported.")
 
     from traitlets.config import Config
     from notebook.services.contents.checkpoints import (

setup.py

@@ -47,8 +47,9 @@ def main():
         install_requires=reqs,
         extras_require={
             'test': test_reqs,
-            'ipy3': ['ipython[test,notebook]<4.0'],
-            'ipy4': ['ipython<6.0', 'notebook[test]>=4.0,<5.0'],
+            'ipy3': ['ipython[test,notebook]<4.0', 'tornado<5.0'],
+            'ipy4': ['ipython<6.0', 'notebook[test]>=4.0,<5.0', 'tornado<5.0'],
+            'ipy6': ['ipython>=6.0', 'notebook[test]>=5.0']
         },
         scripts=[
             'bin/pgcontents',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py{27,34}-ipython{3,4},flake8
+envlist=py{27,34}-ipython{3,4},py36-ipython6,flake8
 skip_missing_interpreters=True
 
 [testenv]
@@ -9,11 +9,14 @@ whitelist_externals =
 deps =
     py{27,34}-ipython3: .[test,ipy3]
     py{27,34}-ipython4: .[test,ipy4]
+    py36-ipython6: .[test,ipy6]
     flake8: flake8
     notest: .[ipy4]
 
 commands =
     py{27,34}-ipython{3,4}: -createdb pgcontents_testing
     py{27,34}-ipython{3,4}: nosetests pgcontents/tests
+    py36-ipython6: -createdb pgcontents_testing
+    py36-ipython6: nosetests pgcontents/tests
     flake8: flake8 pgcontents
     notest: python -c 'from pgcontents.utils.ipycompat import *'