Merge pull request #37 from FRESNA/v0.4.8

v0.4.8

powerplantmatching/__init__.py

@@ -24,7 +24,7 @@
 
 from __future__ import absolute_import
 
-__version__ = "0.4.7"
+__version__ = "0.4.8"
 __author__ = "Fabian Hofmann, Jonas Hoersch, Fabian Gotzens"
 __copyright__ = "Copyright 2017-2020 Frankfurt Institute for Advanced Studies"
 # The rough hierarchy of this package is

powerplantmatching/core.py

@@ -85,7 +85,7 @@ def get_config(filename=None, **overrides):
         The configuration dictionary
     """
     from hashlib import sha1
-    from base64 import encodestring
+    from base64 import encodebytes
     from six.moves import cPickle
     import yaml
     from logging import info
@@ -104,7 +104,7 @@ def get_config(filename=None, **overrides):
     if len(dict(**overrides)) == 0:
         config['hash'] = 'default'
     else:
-        config['hash'] = encodestring(sha1digest).decode('ascii')[2:12]
+        config['hash'] = encodebytes(sha1digest).decode('ascii')[2:12]
 
     if not isdir(_data_out('.', config=config)):
         makedirs(abspath(_data_out('.', config=config)))

powerplantmatching/package_data/config.yaml

@@ -30,7 +30,7 @@ process_limit: 2
 remove_missing_coords: true
 
 #already build data
-matched_data_url: https://raw.githubusercontent.com/FRESNA/powerplantmatching/v0.4.7/powerplants.csv
+matched_data_url: https://raw.githubusercontent.com/FRESNA/powerplantmatching/v0.4.8/powerplants.csv
 
 #data config
 BNETZA:

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='powerplantmatching',
-    version='0.4.7',
+    version='0.4.8',
     author='Fabian Hofmann (FIAS), Jonas Hoersch (KIT), Fabian Gotzens (FZ Jülich)',
     author_email='[email protected]',
     description='Toolset for generating and managing Power Plant Data',