Skip to content

Commit d4496ad

Browse files
Merge pull request #38 from simphony/dev
* Update to v3.3.9 * updated the ontology documentation * updated entity names and imports in markdown files * updated notebooks * update ontology2dot image * `nbconvert --execute` requires the jupyter_client package: `pip install jupyter_client` Fixes #16 * updated nbsphinx_kernel_name in conf.py * updated requirements * Add JSON schema of serialized CUDS objects to docs Fixes #21 * added missing files * Document yaml2camelcase Fixes #25 * Updated link to RTD * renamed openapi folder * added CI action * updated CI file * added wheel to requirements * moved wheel to CI file * added rtd theme to req * added pandoc * added latexmk * split dependencies * split dependencies * conf file for create-issue-branch * updated paths * added pico conflict notes * added notes, hints and warning boxes * Added wrapper_dev tutorial * Reorganised the docs * Reorganised wrapper section * Update pico and installation (#34) * updated pico uninstall all * Updated installation notes * Added badges (#40) * osp-core is open source * standalone section for installation * added conda to installation * removed references to pickle * Fixed typo in tutorial * Added note on tutorial download * updated cuba.class references * updated namespace import * updated CI * updated graph * add vector notes, rename ontologies included * notes on json serialisation * added contact section, minor fixes Co-authored-by: Matthias Urban <[email protected]> Co-authored-by: Matthias Urban <[email protected]>
2 parents 1470d48 + dfcdd9a commit d4496ad

31 files changed

+1921
-923
lines changed

.github/issue-branch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mode: chatops

.github/workflows/ci.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Test build
2+
3+
on: pull_request
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Set up Python 3.7
13+
uses: actions/setup-python@v2
14+
with:
15+
python-version: 3.7
16+
- name: Install OS dependencies
17+
run: |
18+
sudo apt-get update
19+
sudo apt-get install pandoc latexmk
20+
sudo apt-get install texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
21+
- name: Install python dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install wheel
25+
pip install -r requirements.txt
26+
- name: Build docs
27+
run: python setup.py install

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
## Build Status
2+
**latest** - [![Documentation latest](https://readthedocs.org/projects/simphony/badge/?version=latest)](https://simphony.readthedocs.io/en/latest/?badge=latest)
3+
**dev** - [![Documentation dev](https://readthedocs.org/projects/simphony/badge/?version=dev)](https://simphony.readthedocs.io/en/latest/?badge=dev)
14

25
# SimPhoNy docs
3-
To access the documentation, please visit: https://simphony-docs.readthedocs.io/en/latest/
6+
To access the documentation, please visit: https://simphony.readthedocs.io/en/latest/
47

58
If you find any error or problem with the documentation, please [create an issue](https://github.com/simphony/docs/issues)
69

-1 KB
Loading

docs/source/about.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# About
2+
23
SimPhoNy is an ontology-based framework that promotes and enables interoperability between any 3rd-party software tool.
3-
Its latest version is soon to become an open-source python project.
4+
Its [core functionality](https://github.com/simphony/osp-core) is an open-source python project.
45
The name ‘SimPhoNy’ stems from the SimPhoNy EU-project in which it was originally developed
56
(See more details [here](https://www.simphony-project.eu/)).
67
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.
78

89
This project aims to clarify the purpose and usage of the SimPhoNy platform through simple, short examples.
910
In particular, this guide will try to expose the main concepts and components.
1011

11-
_Contact:_ [Pablo de Andres](mailto:[email protected]),
12-
[Matthias Urban](mailto:[email protected]) and
13-
[Yoav Nahshon](mailto:[email protected]) from
14-
the Materials Data Science and Informatics team, Fraunhofer IWM.
12+
All the tutorials in this documentation are Jupyter notebooks that can be downloaded
13+
by clicking on the "Edit on Github" button on the top right of the page.
1514

1615
# License
17-
BSD 3-Clause
18-
Copyright 2020 SimPhoNy OSP-core developers
16+
BSD 3-Clause
17+
Copyright 2020 SimPhoNy OSP-core developers.
1918

2019
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
2120

@@ -44,7 +43,7 @@ These are some of the terms used in the following sections:
4443
1. `individual`: an instance of a class. E.g., an instance of the class 'City' can be used to represent the city of Freiburg in which case it would have the attribute 'name' with the value 'Freiburg'.
4544
1. `relationship`: a type of a way in which one individual relates to another. E.g., 'Has-A' which could use to form the relationship 'Freiburg (City) Has-A Dreisam (River)'.
4645
1. `entity`: a general term that can refer to a class, a relationship, attribute, or an individual. E.g., 'City', 'name', 'Has-A', the Freiburg individual are all entities.
47-
1. `namespace`: an ontology identifier. E.g., 'CITY_ONTOLOGY' which could be used as a namespace for the ontology that consists of the entities 'City', 'name' and 'Has-A'.
46+
1. `namespace`: an ontology identifier. E.g., 'city_ontology' which could be used as a namespace for the ontology that consists of the entities 'City', 'name' and 'Has-A'.
4847
- Each entity is uniquely identified by its name and the namespace it is contained in. We call \<namespace name\>.\<entity name\> the `qualified entity name`.
4948
1. `CUDS`: Common Universal Data Structure. A data structure that is used to uniformly represent ontology concepts in programming code.
5049
- CUDS exposes an API that provides CRUD (Create, Read, Update and Delete) functionalities.

docs/source/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
'nbsphinx', # Jupyter
2828
'IPython.sphinxext.ipython_console_highlighting', # Jupyter - Syntax highlight workaround
2929
'sphinx.ext.autosectionlabel', # Auto-generate section labels.
30+
'sphinx-jsonschema' # Generate JSON schema for serialized CUDS
3031
]
3132

3233
master_doc = 'index'
@@ -75,3 +76,6 @@ def setup(app):
7576
# 'enable_auto_doc_ref': True,
7677
}, True)
7778
app.add_transform(AutoStructify)
79+
80+
81+
nbsphinx_allow_errors = True

docs/source/contact.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Contact
2+
If you see something wrong, missing, or in need of clarification, you can directly
3+
create an issue in [here](https://github.com/simphony/docs/issues).
4+
5+
Any other questions, issues or comments can be directed to [Pablo de Andres](mailto:[email protected]),
6+
[Matthias Urban](mailto:[email protected]) and
7+
[Yoav Nahshon](mailto:[email protected])
8+
from the Materials Data Science and Informatics team, Fraunhofer IWM.

0 commit comments

Comments
 (0)