Clean up deprecations (#650)

Author: blink1073

.github/workflows/integration-tests.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/python-linux.yml

@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -49,11 +49,11 @@ jobs:
           pip freeze
           pip check
       - name: Run the tests
-        if: ${{ matrix.python-version != 'pypy3' }}
+        if: ${{ matrix.python-version != 'pypy-3.7' }}
         run: |
           pytest -vv jupyter_server --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered
       - name: Run the tests on pypy
-        if: ${{ matrix.python-version == 'pypy3' }}
+        if: ${{ matrix.python-version == 'pypy-3.7' }}
         run: |
           pytest -vv jupyter_server
       - name: Install the Python dependencies for the examples
@@ -63,7 +63,7 @@ jobs:
         run: |
           pytest examples/simple
       - name: Coverage
-        if: ${{ matrix.python-version != 'pypy3' }}
+        if: ${{ matrix.python-version != 'pypy-3.7' }}
         run: |
           codecov
       - name: Test full install
@@ -74,3 +74,8 @@ jobs:
           pushd test_install
           ./bin/pytest --pyargs jupyter_server
           popd
+      - name: Test the docs
+        run: |
+          cd docs
+          pip install -r doc-requirements.txt
+          make html SPHINXOPTS="-W"

.github/workflows/python-macos.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/python-windows.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows]
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

docs/environment.yml

@@ -1,7 +1,7 @@
 name: jupyter_server_docs
 dependencies:
-  - nodejs=14
-  - python=3.8
+  - nodejs
+  - python
   - pip
   - pip:
       - -r doc-requirements.txt

docs/source/conf.py

@@ -17,6 +17,9 @@
 import shutil
 import sys
 
+from pkg_resources import parse_version
+
+
 HERE = osp.abspath(osp.dirname(__file__))
 
 
@@ -106,13 +109,10 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-_version_py = "../../jupyter_server/_version.py"
-version_ns = {}
-exec(compile(open(_version_py).read(), _version_py, "exec"), version_ns)
+__version__ = "1.14.0.dev0"
 # The short X.Y version.
-version = "%i.%i" % version_ns["version_info"][:2]
-# The full version, including alpha/beta/rc tags.
-release = version_ns["__version__"]
+version_parsed = parse_version(__version__)
+version = f"{version_parsed.major}.{version_parsed.minor}"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -336,7 +336,7 @@
 
 # -- Options for link checks ----------------------------------------------
 
-linkcheck_ignore = ["http://127\.0\.0\.1/*"]
+linkcheck_ignore = [r"http://127\.0\.0\.1/*"]
 
 
 # -- Options for Texinfo output -------------------------------------------

examples/simple/setup.py

@@ -34,7 +34,7 @@ def add_data_files(path):
     version=VERSION,
     description="Jupyter Server Example",
     long_description=open("README.md").read(),
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=[
         "jupyter_server",
         "jinja2",

jupyter_server/gateway/gateway_client.py

@@ -232,7 +232,7 @@ def _headers_default(self):
         default_value=None,
         allow_none=True,
         config=True,
-        help="""The authorization token used in the HTTP headers. The header will be formatted as:
+        help="""The authorization token used in the HTTP headers. The header will be formatted as::
 
             {
                 'Authorization': '{auth_scheme} {auth_token}'

jupyter_server/traittypes.py

@@ -4,153 +4,7 @@
 from traitlets import ClassBasedTraitType
 from traitlets import TraitError
 from traitlets import Undefined
-
-# Traitlet's 5.x includes a set of utilities for building
-# description strings for objects. Traitlets 5.x does not
-# support Python 3.6, but jupyter_server does; instead
-# jupyter_server uses traitlets 4.3.x which doesn't have
-# this `descriptions` submodule. This chunk in the except
-# clause is a copy-and-paste from traitlets 5.0.5.
-try:
-    from traitlets.utils.descriptions import describe
-except ImportError:
-    import re
-    import types
-
-    def describe(article, value, name=None, verbose=False, capital=False):
-        """Return string that describes a value
-        Parameters
-        ----------
-        article : str or None
-            A definite or indefinite article. If the article is
-            indefinite (i.e. "a" or "an") the appropriate one
-            will be infered. Thus, the arguments of ``describe``
-            can themselves represent what the resulting string
-            will actually look like. If None, then no article
-            will be prepended to the result. For non-articled
-            description, values that are instances are treated
-            definitely, while classes are handled indefinitely.
-        value : any
-            The value which will be named.
-        name : str or None (default: None)
-            Only applies when ``article`` is "the" - this
-            ``name`` is a definite reference to the value.
-            By default one will be infered from the value's
-            type and repr methods.
-        verbose : bool (default: False)
-            Whether the name should be concise or verbose. When
-            possible, verbose names include the module, and/or
-            class name where an object was defined.
-        capital : bool (default: False)
-            Whether the first letter of the article should
-            be capitalized or not. By default it is not.
-        Examples
-        --------
-        Indefinite description:
-        >>> describe("a", object())
-        'an object'
-        >>> describe("a", object)
-        'an object'
-        >>> describe("a", type(object))
-        'a type'
-
-        Definite description:
-        >>> describe("the", object())  # doctest: +ELLIPSIS
-        "the object at '0x...'"
-        >>> describe("the", object)
-        'the object object'
-        >>> describe("the", type(object))
-        'the type type'
-
-        Definitely named description:
-        >>> describe("the", object(), "I made")
-        'the object I made'
-        >>> describe("the", object, "I will use")
-        'the object I will use'
-        """
-        if isinstance(article, str):
-            article = article.lower()
-
-        if not inspect.isclass(value):
-            typename = type(value).__name__
-        else:
-            typename = value.__name__
-        if verbose:
-            typename = _prefix(value) + typename
-
-        if article == "the" or (article is None and not inspect.isclass(value)):
-            if name is not None:
-                result = "{} {}".format(typename, name)
-                if article is not None:
-                    return add_article(result, True, capital)
-                else:
-                    return result
-            else:
-                tick_wrap = False
-                if inspect.isclass(value):
-                    name = value.__name__
-                elif isinstance(value, types.FunctionType):
-                    name = value.__name__
-                    tick_wrap = True
-                elif isinstance(value, types.MethodType):
-                    name = value.__func__.__name__
-                    tick_wrap = True
-                elif type(value).__repr__ in (object.__repr__, type.__repr__):
-                    name = "at '%s'" % hex(id(value))
-                    verbose = False
-                else:
-                    name = repr(value)
-                    verbose = False
-                if verbose:
-                    name = _prefix(value) + name
-                if tick_wrap:
-                    name = name.join("''")
-                return describe(article, value, name=name, verbose=verbose, capital=capital)
-        elif article in ("a", "an") or article is None:
-            if article is None:
-                return typename
-            return add_article(typename, False, capital)
-        else:
-            raise ValueError(
-                "The 'article' argument should " "be 'the', 'a', 'an', or None not %r" % article
-            )
-
-    def add_article(name, definite=False, capital=False):
-        """Returns the string with a prepended article.
-        The input does not need to begin with a charater.
-        Parameters
-        ----------
-        definite : bool (default: False)
-            Whether the article is definite or not.
-            Indefinite articles being 'a' and 'an',
-            while 'the' is definite.
-        capital : bool (default: False)
-            Whether the added article should have
-            its first letter capitalized or not.
-        """
-        if definite:
-            result = "the " + name
-        else:
-            first_letters = re.compile(r"[\W_]+").sub("", name)
-            if first_letters[:1].lower() in "aeiou":
-                result = "an " + name
-            else:
-                result = "a " + name
-        if capital:
-            return result[0].upper() + result[1:]
-        else:
-            return result
-
-    def _prefix(value):
-        if isinstance(value, types.MethodType):
-            name = describe(None, value.__self__, verbose=True) + "."
-        else:
-            module = inspect.getmodule(value)
-            if module is not None and module.__name__ != "builtins":
-                name = module.__name__ + "."
-            else:
-                name = ""
-        return name
+from traitlets.utils.descriptions import describe
 
 
 class TypeFromClasses(ClassBasedTraitType):

jupyter_server/utils.py

@@ -10,7 +10,6 @@
 import sys
 from _frozen_importlib_external import _NamespacePath
 from contextlib import contextmanager
-from distutils.version import LooseVersion
 from urllib.parse import quote
 from urllib.parse import SplitResult
 from urllib.parse import unquote
@@ -20,6 +19,7 @@
 from urllib.parse import urlunsplit
 from urllib.request import pathname2url  # noqa: F401
 
+from packaging.version import Version
 from tornado.httpclient import AsyncHTTPClient
 from tornado.httpclient import HTTPClient
 from tornado.httpclient import HTTPRequest
@@ -143,7 +143,7 @@ def check_version(v, check):
     Users on dev branches are responsible for keeping their own packages up to date.
     """
     try:
-        return LooseVersion(v) >= LooseVersion(check)
+        return Version(v) >= Version(check)
     except TypeError:
         return True