Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge sprint #4 #172

Merged
merged 3 commits into from
Jul 16, 2021
Merged

Merge sprint #4 #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2fdb83
Update LICENSE file (#164)
create-issue-branch[bot] Jun 2, 2021
edd6027
Bump docs version to 2.4.2 (#171)
kysrpex Jul 16, 2021
3ce25f9
Update LICENSE (#170)
create-issue-branch[bot] Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
BSD 3-Clause
Copyright 2020 SimPhoNy OSP-core developers
Copyright © 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. acting on behalf of its Fraunhofer IWM. Contact: Pablo de Andrés, José Manuel Domínguez, Yoav Nahshon.

BSD 3-Clause License

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

Expand All @@ -9,4 +10,4 @@ Redistribution and use in source and binary forms, with or without modification,

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.
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.
4 changes: 2 additions & 2 deletions docs/source/contact.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
If you see something wrong, missing, or in need of clarification, you can directly
create an issue in [here](https://github.com/simphony/docs/issues).

Any other questions, issues or comments can be directed to [Pablo de Andres](mailto:pablo.de.andres@iwm.fraunhofer.de),
[Jose Manuel Dominguez](mailto:jose.manuel.dominguez@iwm.fraunhofer.de) and
Any other questions, issues or comments can be directed to [Pablo de Andrés](mailto:pablo.de.andres@iwm.fraunhofer.de),
[José Manuel Domínguez](mailto:jose.manuel.dominguez@iwm.fraunhofer.de) and
[Yoav Nahshon](mailto:yoav.nahshon@iwm.fraunhofer.de)
from the Materials Data Science and Informatics Team, Fraunhofer IWM.
5 changes: 3 additions & 2 deletions docs/source/license.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# License
BSD 3-Clause
Copyright 2020 SimPhoNy OSP-core developers.
Copyright © 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. acting on behalf of its Fraunhofer IWM. Contact: Pablo de Andrés, José Manuel Domínguez, Yoav Nahshon.

BSD 3-Clause License

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

Expand Down
10 changes: 10 additions & 0 deletions docs/source/links.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ OntoTRANS Horizon 2020 H2020-NMBP-TO-IND-2019 862136
Some of the explanations and background provided have been adapted from Pablo de Andres'
master thesis on "Natural Language Search on an ontology-based data structure".

The OSP-core Python package originates from the European Project
[SimPhoNy](https://www.simphony-project.eu/) (Project Nr. 604005).
We would like to acknowledge and thank our project partners, especially
[Enthought, Inc](https://www.enthought.com/),
[Centre Internacional de Mètodes Numèrics a l'Enginyeria (CIMNE)](https://cimne.com/)
and the [University of Jyväskylä](https://www.jyu.fi/en), for their important
contributions to some of the core concepts of OSP-core, which were originally
demonstrated under the project https://github.com/simphony/simphony-common.

# Compatibility table
The following table describes the compatibilities between of SimPhoNy docs and OSP-core.

Expand All @@ -48,6 +57,7 @@ The following table describes the compatibilities between of SimPhoNy docs and O
============= ==========
SimPhoNy docs OSP-core
============= ==========
2.4.2 3.5.4
2.4.1 3.5.3.1-beta
2.4.0 3.5.2-beta
2.3.x 3.4.0-beta
Expand Down
2 changes: 1 addition & 1 deletion packageinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NAME = "simphony_docs"
VERSION = "2.4.1"
VERSION = "2.4.2"