fixes for pypi upload

CHANGELOG.rst

@@ -1,7 +1,7 @@
 Change Log
 =============
 
-unreleased
+[1.2.0] - 2017-03-21
 --------------------
 - [CHANGED] net.line.imax_ka to net.line.max_i_ka for consistency reasons
 - [ADDED] net.line.tp_st_degree for phase shift in trafo tap changers

MANIFEST.in

@@ -1,3 +1,4 @@
 include LICENSE AUTHORS README.rst requirements.txt CHANGELOG.rst
 global-include *.p 
+global-include *.mat
 

README.rst

@@ -2,7 +2,7 @@
 pandapower
 =============
 
-.. image:: https://readthedocs.org/projects/pandapower/badge/?version=develop
+.. image:: https://readthedocs.org/projects/pandapower/badge/?version=v1.2.0
    :target: http://pandapower.readthedocs.io/en/develop/?badge=develop
    :alt: Documentation Status
 
@@ -36,7 +36,8 @@ Operation at the Fraunhofer Institute for Wind Energy and Energy System Technolo
 .. image:: http://www.energiesystemtechnik.iwes.fraunhofer.de/content/dam/iwes-neu/energiesystemtechnik/iwes_190x52.gif
    :target: http://www.energiesystemtechnik.iwes.fraunhofer.de/en.html
 
-**Element Models**
+Element Models
+---------------
 
 pandapower is an element based network calculation tools that supports the following components:
 
@@ -49,7 +50,8 @@ pandapower is an element based network calculation tools that supports the follo
 	- DC lines
 	- network equivalents (unsymmetric impedances, ward equivalents)
 
-**Network Analysis**
+Network Analysis
+------------------
 
 pandapower supports the following network analysis functions:
 
@@ -63,8 +65,8 @@ For more information, please referr to the `documentation <https://pandapower.re
 
 Installation notes can be found `here <http://pandapower.readthedocs.io/en/develop/getting_started/installation.html>`_.
 
-Interactive tutorials for a comfortable introducion into pandapower can be found `here <http://pandapower.readthedocs.io/en/develop/getting_started/tutorials.html>`_.
-    
+For a comfortable introduction into pandapower see the `interactive tutorials <http://pandapower.readthedocs.io/en/develop/getting_started/tutorials.html>`_.
+
 Minimal Example
 ===============
 
@@ -77,7 +79,8 @@ We consider the following simple 3-bus example network as a minimal example:
 		:width: 20em
 		:align: center 
 
-**Creating a Network**
+Creating a Network
+------------------------------
 
 The above network can be created in pandapower as follows: ::
     
@@ -108,7 +111,8 @@ The pandapower representation now looks like this:
 .. image:: http://www.uni-kassel.de/eecs/fileadmin/datas/fb16/Fachgebiete/energiemanagement/Software/pandapower-doc/_images/pandapower_datastructure.png
 		:width: 40em
 
-**Running a Power Flow**
+Running a Power Flow
+------------------------------
 
 A powerflow can be carried out with the `runpp function <http://www.uni-kassel.de/eecs/fileadmin/datas/fb16/Fachgebiete/energiemanagement/Software/pandapower-doc/powerflow/ac.html>`_: ::
      

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name='pandapower',
-    version='1.2.0',
+    version='1.2.1',
     author='Leon Thurner, Alexander Scheidler',
     author_email='[email protected], [email protected]',
     description='Convenient Power System Modelling and Analysis based on PYPOWER and pandas',
@@ -25,7 +25,9 @@
     license='BSD',
     install_requires=["pypower>=5.0.1",
                       "pandas>=0.17.0",
-                      "networkx"],
+                      "networkx",
+                      "numpy<1.12",
+                      "scipy"],
     packages=find_packages(),
     include_package_data=True,
     classifiers=[
@@ -43,6 +45,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Scientific/Engineering',
     ],
 )