Merge branch 'master' into example

Author: echarles

.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: CI
+on:
+  push:
+    branches: 
+    - master
+  pull_request:
+    branches: '*'
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: [ '3.6', '3.7', '3.8' ]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Install Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+        architecture: 'x64'
+    - name: Install the Python dependencies
+      run: |
+        pip install -e .[test]
+    - name: Run the tests
+      run: |
+        nosetests -v jupyter_server

.travis.yml

@@ -5,9 +5,6 @@ cache:
     directories:
         - $HOME/.cache/bower
         - $HOME/.cache/pip
-python:
-    - 3.6
-
 env:
   global:
     - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
@@ -28,7 +25,6 @@ install:
     - pip freeze
     - wget https://github.com/jgm/pandoc/releases/download/1.19.1/pandoc-1.19.1-1-amd64.deb && sudo dpkg -i pandoc-1.19.1-1-amd64.deb
 
-
 script:
     - jupyter kernelspec list
     - |
@@ -41,7 +37,7 @@ script:
       else
           true
       fi
-    - 'if [[ $GROUP == python ]]; then nosetests -v --with-coverage --cover-package=jupyter_server jupyter_server; fi'
+    - 'if [[ $GROUP == python ]]; then nosetests -v jupyter_server; fi'
     - |
       if [[ $GROUP == docs ]]; then
         EXIT_STATUS=0
@@ -54,17 +50,20 @@ script:
         exit $EXIT_STATUS
       fi
 
-
 matrix:
     include:
-        - python: 3.5
+        - python: 3.6
           env: GROUP=python
         - python: 3.7
           env: GROUP=python
         - python: 3.8
           env: GROUP=python
         - python: 3.6
           env: GROUP=docs
+        - python: 3.7
+          env: GROUP=docs
+        - python: 3.8
+          env: GROUP=docs
 
 after_success:
     - codecov

appveyor.yml

@@ -6,6 +6,10 @@ environment:
   matrix:
     - CONDA_PY: 36
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
+    - CONDA_PY: 37
+      CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
+    - CONDA_PY: 38
+      CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
 
 platform:
   - x64
@@ -21,4 +25,4 @@ install:
   - cmd: pip install .[test]
 
 test_script:
-  - nosetests  -v jupyter_server --exclude-dir notebook\tests\selenium
+  - nosetests  -v jupyter_server --exclude-dir jupyter_server\tests\selenium

jupyter_server/gateway/managers.py

@@ -283,12 +283,12 @@ def gateway_request(endpoint, **kwargs):
     except ConnectionRefusedError:
         raise web.HTTPError(503, "Connection refused from Gateway server url '{}'.  " 
               "Check to be sure the Gateway instance is running.".format(GatewayClient.instance().url))
-    except HTTPError:
+    except HTTPError as e:
         # This can occur if the host is valid (e.g., foo.com) but there's nothing there.
-        raise web.HTTPError(504, "Error attempting to connect to Gateway server url '{}'.  "
+        raise web.HTTPError(e.code, "Error attempting to connect to Gateway server url '{}'.  "
                        "Ensure gateway url is valid and the Gateway instance is running.".
                             format(GatewayClient.instance().url))
-    except gaierror as e:
+    except gaierror:
         raise web.HTTPError(404, "The Gateway server specified in the gateway_url '{}' doesn't appear to be valid.  "
                        "Ensure gateway url is valid and the Gateway instance is running.".
                             format(GatewayClient.instance().url))
@@ -390,8 +390,8 @@ def get_kernel(self, kernel_id=None, **kwargs):
         self.log.debug("Request kernel at: %s" % kernel_url)
         try:
             response = yield gateway_request(kernel_url, method='GET')
-        except HTTPError as error:
-            if error.code == 404:
+        except web.HTTPError as error:
+            if error.status_code == 404:
                 self.log.warn("Kernel not found at: %s" % kernel_url)
                 self.remove_kernel(kernel_id)
                 kernel = None
@@ -559,8 +559,8 @@ def get_kernel_spec(self, kernel_name, **kwargs):
         self.log.debug("Request kernel spec at: %s" % kernel_spec_url)
         try:
             response = yield gateway_request(kernel_spec_url, method='GET')
-        except HTTPError as error:
-            if error.code == 404:
+        except web.HTTPError as error:
+            if error.status_code == 404:
                 # Convert not found to KeyError since that's what the Notebook handler expects
                 # message is not used, but might as well make it useful for troubleshooting
                 raise KeyError('kernelspec {kernel_name} not found on Gateway server at: {gateway_url}'.
@@ -587,8 +587,8 @@ def get_kernel_spec_resource(self, kernel_name, path):
         self.log.debug("Request kernel spec resource '{}' at: {}".format(path, kernel_spec_resource_url))
         try:
             response = yield gateway_request(kernel_spec_resource_url, method='GET')
-        except HTTPError as error:
-            if error.code == 404:
+        except web.HTTPError as error:
+            if error.status_code == 404:
                 kernel_spec_resource = None
             else:
                 raise

jupyter_server/tests/test_gateway.py

@@ -4,7 +4,8 @@
 import uuid
 from datetime import datetime
 from tornado import gen
-from tornado.httpclient import HTTPRequest, HTTPResponse, HTTPError
+from tornado.web import HTTPError
+from tornado.httpclient import HTTPRequest, HTTPResponse
 from ipython_genutils.py3compat import str_to_unicode
 from .launchserver import ServerTestBase
 from jupyter_server.gateway.managers import GatewayClient

setup.py

@@ -19,8 +19,8 @@
 name = "jupyter_server"
 
 # Minimal Python version sanity check
-if sys.version_info < (3,5):
-    error = "ERROR: %s requires Python version 3.5 or above." % name
+if sys.version_info < (3,6):
+    error = "ERROR: %s requires Python version 3.6 or above." % name
     print(error, file=sys.stderr)
     sys.exit(1)
 
@@ -67,7 +67,6 @@
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],
@@ -95,7 +94,7 @@
                  'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
         'test:sys_platform == "win32"': ['nose-exclude'],
     },
-    python_requires = '>=3.5',
+    python_requires = '>=3.6',
     entry_points = {
         'console_scripts': [
             'jupyter-server = jupyter_server.serverapp:main',