Merge pull request #2 from simphony/v2.2.0-dev

v2.2.0

Author: pablo-de-andres

.gitlab-ci.yml

@@ -0,0 +1,20 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/source/conf.py
+
+# Optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
+  - epub
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: requirements.txt

.readthedocs.yml

@@ -0,0 +1,12 @@
+BSD 3-Clause 
+Copyright 2020 SimPhoNy OSP-core developers
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE

@@ -1,13 +1,12 @@
-[![pipeline status](https://gitlab.cc-asp.fraunhofer.de/simphony/documentation/badges/master/pipeline.svg)](https://gitlab.cc-asp.fraunhofer.de/simphony/documentation/commits/master)
 
 # SimPhoNy docs
-To access the documentation, please visit: http://simphony.pages.fraunhofer.de/documentation/latest
+To access the documentation, please visit: https://simphony-docs.readthedocs.io/en/latest/
 
-If you find any error or problem with the documentation, please [create an issue](https://gitlab.cc-asp.fraunhofer.de/simphony/documentation/issues)
+If you find any error or problem with the documentation, please [create an issue](https://github.com/simphony/docs/issues)
 
 ## Local installation
 First, some requirements have to be manually installed:
-- [osp-core](https://gitlab.cc-asp.fraunhofer.de/simphony/osp-core)
+- [osp-core](https://github.com/simphony/osp-core)
 - pandoc
 - LaTeX requirements
   ```shell
@@ -21,7 +20,7 @@ First, some requirements have to be manually installed:
 
 If you want to render the documentation locally, you can run:
 ```
-python3 setup.py build_sphinx
+python3 setup.py install
 ```
 
 This will render the html and generate a LaTeX pdf (in `docs/build/latex/SimPhoNy_docs.pdf`).

README.md

@@ -1,5 +1,8 @@
 # About
-SimPhoNy is an ontology-based framework that promotes and enables interoperability between any 3rd-party software tool. It’s latest version is soon to become an open-source python project. The name ‘SimPhoNy’ stems from the SimPhoNy EU-project in which it was originally developed (See more details [here](https://www.simphony-project.eu/)). 
+SimPhoNy is an ontology-based framework that promotes and enables interoperability between any 3rd-party software tool.
+Its latest version is soon to become an open-source python project.
+The name ‘SimPhoNy’ stems from the SimPhoNy EU-project in which it was originally developed
+(See more details [here](https://www.simphony-project.eu/)). 
 One of SimPhoNy’s main tasks is to convert *opaque* data, meaning data whose semantics are hidden, to *transparent* data, that is data whose semantics is understood and easily accessible.
 
 This project aims to clarify the purpose and usage of the SimPhoNy platform through simple, short examples.
@@ -10,6 +13,20 @@ _Contact:_ [Pablo de Andres](mailto:[email protected]),
 [Yoav Nahshon](mailto:[email protected]) from 
 the Materials Data Science and Informatics team, Fraunhofer IWM.
 
+# License
+BSD 3-Clause 
+Copyright 2020 SimPhoNy OSP-core developers
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 # Terminology
 These are some of the terms used in the following sections:
 1. `API`: Application Programming Interface. A set of functions that allow the interaction with an application or system.

docs/source/_static/img/cuds2dot.png

@@ -1,5 +1,5 @@
 # API Reference
-This document is for developers of osp-core, it contians the API functions
+This document is for developers of OSP-core, it contains the API functions
 
 ## Cuds class
 ```eval_rst

docs/source/_static/img/ontology2dot.png

@@ -16,7 +16,6 @@
 author = 'Materials Data Science and Informatics team at Fraunhofer IWM'
 
 # -- General configuration ---------------------------------------------------
-
 extensions = [
     'recommonmark',  # md
     'sphinx.ext.autodoc',  # API ref
@@ -30,7 +29,10 @@
     'sphinx.ext.autosectionlabel',  # Auto-generate section labels.
 ]
 
+master_doc = 'index'
+
 plantuml = 'java -jar lib/plantuml.jar'
+plantuml_output_format = 'svg_img'
 
 templates_path = ['_templates']
 
@@ -46,18 +48,6 @@
 html_favicon = '_static/img/simphony_favicon.png'
 html_logo = '_static/img/simphony_logo_light.png'
 html_static_path = ['_static']
-html_js_files = [
-    'version_links.js',
-]
-
-html_context = {
-    "gitlab_host": "gitlab.cc-asp.fraunhofer.de",
-    "display_gitlab": True, # Integrate Gitlab
-    "gitlab_user": "simphony", # Username
-    "gitlab_repo": "documentation", # Repo name
-    "gitlab_version": "master", # Version
-    "conf_py_path": "/docs/source/", # Path in the checkout to the docs root
-}
 
 
 # -- Options for LaTeX output -------------------------------------------------