Merge pull request #156 from mcg1969/jc6

Bypass the entrypoint mechanism

.travis.yml

@@ -15,9 +15,9 @@ env:
     secure: Vf0mo4VkI/AgebH9WmFSzwj7sEKCrydW3H0EOegvx1tNLieq9i38ZTyoW/srLX2N60T9xuf+J8+Ntwo978/Iu69O+SD4ghCBa4SThS+b7R2wtRXa3TL3uV1n1GRY8ybCl1bOARQ1wgoPYOQUZ6oAIrmAUjeM7g2Y63vp1y8nVYJPFjJuToJ3JNiB+l0FUA43MuHMhVFaO0U6vwbkmOPc5a4hk+NQYCCTa36XRb5BscQwzfhFKsQ295tHxmK5ZFiU8PhzK/fRyKUnkDhGa0PyQnHoBztHjJgHmcMQOfvgMctOZiFFgQP6yiwV5BzB4eYYH7eDk5rbyK5PT3ptsPJQmLrjFCDyp6lbRMRvyvdN08Rw3mjQyPhqeo9UNwNc3iFHHBSNqtXx+AtZKxYeJru3eLH6B+FgBdw6fy+Wire1sRzPLnIzQbaG70siIDS6nVlyynaxXfpbrzEJYH8cSib9XB2YqK+fHmfDa21n4U6aVJuQdC5Z0NudWqp3utNvWlwMbVLyffMgZjfLyfhu6mVyzWpYWJ5wehveBP4gd3eMhihOco0SzBicvbzE5eS2ndQPIGv/PtC3t/mLWMIRo72hnaxhhxWbeeh7K++idJRz7PMiIXwP3hKFLNc8RfbLriKBponK29Vv3aVWN2zc2NyWr9kKL9rt+6kAmj69gbRmQHA=
   matrix:
     - PYTHON_VERSION=2.7
-    - PYTHON_VERSION=3.5
     - PYTHON_VERSION=3.6
     - PYTHON_VERSION=3.7
+    - PYTHON_VERSION=3.8
 
 install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then

appveyor.yml

@@ -16,9 +16,9 @@ environment:
   ANACONDA_TOKEN:
     secure: ARz+fIEDJ03ENwXTyuy0pkzmxddWXFc+pN9+mwBcCnT7ytqlQ/ojcnH3gYsLp9TB
   matrix:
+    - PYTHON_VERSION: 3.8
     - PYTHON_VERSION: 3.7
     - PYTHON_VERSION: 3.6
-    - PYTHON_VERSION: 3.5
     - PYTHON_VERSION: 2.7
 
 init:

nb_conda_kernels/install.py

@@ -101,7 +101,11 @@ def install(enable=False, disable=False, status=None, prefix=None, path=None, ve
         log.info("{}ing nb_conda_kernels...".format(ENDIS[enable][:-2].capitalize()))
 
     is_enabled_entry = False
-    has_entrypoints = int(jc_version.split('.', 1)[0]) >= 6
+    # Disable the entry-point based mechanism. Most if this code will need
+    # to be removed, because the kernel discovery mechanism was changed
+    # before jupyter_client 6 was released. For now we're dropping back to
+    # the jupyter_client 5 model until we leverage the new mechanism.
+    has_entrypoints = False # int(jc_version.split('.', 1)[0]) >= 6
     log.debug('Entry points:')
     for ep in iter_entry_points(group=JCKP):
         log.debug('  - {}'.format(ep))