Skip to content

Commit

Permalink
Merge pull request #197 from voxpupuli/fix_readthedocs
Browse files Browse the repository at this point in the history
Fix generating docs for Readthedocs
  • Loading branch information
bastelfreak committed Feb 27, 2021
2 parents d106ba4 + d791668 commit 993a073
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
11 changes: 11 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
version: 2

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

python:
version: 3.8
install:
- requirements: docs/requirements.txt
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ Documentation will automatically be rebuilt on every push thanks to the
Read The Docs webhook. You can [find it
here](https://pypuppetdb.readthedocs.org/en/latest/).

You can build the documentation manually by doing:
You can build the documentation locally by doing:

```bash
# Activate the virtualenv and install sphinx + the theme we are using
pip install sphinx sphinx-rtd-theme
# Activate the virtualenv used for the app development
pip install -r docs/requirements.txt
cd docs
make html
```
2 changes: 2 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sphinx
sphinx-rtd-theme
4 changes: 1 addition & 3 deletions pypuppetdb/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,6 @@ class Catalog(object):
corresponding report
:ivar edges: :obj:`list` of :obj:`Edge` The source Resource object\
of the relationship
:ivar resources: :obj:`dict` of :class:`pypuppetdb.types.Resource` The\
source Resource object of the relationship
:ivar environment: :obj:`string` Environment associated with the
catalog's certname
:ivar code_id: :obj:`string` ties the catalog to the Puppet code that\
Expand Down Expand Up @@ -608,7 +606,7 @@ class Edge(object):
:type source: :class:`pypuppetdb.Resource`
:param target: The target Resource object of the relationship
:type target: :class:`pypuppetdb.Resource`
:param relaptionship: Name of the Puppet Ressource Relationship
:param relationship: Name of the Puppet Resource Relationship
:type relationship: :obj:`string`
:param node: The certname of the node that owns this Relationship
:type node: :obj:`string`
Expand Down

0 comments on commit 993a073

Please sign in to comment.