From 2f7f4cae9c51f06ae7eab14b37d58cbbe6924694 Mon Sep 17 00:00:00 2001
From: Laurent COLBOIS <laurent.colbois@idiap.ch>
Date: Fri, 9 Jul 2021 16:22:49 +0200
Subject: [PATCH] Update to custom license
---
LICENSE | 27 ---------------------------
LICENSE.txt | 14 ++++++++++++++
MANIFEST.in | 2 +-
README.rst | 9 +++------
setup.py | 3 +--
5 files changed, 19 insertions(+), 36 deletions(-)
delete mode 100644 LICENSE
create mode 100644 LICENSE.txt
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 78851f7..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2021 Idiap Research Institute, http://www.idiap.ch/
-Written by Laurent Colbois <laurent.colbois@idiap.ch>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-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
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..121f6f9
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,14 @@
+License - for Non-Commercial Research and Educational Use Only
+
+Copyright (c) 2021, Idiap research institute
+
+All rights reserved.
+
+Run, copy, study, change, improve and redistribute source and binary forms, with or without modification, are permitted for non-commercial research and educational use only provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+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.
+
+For any questions regarding this license agreement, please contact Idiap's Technology Transfer Office at tto@idiap.ch
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index 17576b6..83c8f63 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README.rst buildout.cfg LICENSE version.txt requirements.txt
+include README.rst buildout.cfg LICENSE.txt version.txt requirements.txt
recursive-include doc *.rst *.png *.ico *.txt
\ No newline at end of file
diff --git a/README.rst b/README.rst
index bba7407..af391fe 100644
--- a/README.rst
+++ b/README.rst
@@ -44,14 +44,11 @@ It mainly contains tools to perform the following operations:
If you use this package and/or its results, please consider citing the paper.
-License and usage
------------------
+License
+-------
-This package is released under the `BSD-3 license <https://gitlab.idiap.ch/bob/bob.paper.ijcb2021_synthetic_dataset/-/blob/master/LICENSE>`_. It makes uses of some components from the
+This package is released under a custom `license <https://gitlab.idiap.ch/bob/bob.paper.ijcb2021_synthetic_dataset/-/blob/master/LICENSE.txt>`_. It makes uses of some components from the
`official release of the StyleGAN2 model <https://github.com/NVlabs/stylegan2>`_, which is itself released under the `Nvidia Source Code License-NC <https://gitlab.idiap.ch/bob/bob.paper.ijcb2021_synthetic_dataset/-/blob/master/bob/paper/ijcb2021_synthetic_dataset/stylegan2/LICENSE.txt>`_.
-Make sure to consider limitations induced by *both* licenses when reusing this work.
-Mainly, the StyleGAN2 code base can only be used for *research and evaluation purpose only*, therefore this project
-itself cannot be used for anything else.
Installation
------------
diff --git a/setup.py b/setup.py
index f7a2125..5aead4e 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ setup(
description='Generation of synthetic face recognition datasets by exploiting StyleGAN2 latent structure',
url='https://gitlab.idiap.ch/bob/bob.paper.ijcb2021_synthetic_dataset',
- license='BSD',
+ license='Custom',
# there may be multiple authors (separate entries by comma)
author='Laurent Colbois',
@@ -71,7 +71,6 @@ setup(
'Framework :: Bob',
'Development Status :: 4 - Beta',
'Intended Audience :: Science/Research',
- 'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
--
GitLab