Skip to content

Commit 2af5020

Browse files
authored
Remove documentation build bugs (#204)
Boost Sphinx to 5; Remove documentation build bugs
1 parent ace426a commit 2af5020

File tree

98 files changed

+781
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+781
-529
lines changed

docs/source/_static/favicon.png

2.15 KB
Loading

docs/source/_static/logo.png

36 KB
Loading

docs/source/conf.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
# add these directories to sys.path here. If the directory is relative to the
1111
# documentation root, use os.path.abspath to make it absolute, like shown here.
1212
#
13+
import gemd
1314
import os
1415
import sys
15-
sys.path.insert(0, os.path.abspath('../../gemd'))
16+
sys.path.insert(0, os.path.abspath('../..'))
1617

1718

1819
# -- Project information -----------------------------------------------------
@@ -21,8 +22,10 @@
2122
copyright = '2020, Citrine Informatics'
2223
author = 'Citrine Informatics'
2324

24-
# The full version, including alpha/beta/rc tags
25-
release = '0.0.0'
25+
# The short X.Y version.
26+
version = gemd.__version__
27+
# The full version, including alpha/beta/rc tags.
28+
release = gemd.__version__
2629

2730

2831
# -- General configuration ---------------------------------------------------
@@ -43,8 +46,9 @@
4346
# See: https://github.com/sphinx-contrib/apidoc
4447
apidoc_module_dir = '../../gemd'
4548
apidoc_output_dir = 'reference'
46-
apidoc_excluded_paths = ['tests']
49+
apidoc_excluded_paths = ['tests', '*impl*']
4750
apidoc_separate_modules = True
51+
apidoc_toc_file = False
4852

4953
# Add any paths that contain templates here, relative to this directory.
5054
templates_path = ['_templates']
@@ -76,6 +80,9 @@
7680
# autodoc_mock_imports allows Sphinx to ignore any external modules listed in the array
7781
autodoc_mock_imports = []
7882

83+
html_favicon = '_static/favicon.png'
84+
html_logo = '_static/logo.png'
7985
html_theme_options = {
80-
"sticky_navigation": False
81-
}
86+
'sticky_navigation': False,
87+
'logo_only': True
88+
}

docs/source/depth/index.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/source/depth/unit_parsing.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ By default, Pint supports a larger set of units than the Citrine Platform.
77
Therefore, we include a custom unit definition file in gemd-python: `citrine_en.txt`_.
88
This file contains the most commonly used units and will grow over time.
99

10+
In support of common patterns in materials science, we permit including scaling factors in a unit of measure.
11+
For example, industrial researchers may have recorded historical data as ``g / 2.5 cm``.
12+
While this could be converted a simple SI expression, that would prevent researchers from representing the data
13+
as originally reported, thus creating a potential source of error during the input process.
14+
1015
Requests for support of additional units can be made by opening an issue in the `gemd-python repository`_ on github.
1116

12-
.. _Pint: https://pint.readthedocs.io/en/0.9/
17+
.. _Pint: https://pint.readthedocs.io/en/0.20/
1318
.. _citrine_en.txt: https://github.com/CitrineInformatics/gemd-python/blob/main/gemd/units/citrine_en.txt
1419
.. _GEMD-python repository: https://github.com/CitrineInformatics/gemd-python

docs/source/index.rst

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,46 @@
66
Welcome to the GEMD-Python Documentation!
77
===================================================
88

9-
``gemd`` is the Python implementation of the Citrine data model, the full documentation of which
10-
can be found `here <https://citrineinformatics.github.io/gemd-docs/>`_.
9+
This site documents the Python implementation of the Graphical Expression of Materials Data (GEMD) model.
10+
GEMD is an open source data format developed by `Citrine Informatics <https://citrine.io/>`_ for representing
11+
data in materials in a `FAIR <https://www.go-fair.org/fair-principles/>`_ and transformable manner.
12+
Documentation of the underlying data model can be found `here <https://citrineinformatics.github.io/gemd-docs/>`_.
1113

1214
To learn about the details of specific classes, please see the module index.
1315

16+
Installation
17+
------------
18+
19+
The latest release can be installed via `pip`:
20+
21+
.. code:: bash
22+
23+
pip install gemd
24+
25+
or a specific version can be installed, for example:
26+
27+
.. code:: bash
28+
29+
pip install gemd==1.17.1
30+
1431
Table of Contents
1532
-----------------
1633

1734
.. toctree::
1835
:maxdepth: 2
1936
:numbered: 4
2037

21-
depth/index
38+
depth/unit_parsing
39+
depth/serialization
2240

23-
Indices and tables
41+
Indices
2442
------------------
2543

2644
* :ref:`genindex`
2745
* :ref:`modindex`
2846
* :ref:`search`
47+
48+
.. toctree::
49+
:maxdepth: 1
50+
51+
reference/gemd

docs/source/modules.rst

Lines changed: 0 additions & 4 deletions
This file was deleted.

docs/source/setup.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

gemd/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Data concepts library."""
2-
# flake8: noqa
2+
from .__version__ import __version__ # noqa: F401
33
from .entity import Condition, Parameter, Property, PropertyAndConditions, \
44
CategoricalBounds, CompositionBounds, IntegerBounds, \
55
MolecularStructureBounds, RealBounds, \
@@ -12,7 +12,7 @@
1212
UniformInteger, DiscreteCategorical, NominalCategorical, \
1313
EmpiricalFormula, NominalComposition, InChI, Smiles, \
1414
LinkByUID, \
15-
FileLink
15+
FileLink # noqa: F401
1616

1717
__all__ = ["Condition", "Parameter", "Property", "PropertyAndConditions",
1818
"CategoricalBounds", "CompositionBounds", "IntegerBounds",

gemd/__version__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "1.18.1"

0 commit comments

Comments
 (0)