Merge pull request #2 from issp-center-dev/license

change license GPLv3 -> MPL-2.0

README.md

@@ -43,7 +43,7 @@ It also offers a driver script to solve the problem with predefined optimization
 - From Source (For developers)
   1. update `pip >= 19` by `python3 -m pip install -U pip`
   2. `python3 -m pip install ODAT_SE_ROOT_DIRECTORY` to install `odatse` package and `odat-se` command
-    - `ODAT_SE_ROOT_DIRECTORY` means the directory including this `README.md` file.
+      - `ODAT_SE_ROOT_DIRECTORY` means the directory including this `README.md` file.
 
 ### Simple Usage
 
@@ -63,16 +63,14 @@ It also offers a driver script to solve the problem with predefined optimization
   - source codes of documents (manuals)
 - `tests/`
   - for automatic test
-- `LICENSE`
-  - license terms (GNU GPL v3)
 - `README.md`
   - this file
 - `pyproject.toml`
   - metadata for `ODAT-SE`
 
 ## License
 
-This package is distributed under GNU General Public License version 3 (GPL v3) or later.
+This package is distributed under [Mozilla Public License v2.0 (MPL-2.0)][MPLv2].
 
 We hope that you cite the following references when you publish the results using 2DMAT / ODAT-SE:
 "Data-analysis software framework 2DMAT and its application to experimental measurements for two-dimensional material structures",
@@ -99,12 +97,13 @@ Bibtex:
 This software was developed with the support of "*Project for advancement of software usability in materials science*" of The Institute for Solid State Physics, The University of Tokyo.
 
 [source/main]: https://github.com/issp-center-dev/ODAT-SE/
-[source/develop]: https://github.com/issp-center-dev/ODAT-SE/tree/develop
+<!-- [source/develop]: https://github.com/issp-center-dev/ODAT-SE/tree/develop -->
 [ci/main/badge]: https://github.com/issp-center-dev/ODAT-SE/workflows/Test/badge.svg?branch=main
 [ci/main/uri]: https://github.com/issp-center-dev/ODAT-SE/actions?query=branch%3Amain
 [doc/en/badge]: https://img.shields.io/badge/doc-English-blue.svg
 [doc/ja/badge]: https://img.shields.io/badge/doc-Japanese-blue.svg
 [doc/main/en/uri]: https://issp-center-dev.github.io/ODAT-SE/manual/main/en/index.html
 [doc/main/ja/uri]: https://issp-center-dev.github.io/ODAT-SE/manual/main/ja/index.html
-[doc/develop/en/uri]: https://issp-center-dev.github.io/ODAT-SE/manual/develop/en/index.html
-[doc/develop/ja/uri]: https://issp-center-dev.github.io/ODAT-SE/manual/develop/ja/index.html
+<!-- [doc/develop/en/uri]: https://issp-center-dev.github.io/ODAT-SE/manual/develop/en/index.html -->
+<!-- [doc/develop/ja/uri]: https://issp-center-dev.github.io/ODAT-SE/manual/develop/ja/index.html -->
+[MPLv2]: https://www.mozilla.org/en-US/MPL/2.0/

doc/en/source/introduction.rst

@@ -38,7 +38,7 @@ In the future, we plan to add other direct problem solvers and search algorithms
 
 License
 --------------------------------
-|  This package is distributed under GNU General Public License version 3 (GPL v3).
+|  This package is distributed under `Mozilla Public License version 2.0 (MPL-2.0) <https://www.mozilla.org/en-US/MPL/2.0/>`_.
 
 Copyright (c) <2020-> The University of Tokyo. All rights reserved.
 

doc/ja/source/introduction.rst

@@ -39,8 +39,8 @@ Open Data Analysis Tool for Science and Engineering (ODAT-SE)は、順問題ソ
 
 ライセンス
 ----------------------
-| 本ソフトウェアのプログラムパッケージおよびソースコード一式はGNU
-  General Public License version 3(GPL v3)に準じて配布されています。
+| 本ソフトウェアのプログラムパッケージおよびソースコード一式は
+  `Mozilla Public License version 2.0 (MPL-2.0) <https://www.mozilla.org/en-US/MPL/2.0/>`_ に準じて配布されています。
 
 Copyright (c) <2020-> The University of Tokyo. All rights reserved.
 

pyproject.toml

@@ -3,7 +3,7 @@ name = "ODAT-SE"
 version = "3.0-dev"
 description = "Open Data Analysis Tool for Science and Engineering"
 authors = ["2DMAT developers <[email protected]>"]
-license = "GPL-3.0-or-later"
+license = "MPL-2.0"
 
 readme = "README.md"
 repository = "https://github.com/issp-center-dev/ODAT-SE"

sample/analytical/limitation/hist2d_limitation_sample.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.colors as clr

sample/analytical/mapper/plot_colormap_2d.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import numpy as np
 import matplotlib.pyplot as plt
 

sample/analytical/minsearch/plot.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import numpy as np
 import matplotlib.pyplot as plt
 import argparse

sample/analytical/pamc/plot_result_2d.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import os.path
 import numpy as np
 import matplotlib.pyplot as plt

sample/analytical/plot_himmel.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import numpy as np
 import matplotlib.pyplot as plt
 import argparse

sample/user_function/simple.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import numpy as np
 
 import odatse

script/separateT.py

@@ -1,20 +1,12 @@
 #!/usr/bin/env python3
 
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 from sys import argv

src/odatse/__init__.py

@@ -1,18 +1,10 @@
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Pay attention to the dependencies and the order of imports!
 # For example, Runner depends on solver.

src/odatse/_info.py

@@ -1,20 +1,10 @@
-# -*- coding: utf-8 -*-
-
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from typing import MutableMapping, Optional
 from pathlib import Path

src/odatse/_initialize.py

@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: MPL-2.0
+#
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import odatse
 
 def initialize():

src/odatse/_main.py

@@ -1,18 +1,10 @@
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 import odatse

src/odatse/_runner.py

@@ -1,20 +1,10 @@
-# -*- coding: utf-8 -*-
-
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from abc import ABCMeta, abstractmethod
 

src/odatse/algorithm/__init__.py

@@ -1,18 +1,10 @@
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from ._algorithm import AlgorithmBase
 

src/odatse/algorithm/_algorithm.py

@@ -1,20 +1,10 @@
-# -*- coding: utf-8 -*-
-
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 from abc import ABCMeta, abstractmethod

src/odatse/algorithm/bayes.py

@@ -1,18 +1,10 @@
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from typing import List
 import time

src/odatse/algorithm/exchange.py

@@ -1,18 +1,10 @@
-# 2DMAT -- Data-analysis software of quantum beam diffraction experiments for 2D material structure
-# Copyright (C) 2020- The University of Tokyo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# SPDX-License-Identifier: MPL-2.0
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# ODAT-SE -- an open framework for data analysis
+# Copyright (C) 2020- The University of Tokyo
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from io import open
 import copy