foxes 0.5.0.1__tar.gz → 0.5.1__tar.gz

{foxes-0.5.0.1/foxes.egg-info → foxes-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.5.0.1
+Version: 0.5.1
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
 Author-email: jonas.schmidt@iwes.fraunhofer.de
@@ -38,6 +38,16 @@ Requires-Dist: nbsphinx; extra == "doc"
 Requires-Dist: ipykernel; extra == "doc"
 Requires-Dist: ipywidgets; extra == "doc"
 Requires-Dist: m2r2; extra == "doc"
+Provides-Extra: all
+Requires-Dist: windio>=1.0; extra == "all"
+Requires-Dist: flake8; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: sphinx; extra == "all"
+Requires-Dist: sphinx-immaterial; extra == "all"
+Requires-Dist: nbsphinx; extra == "all"
+Requires-Dist: ipykernel; extra == "all"
+Requires-Dist: ipywidgets; extra == "all"
+Requires-Dist: m2r2; extra == "all"
 Provides-Extra: scripts
 
 # Welcome to foxes

foxes-0.5.1/foxes/VERSION

@@ -0,0 +1 @@
+0.5.1

{foxes-0.5.0.1 → foxes-0.5.1}/foxes/input/windio/windio.py

@@ -6,15 +6,10 @@ from foxes.models import ModelBook
 from foxes.input.states import StatesTable
 from foxes.input.farm_layout import add_from_df
 from foxes.models.turbine_types import CpCtFromTwo
+from foxes.utils import import_module
 import foxes.constants as FC
 import foxes.variables as FV
 
-try:
-    from windIO.utils.yml_utils import load_yaml
-except ModuleNotFoundError:
-    def load_yaml(*args, **kwargs):
-        raise ModuleNotFoundError("Please install windio, e.g. by 'pip install windio'")
-
 def read_resource(res, fixed_vars={}, **kwargs):
     """
     Reads a WindIO energy resource
@@ -264,7 +259,8 @@ def read_case(case_yaml, site_pars={}, farm_pars={}, ana_pars={}):
     :group: input.windio
 
     """
-    case = load_yaml(case_yaml)
+    yml_utils = import_module("windIO.utils.yml_utils", hint="pip install windio")
+    case = yml_utils.load_yaml(case_yaml)
 
     site_yaml = case["site"]
     states = read_site(site_yaml, **site_pars)

{foxes-0.5.0.1 → foxes-0.5.1}/foxes/models/model_book.py

@@ -1,13 +1,6 @@
 import foxes.models as fm
 import foxes.variables as FV
 from foxes.utils import Dict
-from foxes.core import (
-    TurbineModel,
-    RotorModel,
-    FarmModel,
-    PointDataModel,
-    FarmController,
-)
 
 
 class ModelBook:

{foxes-0.5.0.1 → foxes-0.5.1}/foxes/utils/__init__.py

@@ -9,6 +9,7 @@ from .data_book import DataBook
 from .plotly_helpers import show_plotly_fig
 from .cubic_roots import cubic_roots
 from .geopandas_helpers import read_shp, shp2csv, read_shp_polygons, shp2geom2d
+from .load import import_module
 
 from . import two_circles
 from . import abl

foxes-0.5.1/foxes/utils/load.py

@@ -0,0 +1,30 @@
+import importlib
+
+def import_module(name, package=None, hint=None):
+    """
+    Imports a module dynamically.
+    
+    Parameters
+    ----------
+    name: str
+        The module name
+    package: str, optional
+        The explicit package name, deduced from name
+        if not given
+    hint: str, optional
+        Installation advice, in case the import fails
+    
+    Returns
+    -------
+    mdl: module
+        The imnported package
+    
+    :group: utils
+    
+    """
+    try:
+        return importlib.import_module(name, package)
+    except ModuleNotFoundError:
+        mdl = name if package is None else f"{package}.{name}"
+        hint = hint if hint is not None else f"pip install {name}"
+        raise ModuleNotFoundError(f"Module '{mdl}' not found, maybe try '{hint}'")

{foxes-0.5.0.1 → foxes-0.5.1/foxes.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.5.0.1
+Version: 0.5.1
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
 Author-email: jonas.schmidt@iwes.fraunhofer.de
@@ -38,6 +38,16 @@ Requires-Dist: nbsphinx; extra == "doc"
 Requires-Dist: ipykernel; extra == "doc"
 Requires-Dist: ipywidgets; extra == "doc"
 Requires-Dist: m2r2; extra == "doc"
+Provides-Extra: all
+Requires-Dist: windio>=1.0; extra == "all"
+Requires-Dist: flake8; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: sphinx; extra == "all"
+Requires-Dist: sphinx-immaterial; extra == "all"
+Requires-Dist: nbsphinx; extra == "all"
+Requires-Dist: ipykernel; extra == "all"
+Requires-Dist: ipywidgets; extra == "all"
+Requires-Dist: m2r2; extra == "all"
 Provides-Extra: scripts
 
 # Welcome to foxes

{foxes-0.5.0.1 → foxes-0.5.1}/foxes.egg-info/SOURCES.txt

@@ -213,6 +213,7 @@ foxes/utils/cubic_roots.py
 foxes/utils/data_book.py
 foxes/utils/dict.py
 foxes/utils/geopandas_helpers.py
+foxes/utils/load.py
 foxes/utils/pandas_helpers.py
 foxes/utils/plotly_helpers.py
 foxes/utils/subclasses.py

{foxes-0.5.0.1 → foxes-0.5.1}/foxes.egg-info/requires.txt

@@ -9,6 +9,17 @@ kaleido
 iwopy>=0.1.4
 pymoo>=0.6
 
+[all]
+windio>=1.0
+flake8
+pytest
+sphinx
+sphinx-immaterial
+nbsphinx
+ipykernel
+ipywidgets
+m2r2
+
 [doc]
 sphinx
 sphinx-immaterial

{foxes-0.5.0.1 → foxes-0.5.1}/setup.cfg

@@ -50,6 +50,16 @@ doc =
 	ipykernel
 	ipywidgets
 	m2r2
+all = 
+	windio>=1.0
+	flake8
+	pytest
+	sphinx
+	sphinx-immaterial
+	nbsphinx
+	ipykernel
+	ipywidgets
+	m2r2
 scripts = 
 
 [egg_info]

foxes-0.5.0.1/foxes/VERSION

@@ -1 +0,0 @@
-0.5.0.1