Skip to content

Commit d03300f

Browse files
kysrpexkysrpex
committed
Revert "Merge sprint #4 (#172)"
This reverts commit 7720153
1 parent 7720153 commit d03300f

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

‎LICENSE‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
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.
2-
3-
BSD 3-Clause License
1+
BSD 3-Clause
2+
Copyright 2020 SimPhoNy OSP-core developers
43

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

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

1110
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.
1211

13-
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.
12+
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.

‎docs/source/contact.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
If you see something wrong, missing, or in need of clarification, you can directly
33
create an issue in [here](https://github.com/simphony/docs/issues).
44

5-
Any other questions, issues or comments can be directed to [Pablo de Andrés](mailto:pablo.de.andres@iwm.fraunhofer.de),
6-
[José Manuel Domínguez](mailto:jose.manuel.dominguez@iwm.fraunhofer.de) and
5+
Any other questions, issues or comments can be directed to [Pablo de Andres](mailto:pablo.de.andres@iwm.fraunhofer.de),
6+
[Jose Manuel Dominguez](mailto:jose.manuel.dominguez@iwm.fraunhofer.de) and
77
[Yoav Nahshon](mailto:yoav.nahshon@iwm.fraunhofer.de)
88
from the Materials Data Science and Informatics Team, Fraunhofer IWM.

‎docs/source/license.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# License
2-
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.
3-
4-
BSD 3-Clause License
2+
BSD 3-Clause
3+
Copyright 2020 SimPhoNy OSP-core developers.
54

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

‎docs/source/links.md‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@ OntoTRANS Horizon 2020 H2020-NMBP-TO-IND-2019 862136
3636
Some of the explanations and background provided have been adapted from Pablo de Andres'
3737
master thesis on "Natural Language Search on an ontology-based data structure".
3838

39-
The OSP-core Python package originates from the European Project
40-
[SimPhoNy](https://www.simphony-project.eu/) (Project Nr. 604005).
41-
We would like to acknowledge and thank our project partners, especially
42-
[Enthought, Inc](https://www.enthought.com/),
43-
[Centre Internacional de Mètodes Numèrics a l'Enginyeria (CIMNE)](https://cimne.com/)
44-
and the [University of Jyväskylä](https://www.jyu.fi/en), for their important
45-
contributions to some of the core concepts of OSP-core, which were originally
46-
demonstrated under the project https://github.com/simphony/simphony-common.
47-
4839
# Compatibility table
4940
The following table describes the compatibilities between of SimPhoNy docs and OSP-core.
5041

@@ -57,7 +48,6 @@ The following table describes the compatibilities between of SimPhoNy docs and O
5748
============= ==========
5849
SimPhoNy docs OSP-core
5950
============= ==========
60-
2.4.2 3.5.4
6151
2.4.1 3.5.3.1-beta
6252
2.4.0 3.5.2-beta
6353
2.3.x 3.4.0-beta

‎packageinfo.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
NAME = "simphony_docs"
2-
VERSION = "2.4.2"
2+
VERSION = "2.4.1"

0 commit comments

Comments
 (0)