Skip to content
Snippets Groups Projects
Unverified Commit d205524f authored by Daniel's avatar Daniel
Browse files

DOC: Basic structure for manual documentation.

Also amended Changelog and Readme.
parent ab0ecd7e
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Versioning support (experimental). The version db.Version class can * Versioning support (experimental). The version db.Version class can
represents particular entity versions and also the complete history of an represents particular entity versions and also the complete history of an
entity. entity.
* Automated documentation builds: `make doc`
### Changed ### ### Changed ###
......
...@@ -9,3 +9,13 @@ tox ...@@ -9,3 +9,13 @@ tox
# Code Formatting # Code Formatting
autopep8 -i -r ./ autopep8 -i -r ./
# Documentation #
Build documentation in `build/` with `make doc`.
## Requirements ##
- sphinx
- sphinx-autoapi
- recommonmark
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# You can set these variables from the command line, and also # You can set these variables from the command line, and also
# from the environment for the first two. # from the environment for the first two.
SPHINXOPTS ?= SPHINXOPTS ?= -a
SPHINXBUILD ?= sphinx-build SPHINXBUILD ?= sphinx-build
SPHINXAPIDOC ?= sphinx-apidoc SPHINXAPIDOC ?= sphinx-apidoc
PY_BASEDIR = ../caosdb PY_BASEDIR = ../caosdb
......
========================
The concepts of pycaosdb
========================
Some text...
...@@ -42,6 +42,7 @@ extensions = [ ...@@ -42,6 +42,7 @@ extensions = [
'sphinx.ext.autodoc', 'sphinx.ext.autodoc',
'sphinx.ext.intersphinx', 'sphinx.ext.intersphinx',
'sphinx.ext.napoleon', # For Google style docstrings 'sphinx.ext.napoleon', # For Google style docstrings
"recommonmark", # For markdown files.
] ]
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
...@@ -51,7 +52,7 @@ templates_path = ['_templates'] ...@@ -51,7 +52,7 @@ templates_path = ['_templates']
# You can specify multiple suffix as a list of string: # You can specify multiple suffix as a list of string:
# #
# source_suffix = ['.rst', '.md'] # source_suffix = ['.rst', '.md']
source_suffix = '.rst' # source_suffix = '.rst'
# The master toctree document. # The master toctree document.
master_doc = 'index' master_doc = 'index'
......
# Getting started with pycaosdb #
1. Install
2. import
3. enjoy
...@@ -5,6 +5,17 @@ Welcome to caosdb-pylib's documentation! ...@@ -5,6 +5,17 @@ Welcome to caosdb-pylib's documentation!
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
:caption: Contents: :caption: Contents:
:hidden:
Getting started <getting_started>
Concepts <concepts>
tutorials
API documentation<_apidoc/modules>
Welcome to the Python client library for CaosDB, ``pycaosdb``!
This documentation helps you to :doc:`get started<getting_started>`, explains the most important
:doc:`concepts<concepts>` and offers a range of :doc:`tutorials<tutorials>`.
Indices and tables Indices and tables
......
...@@ -3,7 +3,7 @@ RUN apt-get update && \ ...@@ -3,7 +3,7 @@ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
pylint3 python3-pip tox git \ pylint3 python3-pip tox git \
curl pycodestyle \ curl pycodestyle \
python3-sphinx python3-sphinx python3-recommonmark
ARG COMMIT="dev" ARG COMMIT="dev"
RUN git clone -b dev https://gitlab.com/caosdb/caosdb-pylib.git && \ RUN git clone -b dev https://gitlab.com/caosdb/caosdb-pylib.git && \
cd caosdb-pylib && git checkout $COMMIT && pip3 install . cd caosdb-pylib && git checkout $COMMIT && pip3 install .
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment