Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
janssenhenning committed Feb 4, 2021
2 parents 67cecb6 + 66682a6 commit d8ba76a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
9 changes: 9 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2

python:
version: 3.7
install:
- method: pip
path: .
extra_requirements:
- docs
19 changes: 11 additions & 8 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import masci_tools
import sys
import os

Expand Down Expand Up @@ -52,17 +53,19 @@

# General information about the project.
project = u'Masci-tools'
copyright = u'2016-2018, Jens Broeder'
copyright = u'2016-2021, Forschungszentrum Jülich GmbH, PGI-1/IAS-1 Quantum Theory of Materials'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.2'

version = '.'.join(masci_tools.__version__.split('.')[:2])
# The full version, including alpha/beta/rc tags.
release = '0.2'
author = 'Jens Broeder'
release = masci_tools.__version__
author = 'The JuDFT team'


# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
Expand Down Expand Up @@ -205,7 +208,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'masci-tools.tex', u'Masci-tools Documentation',
u'Jens Broeder', 'manual'),
u'The JuDFT team', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -260,7 +263,7 @@
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'masci-tools', u'Masci-tools Documentation',
[u'Jens Broeder'], 1)
[u'The JuDFT team'], 1)
]

# If true, show URL addresses after external links.
Expand All @@ -274,7 +277,7 @@
# dir menu entry, description, category)
texinfo_documents = [
('index', 'masci-tools', u'Masci-tools Documentation',
u'Jens Broeder', 'masci-tools', 'One line description of project.',
u'The JuDFT team', 'masci-tools', 'Tools for Computational Material Science.',
'Miscellaneous'),
]

Expand Down

0 comments on commit d8ba76a

Please sign in to comment.