summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2022-06-02 12:07:21 -0400
committerJulian Berman <Julian@GrayVines.com>2022-06-02 12:07:21 -0400
commitded065d324064a28019739f7478d29b021b687dd (patch)
treefe94edda3c3b2bcc1d5dff3cf12b6b6807046c50 /docs
parentaf47da8668c631eb3f13803f50ae4b58b1f40d44 (diff)
parentfd3a457c7359f13f50de8d5e3fbc73998c3ea2dc (diff)
downloadjsonschema-ded065d324064a28019739f7478d29b021b687dd.tar.gz
Merge branch 'main' into bool-format-checks
* main: Slightly speed up pip installs by skipping the version check in CI. Remove the now-unused MANIFEST.in. v4.6.0 -> CHANGELOG Ignore the badge URLs, they seem super unreliable from CI. Ignore a deprecation warning coming from pkg_resources on 3.11 Add basic CONTRIBUTING guidelines. Make project.urls be valid URLs. Combine the CI and packaging workflows. Let RTD be authoritative about what the default doc version is. Re-enable Python 3.11 testing in CI. Modernize the packaging setup via PEP 621 and Hatch. Update various GHA versions. Update docs requirements. Revert "Merge pull request #954 from ssbarnea/fix/py.typed"
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py1
-rw-r--r--docs/validate.rst2
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 2e3cf5d..f595f16 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -240,6 +240,7 @@ def entire_domain(host):
linkcheck_ignore = [
+ entire_domain("img.shields.io"),
"https://github.com/python-jsonschema/jsonschema/actions",
"https://github.com/python-jsonschema/jsonschema/workflows/CI/badge.svg",
]
diff --git a/docs/validate.rst b/docs/validate.rst
index cda8f35..abb52cb 100644
--- a/docs/validate.rst
+++ b/docs/validate.rst
@@ -205,7 +205,7 @@ to validate. Their names can be viewed by inspecting the
`FormatChecker.checkers` attribute. Certain checkers will only be
available if an appropriate package is available for use. The easiest way to
ensure you have what is needed is to install ``jsonschema`` using the
-``format`` or ``format_nongpl`` setuptools extra -- i.e.
+``format`` or ``format_nongpl`` collection of optional dependencies -- e.g.
.. code-block:: sh