Merge remote-tracking branch 'origin/master' into 708-prettier-pretty

* origin/master:
  Remove docformatter, it's too unwieldy.
  Minor doc formatting.
  Sigh, this appears to be a regex, not exact match, so it was ignoring everything.
  Update pre-commit hooks.
  And two last ones...
  Remove the rest of the notebooks.ai related resources.
  Remove demo links from README file
  Move the latest validator CLI test to where it must go now.
  Simplify the schemas in the tests for CLI validator detection.
  add test case
  Delete the failed test case
  Fix the bug of processing arguments[validator] in parse_args
  use correct format check globally
  renames message and function
  better handling for Python 3.6
  fix formatting error
  skip tests on python 3.6
  unskip tests
  Temporarily skip the tests that will be unskipped by python-jsonschema#722.
  Squashed 'json/' changes from 86f52b87..fce9e9b3
  Validate IP addresses using the ipaddress module.
  Skip more tests for python-jsonschema#686.
  Squashed 'json/' changes from ea415537..86f52b87
  improve date parsing
  Bump the version in the notebooks.io requirements.
  pre-commit setup.
  Trailing whitespace
  Kill Py2 in the sphinx role.
  isorted.
  Unbreak non-format-setuptools-extra-installed jsonschema.
  Run CI against all setuptools extras separately.
  Pick a format checker that has no external dep now that fqdn exists.
  regenerated the requirements.txt
  Modify the code based on review comments
  fix bug about hostname by import fqdn

.github/workflows/ci.yml

@@ -18,13 +18,17 @@ jobs:
         os: [macos-latest, ubuntu-latest, windows-latest]
         python-version:
           - name: pypy3
-            toxenv: pypy3-build
+            toxenv: pypy3-noextra-build
           - name: pypy3
-            toxenv: pypy3-tests
+            toxenv: pypy3-noextra-tests
           - name: pypy3
-            toxenv: pypy3-tests_nongpl
+            toxenv: pypy3-format-build
           - name: pypy3
-            toxenv: demo
+            toxenv: pypy3-format-tests
+          - name: pypy3
+            toxenv: pypy3-format_nongpl-build
+          - name: pypy3
+            toxenv: pypy3-format_nongpl-tests
           - name: pypy3
             toxenv: readme
           - name: pypy3
@@ -44,36 +48,66 @@ jobs:
           - name: pypy3
             toxenv: docs-style
           - name: 3.6
-            toxenv: py36-build
+            toxenv: py36-noextra-build
+          - name: 3.6
+            toxenv: py36-noextra-tests
+          - name: 3.6
+            toxenv: py36-format-build
+          - name: 3.6
+            toxenv: py36-format-tests
           - name: 3.6
-            toxenv: py36-tests
+            toxenv: py36-format_nongpl-build
           - name: 3.6
-            toxenv: py36-tests_nongpl
+            toxenv: py36-format_nongpl-tests
           - name: 3.7
-            toxenv: py37-build
+            toxenv: py37-noextra-build
           - name: 3.7
-            toxenv: py37-tests
+            toxenv: py37-noextra-tests
           - name: 3.7
-            toxenv: py37-tests_nongpl
+            toxenv: py37-format-build
+          - name: 3.7
+            toxenv: py37-format-tests
+          - name: 3.7
+            toxenv: py37-format_nongpl-build
+          - name: 3.7
+            toxenv: py37-format_nongpl-tests
+          - name: 3.8
+            toxenv: py38-noextra-build
+          - name: 3.8
+            toxenv: py38-noextra-tests
           - name: 3.8
-            toxenv: py38-build
+            toxenv: py38-format-build
           - name: 3.8
-            toxenv: py38-tests
+            toxenv: py38-format-tests
           - name: 3.8
-            toxenv: py38-tests_nongpl
+            toxenv: py38-format_nongpl-build
+          - name: 3.8
+            toxenv: py38-format_nongpl-tests
         exclude:
           - os: windows-latest
             python-version:
               name: pypy3
-              toxenv: pypy3-build
+              toxenv: pypy3-noextra-build
+          - os: windows-latest
+            python-version:
+              name: pypy3
+              toxenv: pypy3-format-build
+          - os: windows-latest
+            python-version:
+              name: pypy3
+              toxenv: pypy3-format_nongpl-build
+          - os: windows-latest
+            python-version:
+              name: pypy3
+              toxenv: pypy3-noextra-tests
           - os: windows-latest
             python-version:
               name: pypy3
-              toxenv: pypy3-tests
+              toxenv: pypy3-format-tests
           - os: windows-latest
             python-version:
               name: pypy3
-              toxenv: pypy3-tests_nongpl
+              toxenv: pypy3-format_nongpl-tests
           - os: windows-latest
             python-version:
               name: pypy3
@@ -89,27 +123,51 @@ jobs:
           - os: windows-latest
             python-version:
               name: 3.6
-              toxenv: py36-tests
+              toxenv: py36-noextra-build
           - os: windows-latest
             python-version:
               name: 3.6
-              toxenv: py36-tests_nongpl
+              toxenv: py36-format-build
           - os: windows-latest
             python-version:
               name: 3.6
-              toxenv: py36-build
+              toxenv: py36-format_nongpl-build
+          - os: windows-latest
+            python-version:
+              name: 3.6
+              toxenv: py36-noextra-tests
+          - os: windows-latest
+            python-version:
+              name: 3.6
+              toxenv: py36-format-tests
+          - os: windows-latest
+            python-version:
+              name: 3.6
+              toxenv: py36-format_nongpl-tests
+          - os: windows-latest
+            python-version:
+              name: 3.7
+              toxenv: py37-noextra-tests
+          - os: windows-latest
+            python-version:
+              name: 3.7
+              toxenv: py37-format-tests
           - os: windows-latest
             python-version:
               name: 3.7
-              toxenv: py37-build
+              toxenv: py37-format_nongpl-tests
           - os: windows-latest
             python-version:
               name: 3.8
-              toxenv: py38-build
+              toxenv: py38-noextra-tests
           - os: windows-latest
             python-version:
-              name: pypy3
-              toxenv: demo
+              name: 3.8
+              toxenv: py38-format-tests
+          - os: windows-latest
+            python-version:
+              name: 3.8
+              toxenv: py38-format_nongpl-tests
           - os: windows-latest
             python-version:
               name: pypy3

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+exclude: json/
+
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    -   id: check-ast
+    -   id: check-docstring-first
+    -   id: check-json
+    -   id: check-toml
+    -   id: check-vcs-permalinks
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+-   repo: https://github.com/timothycrosley/isort
+    rev: 5.4.2
+    hooks:
+    -   id: isort

CHANGELOG.rst

@@ -43,7 +43,7 @@ v2.6.0
 * Support for Python 2.6 has been dropped.
 * Improve a few error messages for ``uniqueItems`` (#224) and
   ``additionalProperties`` (#317)
-* Fixed an issue with ``ErrorTree``'s handling of multiple errors (#288) 
+* Fixed an issue with ``ErrorTree``'s handling of multiple errors (#288)
 
 v2.5.0
 ------
@@ -175,7 +175,7 @@ v0.4
     In order to make this happen (and also to clean things up a bit), a number
     of deprecations are necessary:
 
-        * ``stop_on_error`` is deprecated in ``Validator.__init__``. Use 
+        * ``stop_on_error`` is deprecated in ``Validator.__init__``. Use
           ``Validator.iter_errors()`` instead.
         * ``number_types`` and ``string_types`` are deprecated there as well.
           Use ``types={"number" : ..., "string" : ...}`` instead.

README.rst

@@ -80,24 +80,6 @@ Installation
     $ pip install jsonschema
 
 
-Demo
-----
-
-Try ``jsonschema`` interactively in this online demo:
-
-.. image:: https://user-images.githubusercontent.com/1155573/56745335-8b158a00-6750-11e9-8776-83fa675939c4.png
-    :target: https://notebooks.ai/demo/gh/Julian/jsonschema
-    :alt: Open Live Demo
-
-
-Online demo Notebook will look similar to this:
-
-
-.. image:: https://user-images.githubusercontent.com/1155573/56820861-5c1c1880-6823-11e9-802a-ce01c5ec574f.gif
-    :alt: Open Live Demo
-    :width: 480 px
-
-
 Release Notes
 -------------
 
@@ -125,7 +107,7 @@ Benchmarks
 ----------
 
 ``jsonschema``'s benchmarks make use of `pyperf
-<https://pyperf.readthedocs.io>`_. Running them can be done via:: 
+<https://pyperf.readthedocs.io>`_. Running them can be done via::
 
       $ tox -e perf