Skip to content

Commit

Permalink
Update LICENSE (#170)
Browse files Browse the repository at this point in the history
* Update license information to match the changes that closed OSP-core isssue [#622](simphony/simphony-osp#622).

Authored-by: kysrpex <kysrpex@users.noreply.github.com>
Authored-by: José Manuel Domínguez <jose.manuel.dominguez@iwm.fraunhofer.de>
  • Loading branch information
create-issue-branch[bot] authored Jul 16, 2021
1 parent edd6027 commit 3ce25f9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
7 changes: 4 additions & 3 deletions LICENSE
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.
2 changes: 1 addition & 1 deletion docs/source/license.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# License
Copyright © 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. acting on behalf of its Fraunhofer IWM; Enthought, Inc.; Centre Internacional de Mètodes Numèrics a l'Enginyeria (CIMNE); University of Jyväskylä.
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

Expand Down
10 changes: 10 additions & 0 deletions docs/source/links.md
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

0 comments on commit 3ce25f9

Please sign in to comment.