Merge branch 'master' of github.com:reegis/reegis

reegis · Sep 10, 2019 · 4b9c018 · 4b9c018
2 parents 3fc2c71 + e6163ea
commit 4b9c018
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/reegis/config.py b/reegis/config.py
@@ -200,7 +200,8 @@ def set_reegis_paths(paths=None):
         logging.debug("Set default path for data path: {0}".format(datapath))
     cfg.set('paths', 'local_root', datapath)
 
-    if IMPORTER != os.path.join(os.path.dirname(__file__)):
+    if (IMPORTER != os.path.join(os.path.dirname(__file__))
+            and IMPORTER is not None):
         importer_name = IMPORTER.split(os.sep)[-1]
         cfg.set('paths', '{0}'.format(importer_name), IMPORTER)
 

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
         'owslib',
         'pyproj',
         'pytz',
-        'windpowerlib@https://github.com/wind-python/windpowerlib/archive/refactor_v0.2.0_branch.zip',
+        'windpowerlib@https://github.com/wind-python/windpowerlib/archive/dev.zip',
         'python-dateutil',
         'networkx',
         'dill',