Fix license inconsistency (#79)

vezeli · birgits · commit 55f26c1415ec · 2019-11-18T08:41:20.000+01:00
* Fix license inconsistency

* Add SPDX licence information to each file

* Add dual license for examples (tutorials)
diff --git a/example/modelchain_example.ipynb b/example/modelchain_example.ipynb
@@ -1,5 +1,16 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>\n",
+    "\n",
+    "SPDX-License-Identifier: MIT\n",
+    "\n",
+    "SPDX-License-Identifier: CC-BY-4.0"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -25,9 +36,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__copyright__ = \"Copyright oemof developer group\"\n",
-    "__license__ = \"GPLv3\"\n",
-    "\n",
     "import os\n",
     "import pandas as pd\n",
     "\n",
@@ -567,7 +575,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.7"
+   "version": "3.6.8"
   }
  },
  "nbformat": 4,
diff --git a/example/modelchain_example.py b/example/modelchain_example.py
@@ -10,12 +10,9 @@
 you need to specify your wind turbine, and in the last step call the
 windpowerlib functions to calculate the feed-in time series.
 
-
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import os
 import pandas as pd
 
diff --git a/example/test_examples.py b/example/test_examples.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import os
 import subprocess
 import tempfile
diff --git a/example/turbine_cluster_modelchain_example.ipynb b/example/turbine_cluster_modelchain_example.ipynb
@@ -1,5 +1,16 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>\n",
+    "\n",
+    "SPDX-License-Identifier: MIT\n",
+    "\n",
+    "SPDX-License-Identifier: CC-BY-4.0"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -26,9 +37,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__copyright__ = \"Copyright oemof developer group\"\n",
-    "__license__ = \"GPLv3\"\n",
-    "\n",
     "import pandas as pd\n",
     "\n",
     "import modelchain_example as mc_e\n",
@@ -342,7 +350,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.7"
+   "version": "3.6.8"
   }
  },
  "nbformat": 4,
diff --git a/example/turbine_cluster_modelchain_example.py b/example/turbine_cluster_modelchain_example.py
@@ -7,11 +7,9 @@
 Functions that are used in the ``modelchain_example``, like the initialization
 of wind turbines, are imported and used without further explanations.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import pandas as pd
 
 try:
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@ def read(fname):
       url='http://github.com/wind-python/windpowerlib',
       author='oemof developer group',
       author_email='windpowerlib@rl-institut.de',
-      license=None,
+      license='MIT',
       packages=['windpowerlib'],
       package_data={
           'windpowerlib': [os.path.join('data', '*.csv'),
diff --git a/tests/test_density.py b/tests/test_density.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 import numpy as np
 from pandas.util.testing import assert_series_equal
diff --git a/tests/test_modelchain.py b/tests/test_modelchain.py
@@ -1,10 +1,9 @@
 """
 Testing the ``modelchain`` module.
-"""
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
 import pandas as pd
 import numpy as np
 import pytest
@@ -341,4 +340,4 @@ def test_modelchain_with_power_coefficient_curve_as_dict(self):
         test_mc = mc.ModelChain(wt.WindTurbine(**my_turbine),
                                 power_output_model='power_coefficient_curve')
         test_mc.run_model(self.weather_df)
-        assert_series_equal(test_mc.power_output, power_output_exp)
+        assert_series_equal(test_mc.power_output, power_output_exp)
diff --git a/tests/test_power_curves.py b/tests/test_power_curves.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 import numpy as np
 import pytest
diff --git a/tests/test_power_output.py b/tests/test_power_output.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 import numpy as np
 import pytest
diff --git a/tests/test_temperature.py b/tests/test_temperature.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 import numpy as np
 from pandas.util.testing import assert_series_equal
diff --git a/tests/test_tools.py b/tests/test_tools.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 from pandas.util.testing import assert_series_equal
 
diff --git a/tests/test_turbine_cluster_modelchain.py b/tests/test_turbine_cluster_modelchain.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pytest
 import pandas as pd
 import numpy as np
diff --git a/tests/test_wake_losses.py b/tests/test_wake_losses.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 import numpy as np
 import pytest
diff --git a/tests/test_wind_farm.py b/tests/test_wind_farm.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pytest
 import pandas as pd
 import numpy as np
diff --git a/tests/test_wind_speed.py b/tests/test_wind_speed.py
@@ -1,3 +1,8 @@
+"""
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
+
 import pandas as pd
 import numpy as np
 import pytest
diff --git a/tests/test_wind_turbine.py b/tests/test_wind_turbine.py
@@ -1,9 +1,9 @@
 """
 Testing the wind_turbine module.
-"""
 
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
+"""
 
 import pytest
 import os
diff --git a/windpowerlib/__init__.py b/windpowerlib/__init__.py
@@ -1,5 +1,5 @@
 __copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
+__license__ = "MIT"
 __version__ = '0.2.1dev'
 
 from windpowerlib.wind_turbine import WindTurbine
diff --git a/windpowerlib/density.py b/windpowerlib/density.py
@@ -2,11 +2,10 @@
 The ``density`` module contains functions to calculate the density and
 temperature at hub height of a wind turbine.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
 
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 
 def barometric(pressure, pressure_height, hub_height, temperature_hub_height):
     r"""
diff --git a/windpowerlib/modelchain.py b/windpowerlib/modelchain.py
@@ -3,11 +3,9 @@
 windpowerlib. This module makes it easy to get started with the windpowerlib
 and demonstrates standard ways to use the library.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import logging
 from windpowerlib import (wind_speed, density, temperature, power_output,
                           tools)
diff --git a/windpowerlib/power_curves.py b/windpowerlib/power_curves.py
@@ -3,11 +3,9 @@
 power curve smoothing or reducing power values by an efficiency to the power
 curve of a wind turbine, wind farm or wind turbine cluster.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import numpy as np
 import pandas as pd
 from windpowerlib import tools
diff --git a/windpowerlib/power_output.py b/windpowerlib/power_output.py
@@ -2,11 +2,9 @@
 The ``power_output`` module contains functions to calculate the power output
 of a wind turbine.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import numpy as np
 import pandas as pd
 
diff --git a/windpowerlib/temperature.py b/windpowerlib/temperature.py
@@ -2,11 +2,10 @@
 The ``temperature`` module contains functions to calculate the temperature at
 hub height of a wind turbine.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
 
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 
 def linear_gradient(temperature, temperature_height, hub_height):
     r"""
diff --git a/windpowerlib/tools.py b/windpowerlib/tools.py
@@ -2,12 +2,9 @@
 The ``tools`` module contains a collection of helper functions used in the
 windpowerlib.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import numpy as np
 import warnings
 
diff --git a/windpowerlib/turbine_cluster_modelchain.py b/windpowerlib/turbine_cluster_modelchain.py
@@ -4,11 +4,9 @@
 and shows use cases for the power output calculation of wind farms and wind
 turbine clusters.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import logging
 from windpowerlib import wake_losses
 from windpowerlib.modelchain import ModelChain
diff --git a/windpowerlib/wake_losses.py b/windpowerlib/wake_losses.py
@@ -2,11 +2,9 @@
 The ``wake_losses`` module contains functions for modelling wake losses by wind
 efficiency curves (reduction of wind speed).
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import numpy as np
 import pandas as pd
 import os
diff --git a/windpowerlib/wind_farm.py b/windpowerlib/wind_farm.py
@@ -3,11 +3,9 @@
 a wind farm in the windpowerlib and functions needed for the modelling of a
 wind farm.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 from windpowerlib import tools, power_curves, WindTurbine
 import numpy as np
 import pandas as pd
diff --git a/windpowerlib/wind_speed.py b/windpowerlib/wind_speed.py
@@ -2,11 +2,9 @@
 The ``wind_speed`` module contains functions to calculate the wind speed at
 hub height of a wind turbine.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import numpy as np
 import pandas as pd
 
diff --git a/windpowerlib/wind_turbine.py b/windpowerlib/wind_turbine.py
@@ -3,11 +3,9 @@
 a wind turbine in the windpowerlib and functions needed for the modelling of a
 wind turbine.
 
+SPDX-FileCopyrightText: 2019 oemof developer group <contact@oemof.org>
+SPDX-License-Identifier: MIT
 """
-
-__copyright__ = "Copyright oemof developer group"
-__license__ = "GPLv3"
-
 import pandas as pd
 import logging
 import warnings
diff --git a/windpowerlib/wind_turbine_cluster.py b/windpowerlib/wind_turbine_cluster.py
