From a2fdb8346f7faa36c8320f305975d827497cf93a Mon Sep 17 00:00:00 2001 From: "create-issue-branch[bot]" <53036503+create-issue-branch[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 14:09:50 +0200 Subject: [PATCH 1/3] Update LICENSE file (#164) * Update `license.md`. --- docs/source/contact.md | 4 ++-- docs/source/license.md | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/source/contact.md b/docs/source/contact.md index 3003224..8f51a83 100644 --- a/docs/source/contact.md +++ b/docs/source/contact.md @@ -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. diff --git a/docs/source/license.md b/docs/source/license.md index 2996731..17eeb10 100644 --- a/docs/source/license.md +++ b/docs/source/license.md @@ -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; Enthought, Inc.; Centre Internacional de Mètodes Numèrics a l'Enginyeria (CIMNE); University of Jyväskylä. + +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: From edd6027fd25bc2c5fc5e9018e298d0101db509e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= <43052541+kysrpex@users.noreply.github.com> Date: Fri, 16 Jul 2021 09:57:06 +0200 Subject: [PATCH 2/3] Bump docs version to 2.4.2 (#171) --- packageinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageinfo.py b/packageinfo.py index 163873d..030863a 100644 --- a/packageinfo.py +++ b/packageinfo.py @@ -1,2 +1,2 @@ NAME = "simphony_docs" -VERSION = "2.4.1" +VERSION = "2.4.2" From 3ce25f9bee1f22c7aae38163cc64c96861813503 Mon Sep 17 00:00:00 2001 From: "create-issue-branch[bot]" <53036503+create-issue-branch[bot]@users.noreply.github.com> Date: Fri, 16 Jul 2021 11:35:06 +0200 Subject: [PATCH 3/3] Update LICENSE (#170) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update license information to match the changes that closed OSP-core isssue [#622](https://github.com/simphony/osp-core/issues/622). Authored-by: kysrpex Authored-by: José Manuel Domínguez --- LICENSE | 7 ++++--- docs/source/license.md | 2 +- docs/source/links.md | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 2dda92c..84aa8be 100644 --- a/LICENSE +++ b/LICENSE @@ -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: @@ -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. \ No newline at end of file +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. diff --git a/docs/source/license.md b/docs/source/license.md index 17eeb10..466549e 100644 --- a/docs/source/license.md +++ b/docs/source/license.md @@ -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 diff --git a/docs/source/links.md b/docs/source/links.md index 2f76edc..e49d1ae 100644 --- a/docs/source/links.md +++ b/docs/source/links.md @@ -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. @@ -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