Skip to content

Commit 36c73c4

Browse files
authored
Merge pull request #4 from sommersoft/new_docs
Improve Ref Docs
2 parents a2ad4a1 + 80b349f commit 36c73c4

File tree

9 files changed

+98
-13
lines changed

9 files changed

+98
-13
lines changed
File renamed without changes.

.travis.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ deploy:
1616
provider: releases
1717
api_key: $GITHUB_TOKEN
1818
file_glob: true
19-
file: bundles/*
19+
file: $TRAVIS_BUILD_DIR/bundles/*
2020
skip_cleanup: true
21+
overwrite: true
2122
on:
2223
tags: true
2324

2425
install:
25-
- pip install pylint circuitpython-build-tools
26+
- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme
2627

2728
script:
2829
- pylint adafruit_ds18x20.py
2930
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
3031
- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ds18x20 --library_location .
32+
- cd docs && sphinx-build -E -W -b html . _build/html

README.rst

+23-8
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ Usage Example
3636
ds18.temperature
3737
3838
39-
API Reference
40-
=============
41-
42-
.. toctree::
43-
:maxdepth: 2
44-
45-
api
46-
4739
Contributing
4840
============
4941

@@ -74,3 +66,26 @@ Then run the build:
7466
.. code-block:: shell
7567
7668
circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ds18x20 --library_location .
69+
70+
Sphinx documentation
71+
-----------------------
72+
73+
Sphinx is used to build the documentation based on rST files and comments in the code. First,
74+
install dependencies (feel free to reuse the virtual environment from above):
75+
76+
.. code-block:: shell
77+
78+
python3 -m venv .env
79+
source .env/bin/activate
80+
pip install Sphinx sphinx-rtd-theme
81+
82+
Now, once you have the virtual environment activated:
83+
84+
.. code-block:: shell
85+
86+
cd docs
87+
sphinx-build -E -W -b html . _build/html
88+
89+
This will output the documentation to ``docs/_build/html``. Open the index.html in your browser to
90+
view them. It will also (due to -W) error out on any warning like Travis will. This is a good way to
91+
locally verify it will pass.

docs/_static/favicon.ico

4.31 KB
Binary file not shown.

api.rst renamed to docs/api.rst

File renamed without changes.

conf.py renamed to docs/conf.py

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os
44
import sys
5-
sys.path.insert(0, os.path.abspath('.'))
5+
sys.path.insert(0, os.path.abspath('..'))
66

77
# -- General configuration ------------------------------------------------
88

@@ -28,7 +28,7 @@
2828
source_suffix = '.rst'
2929

3030
# The master toctree document.
31-
master_doc = 'README'
31+
master_doc = 'index'
3232

3333
# General information about the project.
3434
project = u'Adafruit DS18X20 Library'
@@ -54,7 +54,7 @@
5454
# List of patterns, relative to source directory, that match files and
5555
# directories to ignore when looking for source files.
5656
# This patterns also effect to html_static_path and html_extra_path
57-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
57+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
5858

5959
# The reST default role (used for this markup: `text`) to use for all
6060
# documents.
@@ -71,6 +71,9 @@
7171
# If true, `todo` and `todoList` produce output, else they produce nothing.
7272
todo_include_todos = False
7373

74+
# If this is True, todo emits a warning for each TODO entries. The default is False.
75+
todo_emit_warnings = True
76+
7477

7578
# -- Options for HTML output ----------------------------------------------
7679

@@ -95,6 +98,12 @@
9598
# so a file named "default.css" will overwrite the builtin "default.css".
9699
html_static_path = ['_static']
97100

101+
# The name of an image file (relative to this directory) to use as a favicon of
102+
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
103+
# pixels large.
104+
#
105+
html_favicon = '_static/favicon.ico'
106+
98107
# Output file base name for HTML help builder.
99108
htmlhelp_basename = 'AdafruitDs18x20Librarydoc'
100109

docs/examples.rst

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Simple test
2+
------------
3+
4+
Ensure your device works with this simple test.
5+
6+
.. literalinclude:: ../examples/ds18x20_simpletest.py
7+
:caption: examples/ds18x20_simpletest.py
8+
:linenos:

docs/index.rst

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
.. include:: ../README.rst
2+
3+
Table of Contents
4+
=================
5+
6+
.. toctree::
7+
:maxdepth: 4
8+
:hidden:
9+
10+
self
11+
12+
.. toctree::
13+
:caption: Examples
14+
15+
examples
16+
17+
.. toctree::
18+
:caption: API Reference
19+
:maxdepth: 3
20+
21+
api
22+
23+
.. toctree::
24+
:caption: Tutorials
25+
26+
.. toctree::
27+
:caption: Related Products
28+
29+
DS18B20 Digital temperature sensor + extras <https://www.adafruit.com/product/374>
30+
31+
Waterproof DS18B20 Digital temperature sensor + extras <https://www.adafruit.com/product/381>
32+
33+
High Temp Waterproof DS18B20 Digital temperature sensor + extras <https://www.adafruit.com/product/642>
34+
35+
.. toctree::
36+
:caption: Other Links
37+
38+
Download <https://github.com/adafruit/Adafruit_CircuitPython_DS18X20/releases/latest>
39+
CircuitPython Reference Documentation <https://circuitpython.readthedocs.io>
40+
CircuitPython Support Forum <https://forums.adafruit.com/viewforum.php?f=60>
41+
Discord Chat <https://adafru.it/discord>
42+
Adafruit Learning System <https://learn.adafruit.com>
43+
Adafruit Blog <https://blog.adafruit.com>
44+
Adafruit Store <https://www.adafruit.com>
45+
46+
Indices and tables
47+
==================
48+
49+
* :ref:`genindex`
50+
* :ref:`modindex`
51+
* :ref:`search`
File renamed without changes.

0 commit comments

Comments
 (0)