Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ formats:
build:
image: latest

sphinx:
builder: html
configuration: docs/conf.py
fail_on_warning: true

python:
version: 3.8
install:
Expand Down
18 changes: 14 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

import os


Expand All @@ -12,6 +10,18 @@ def read(*names, **kwargs):
return fh.read()


# Warn about all references to unknown targets
nitpicky = True
# Except for these ones, which we expect to point to unknown targets:
nitpick_ignore = [
# Perhaps this is "obvious" to those that know type hints. Perhaps we should
# explain briefly with a link to the typing docs.
("py:class", "desert.T"),
# TODO: get around to adding .. py:module to attrs somewhere
("py:mod", "attrs"),
]


extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.napoleon",
Expand Down Expand Up @@ -72,8 +82,8 @@ def read(*names, **kwargs):
intersphinx_mapping = {
"python": ("https://docs.python.org/3", None),
"marshmallow": ("https://marshmallow.readthedocs.io/en/latest/", None),
"attrs": ("https://attrs.readthedocs.io/en/latest/", None),
"attr": ("https://attrs.readthedocs.io/en/latest/", None),
"attrs": ("https://www.attrs.org/en/latest/", None),
"attr": ("https://www.attrs.org/en/latest/", None),
"marshmallow_union": (
"https://python-marshmallow-union.readthedocs.io/en/latest/",
None,
Expand Down
7 changes: 0 additions & 7 deletions docs/reference/modules.rst

This file was deleted.

4 changes: 2 additions & 2 deletions docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Basics
:end-before: end-basic-usage


Desert can be used with :mod:`dataclasses` or :mod:`attr`. With either module,
Desert can be used with :mod:`dataclasses` or :mod:`attrs`. With either module,
Desert is able to infer the appropriate :mod:`marshmallow` field
for any of these types:

Expand All @@ -33,7 +33,7 @@ for any of these types:
There are two syntaxes for
specifying a field.

In the more concise form, :func:`desert.field()` wraps :mod:`dataclasses.field()` and
In the more concise form, :func:`desert.field()` wraps :func:`dataclasses.field()` and
:func:`desert.ib()` wraps :func:`attr.ib()`. These functions take a
:class:`marshmallow.fields.Field` as the first argument, and the remaining arguments are
forwarded to the corresponding wrapped function.
Expand Down