Merge pull request #614 from FlorianShepherd/develop

pandapower version tag, copyright etc for v 2.2.0
e2nIEE · Jan 17, 2020 · 8c73173 · 8c73173
2 parents 56a1cf7 + 325894a
commit 8c73173
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 25 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 by University of Kassel and Fraunhofer Institute for Energy Economics
+Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for Energy Economics
 and Energy System Technology (IEE), Kassel. All rights reserved.
 
 Lead Developers:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,26 +1,30 @@
 Change Log
 =============
+
+[2.2.0]- 2020-01-17
+----------------------
+- [ADDED] control and timeseries module
 - [ADDED] Support phasor measurement in state estimation
 - [ADDED] Support recycle in state estimation
-- [CHANGED] Unified the mesurement unit conversion of state estimation in ppc conversion
 - [ADDED] PowerModels.jl converter callable without running the PowerModels optimization
-- [ADDED] A lot of PowerModels features like network data check and different solver
-- [FIXED] Smaller Bugfixes in PowerModels conversion, OPF in general and tests
-- [CHANGED] OPF bounds and settings for gens. limits or fixed values can now be enforced. See #511
+- [ADDED] Other PowerModels features via interface callable (e.g. network data check and different solver)
+- [ADDED] toolbox function select_subnet now also copies cost data and net parameters
+- [ADDED] consideration of result tables in toolbox functions drop
+- [ADDED] new jupyter notebook examples for time series, controller and PowerModels.jl interface
+- [ADDED] reindex_buses() toolbox function
+
+- [FIXED] Bugfixes in PowerModels conversion, OPF in general and tests
 - [FIXED] renew opf_task() toolbox function which got outdated
-- [CHANGED] OPF documentation and _check_necessary_opf_parameters()
 - [FIXED] dtype at element parameter in cost tables
-- [ADDED] reindex_buses() toolbox function
-- [ADDED] toolbox function select_subnet now also copies cost data and net parameters
-- [ADDED] consideration of result tables in toolbox functions drop...
-- [ADDED] jupyter notebook examples for time series
-- [ADDED] control and timeseries module
-- [ADDED] jupyter notebook for power storage optimization with PowerModels.jl
+- [FIXED] convert_format.py: added the renaming of controller column and of the controller attributes, added tests for version 2.1.0
+
+- [CHANGED] Unified the mesurement unit conversion of state estimation in ppc conversion
+- [CHANGED] OPF bounds and settings for gens. limits or fixed values can now be enforced. See #511
+- [CHANGED] OPF documentation and _check_necessary_opf_parameters()
 - [CHANGED] JSON I/O: pandapower objects that are derived from JSONSerializableClass are now instantiated using __new__ instead of __init__ (as before), and the serialization has been adjusted; self.update_initialized(locals()) is not necessary anymore and has been removed; restore_json_objects is not needed anymore and has been removed
 - [CHANGED] column name in net.controller: "controller" -> "object"
 - [CHANGED] variable names in ContinuousTapControl ("u_set" -> "vm_set_pu") and in DiscreteTapControl ("u_lower" -> "vm_lower_pu", "u_upper" -> "vm_upper_pu")
-- [ADDED] convert_format.py: added the renaming of controller column and of the controller attributes, added tests for version 2.1.0
-- [CHANGED] __version__ is now changed to 2.1.1
+- [CHANGED] __version__ is now changed to 2.2.0
 
 [2.1.0]- 2019-07-08
 ----------------------

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 by University of Kassel and Fraunhofer Institute for for Energy Economics
+Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for for Energy Economics
 and Energy System Technology (IEE) Kassel and individual contributors (see AUTHORS file for details).
 All rights reserved.
 

diff --git a/README.rst b/README.rst
@@ -42,8 +42,7 @@
 
 
 
-pandapower combines the data analysis library `pandas <http://pandas.pydata.org>`_ and the power flow solver `PYPOWER <https://pypi.python.org/pypi/PYPOWER>`_ to create an easy to use network calculation program
-aimed at automation of analysis and optimization in power systems.
+pandapower is an easy to use network calculation program aimed to automate the analysis and optimization of power systems. It uses the data analysis library `pandas <http://pandas.pydata.org>`_ and is compatible with the commonly used MATPOWER / PYPOWER case format. pandapower allows using different solvers including an improved Newton-Raphson power flow implementation, all `PYPOWER <https://pypi.python.org/pypi/PYPOWER>`_ solvers, and the `PowerModels.jl <https://github.com/lanl-ansi/PowerModels.jl/>`_ library.
 
 More information about pandapower can be found on www.pandapower.org:
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "2.1"
+version = "2.2"
 # The full version, including alpha/beta/rc tags.
-release = "2.1.0"
+release = "2.2.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pandapower/__init__.py b/pandapower/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.1.1"
+__version__ = "2.2.0"
 
 import os
 pp_dir = os.path.dirname(os.path.realpath(__file__))

diff --git a/pandapower/estimation/algorithm/optimization.py b/pandapower/estimation/algorithm/optimization.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2018 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 from scipy.optimize import minimize

diff --git a/pandapower/test/estimation/test_opt_lp_estimation.py b/pandapower/test/estimation/test_opt_lp_estimation.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2018 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 import numpy as np

diff --git a/pandapower/test/plotting/test_generic_coordinates.py b/pandapower/test/plotting/test_generic_coordinates.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2019 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 

diff --git a/pandapower/test/test_files/save_version.py b/pandapower/test/test_files/save_version.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2018 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
 
 setup(
     name='pandapower',
-    version='2.1.0',
+    version='2.2.0',
     author='Leon Thurner, Alexander Scheidler',
     author_email='[email protected], [email protected]',
     description='Convenient Power System Modelling and Analysis based on PYPOWER and pandas',