hestia-earth-models 0.69.1__py3-none-any.whl → 0.70.1__py3-none-any.whl

tests/models/aware/test_scarcityWeightedWaterUse.py

@@ -2,23 +2,12 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
-from hestia_earth.models.aware.scarcityWeightedWaterUse import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.aware.scarcityWeightedWaterUse import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-@patch(f"{class_path}.get_site")
-def test_should_run(mock_site):
-    # no site => no run
-    mock_site.return_value = None
-    assert not _should_run({})
-
-    # with site => run
-    mock_site.return_value = {'@type': 'Site'}
-    assert _should_run({}) is True
-
-
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/cycle/input/test_hestiaAggregatedData.py

@@ -9,6 +9,18 @@ from hestia_earth.models.cycle.input.hestiaAggregatedData import MODEL_ID, run,
 class_path = f"hestia_earth.models.cycle.input.{MODEL_ID}"
 fixtures_folder = f"{fixtures_path}/cycle/input/{MODEL_ID}"
 
+GENERIC_CROP = {'@id': 'genericCropSeed', 'name': 'Generic crop, seed'}
+
+
+def fake_search_generic(query, **args):
+    match_name = query['bool']['must'][3]['bool']['should'][0]['match']['product.term.name.keyword']
+    return [{
+        "@id": "genericCropSeed-world-2000-2009",
+        "@type": "ImpactAssessment",
+        "name": "Generic crop, seed, World, 2000-2009",
+        "endDate": "2009"
+    }] if match_name == GENERIC_CROP['name'] else []
+
 
 def test_should_run():
     cycle = {}
@@ -29,6 +41,7 @@ def test_should_run():
     assert should_run is True
 
 
+@patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
 @patch(f"{class_path}.valid_site_type", return_value=True)
 @patch(f"{class_path}.find_primary_product", return_value={})
 def test_should_run_seed(mock_primary_product, *args):
@@ -45,7 +58,8 @@ def test_should_run_seed(mock_primary_product, *args):
     assert should_run is True
 
 
-@patch(f"{class_path}.download_hestia", side_effect=fake_download)
+@patch(f"{class_path}.download_term", side_effect=fake_download)
+@patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
 @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_aggregated_search)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -58,7 +72,8 @@ def test_run(*args):
     assert result == expected
 
 
-@patch(f"{class_path}.download_hestia", side_effect=fake_download)
+@patch(f"{class_path}.download_term", side_effect=fake_download)
+@patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
 @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_aggregated_search)
 def test_run_seed(*args):
     with open(f"{fixtures_folder}/seed/cycle.jsonld", encoding='utf-8') as f:
@@ -71,20 +86,7 @@ def test_run_seed(*args):
     assert result == expected
 
 
-GENERIC_CROP = {'@id': 'genericCropSeed', 'name': 'Generic crop, seed'}
-
-
-def fake_search_generic(query, **args):
-    match_name = query['bool']['must'][3]['bool']['should'][0]['match']['product.term.name.keyword']
-    return [{
-        "@id": "genericCropSeed-world-2000-2009",
-        "@type": "ImpactAssessment",
-        "name": "Generic crop, seed, World, 2000-2009",
-        "endDate": "2009"
-    }] if match_name == GENERIC_CROP['name'] else []
-
-
-@patch(f"{class_path}.download_hestia", side_effect=fake_download)
+@patch(f"{class_path}.download_term", side_effect=fake_download)
 @patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
 @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_search_generic)
 def test_run_seed_generic(*args):

tests/models/ecoalimV9/test_cycle.py

@@ -0,0 +1,21 @@
+import os
+import json
+from unittest.mock import patch
+
+from tests.utils import fixtures_path, fake_new_emission
+from hestia_earth.models.ecoalimV9.cycle import MODEL, run
+
+class_path = f"hestia_earth.models.{MODEL}.cycle"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'cycle')
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/ecoalimV9/test_impact_assessment.py

@@ -0,0 +1,24 @@
+import os
+import json
+from unittest.mock import patch
+
+from tests.utils import fixtures_path, fake_new_indicator
+from hestia_earth.models.ecoalimV9.impact_assessment import MODEL, run
+
+class_path = f"hestia_earth.models.{MODEL}.impact_assessment"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'impact_assessment')
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(*args):
+    with open(f"{fixtures_folder}/impact.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+    with open(os.path.join(fixtures_path, MODEL, 'cycle', 'cycle.jsonld'), encoding='utf-8') as f:
+        cycle = json.load(f)
+    impact['cycle'] = cycle
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(impact)
+    assert result == expected

tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py

@@ -25,8 +25,10 @@ def test_run(mock_indicator, folder):
     with open(f"{fixtures_folder}/{folder}/impactassessment.jsonld", encoding='utf-8') as f:
         impactassessment = json.load(f)
 
-    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
+    expected = None
+    if os.path.exists(f"{fixtures_folder}/{folder}/result.jsonld"):
+        with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
+            expected = json.load(f)
 
     value = run(impactassessment)
     assert value == expected, folder

tests/models/geospatialDatabase/test_region.py

@@ -17,7 +17,7 @@ def test_should_run(mock_has_coordinates, *args):
     assert not _should_run({})
 
 
-@patch(f"{class_path}.download_hestia", side_effect=fake_download_term)
+@patch(f"{class_path}.download_term", side_effect=fake_download_term)
 @patch(f"{class_path}.download", return_value=None)
 def test_run(mock_download, *args):
     with open(f"{fixtures_path}/{MODEL}/site.jsonld", encoding='utf-8') as f:

tests/models/geospatialDatabase/test_utils.py

@@ -17,7 +17,7 @@ def test_get_region_factor():
     assert get_region_factor('croppingIntensity', site, TermTermType.LANDUSEMANAGEMENT) == 0.9999775685587958
 
 
-@patch(f"{class_path}.download_hestia", return_value={'area': AREA})
+@patch(f"{class_path}.download_term", return_value={'area': AREA})
 def test_get_area_size(*args):
     site = {'country': COUNTRY}
     assert get_area_size(site) == AREA

tests/models/haversineFormula/transport/test_distance.py

@@ -8,14 +8,14 @@ class_path = f"hestia_earth.models.{MODEL}.transport.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/transport/{MODEL_KEY}"
 
 
-def fake_download_hestia(id: str, *args):
+def fake_download_term(id: str, *args):
     return {
         'GADM-FRA': {'latitude': 46.55891593, 'longitude': 2.55355253},
         'GADM-CHN': {'latitude': 36.56069891, 'longitude': 103.8579343}
     }[id]
 
 
-@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
+@patch(f"{class_path}.download_term", side_effect=fake_download_term)
 @patch(f"{class_path}.include_methodModel", side_effect=_set_methodModel)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/{koble2014 → hestia}/test_aboveGroundCropResidue.py

@@ -2,10 +2,10 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_product
 
-from hestia_earth.models.koble2014.aboveGroundCropResidue import run, _should_run
+from hestia_earth.models.hestia.aboveGroundCropResidue import MODEL, run, _should_run
 
-class_path = 'hestia_earth.models.koble2014.aboveGroundCropResidue'
-fixtures_folder = f"{fixtures_path}/koble2014/aboveGroundCropResidue"
+class_path = f"hestia_earth.models.{MODEL}.aboveGroundCropResidue"
+fixtures_folder = f"{fixtures_path}/{MODEL}/aboveGroundCropResidue"
 
 
 @patch(f"{class_path}._is_term_type_incomplete", return_value=True)

tests/models/{cycle → hestia}/test_aboveGroundCropResidueTotal.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_product
 
-from hestia_earth.models.cycle.aboveGroundCropResidueTotal import MODEL, TERM_ID, run
+from hestia_earth.models.hestia.aboveGroundCropResidueTotal import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_brackishWater.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.brackishWater import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.brackishWater import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_cationExchangeCapacityPerKgSoil.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.cationExchangeCapacityPerKgSoil import (
+from hestia_earth.models.hestia.cationExchangeCapacityPerKgSoil import (
     MODEL, TERM_ID, run, _should_run_measurements
 )
 

tests/models/{cycle → hestia}/test_coldCarcassWeightPerHead.py

@@ -4,7 +4,7 @@ import json
 from hestia_earth.schema import TermTermType
 from tests.utils import fixtures_path, fake_new_property
 
-from hestia_earth.models.cycle.coldCarcassWeightPerHead import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.coldCarcassWeightPerHead import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_coldDressedCarcassWeightPerHead.py

@@ -4,7 +4,7 @@ import json
 from hestia_earth.schema import TermTermType
 from tests.utils import fixtures_path, fake_new_property
 
-from hestia_earth.models.cycle.coldDressedCarcassWeightPerHead import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.coldDressedCarcassWeightPerHead import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_concentrateFeed.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_property
 
-from hestia_earth.models.cycle.concentrateFeed import MODEL, _should_run, run
+from hestia_earth.models.hestia.concentrateFeed import MODEL, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.concentrateFeed"
 fixtures_folder = f"{fixtures_path}/{MODEL}/concentrateFeed"

tests/models/{cycle → hestia}/test_cropResidueManagement.py

@@ -3,7 +3,7 @@ import json
 from tests.utils import fake_new_practice, fixtures_path
 from hestia_earth.schema import TermTermType
 
-from hestia_earth.models.cycle.cropResidueManagement import MODEL, _should_run, run
+from hestia_earth.models.hestia.cropResidueManagement import MODEL, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TermTermType.CROPRESIDUEMANAGEMENT.value}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TermTermType.CROPRESIDUEMANAGEMENT.value}"

tests/models/{cycle → hestia}/test_croppingIntensity.py

@@ -3,7 +3,7 @@ import pytest
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.croppingIntensity import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.croppingIntensity import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_energyContentLowerHeatingValue.py

@@ -2,10 +2,12 @@ from unittest.mock import patch
 import json
 
 from tests.utils import fixtures_path, fake_new_property
-from hestia_earth.models.cycle.energyContentLowerHeatingValue import TERM_ID, PROPERTY_KEY, run, _should_run_input
+from hestia_earth.models.hestia.energyContentLowerHeatingValue import (
+    MODEL, TERM_ID, PROPERTY_KEY, run, _should_run_input
+)
 
-class_path = f"hestia_earth.models.cycle.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/cycle/{TERM_ID}"
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 def test_should_run_input():

tests/models/{cycle → hestia}/test_excretaKgMass.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 
 from tests.utils import fixtures_path, fake_new_product, order_list
-from hestia_earth.models.cycle.excretaKgMass import MODEL, run, _should_run
+from hestia_earth.models.hestia.excretaKgMass import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.excretaKgMass"
 fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgMass"

tests/models/{cycle → hestia}/test_excretaKgN.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 
 from tests.utils import fixtures_path, fake_new_product, order_list
-from hestia_earth.models.cycle.excretaKgN import MODEL, run, _should_run
+from hestia_earth.models.hestia.excretaKgN import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.excretaKgN"
 fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgN"

tests/models/{cycle → hestia}/test_excretaKgVs.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 
 from tests.utils import fixtures_path, fake_new_product, order_list
-from hestia_earth.models.cycle.excretaKgVs import MODEL, run, _should_run
+from hestia_earth.models.hestia.excretaKgVs import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.excretaKgVs"
 fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgVs"

tests/models/{cycle → hestia}/test_feedConversionRatio.py

@@ -3,7 +3,7 @@ import json
 from hestia_earth.schema import TermTermType
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.feedConversionRatio import MODEL, run, _should_run
+from hestia_earth.models.hestia.feedConversionRatio import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.feedConversionRatio"
 fixtures_folder = f"{fixtures_path}/{MODEL}/feedConversionRatio"

tests/models/{site → hestia}/test_flowingWater.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.flowingWater import MODEL, run, _should_run
+from hestia_earth.models.hestia.flowingWater import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.flowingWater"
 fixtures_folder = f"{fixtures_path}/{MODEL}/flowingWater"

tests/models/{site → hestia}/test_freshWater.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.freshWater import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.freshWater import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_inorganicFertiliser.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_input
 
-from hestia_earth.models.cycle.inorganicFertiliser import MODEL, MODEL_KEY, run
+from hestia_earth.models.hestia.inorganicFertiliser import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

tests/models/{cycle → hestia}/test_irrigatedTypeUnspecified.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.irrigatedTypeUnspecified import MODEL, TERM_ID, run
+from hestia_earth.models.hestia.irrigatedTypeUnspecified import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
@@ -22,11 +22,8 @@ def test_run_complete_low_irrigation(*argsm):
     with open(f"{fixtures_folder}/complete-low-irrigation/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/complete-low-irrigation/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
     value = run(cycle)
-    assert value == expected
+    assert value == []
 
 
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)

tests/models/hestia/test_landCover.py

@@ -1,6 +1,5 @@
-import csv
+import os
 import json
-import numpy as np
 import pytest
 from unittest.mock import patch
 
@@ -13,6 +12,7 @@ from hestia_earth.models.hestia.landCover import (
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 FAOSTAT_CLASS_PATH = f"hestia_earth.models.{FAOSTAT_MODEL}.utils"
 faostat_fixtures_folder = f"{fixtures_path}/{FAOSTAT_MODEL}/utils"
@@ -42,19 +42,6 @@ BRAZIL_SITE = {
 }
 
 
-def recfromcsv_mod(filename, **kwargs):
-    def rewrite_csv_as_tab(csv_name):
-        with open(csv_name, newline='') as fp:
-            for row in csv.reader(fp, delimiter=","):
-                yield "\t".join(row)
-    return np.recfromcsv(
-        rewrite_csv_as_tab(filename), delimiter="\t", encoding=None, **kwargs)
-
-
-def _download_fixture(filepath: str):
-    return recfromcsv_mod(filename=filepath)
-
-
 def test_get_changes():
     result, missing_values = get_changes(
         country_id="GADM-AFG",
@@ -232,26 +219,9 @@ def test_scale_values_to_one(dictionary, expected_result):
         assert round(v, 3) == round(expected_result[k], 3)
 
 
-@pytest.mark.parametrize(
-    "subfolder",
-    [
-        "albania_example",
-        "argentina_example",
-        "armenia_example",
-        "brazil_example",
-        "zimbabwe_example",
-        "brazil_empty_example",
-        "gbr_example",
-        "malaysia",
-        "prior_landCover",
-        "nigeria_cassava",
-        "cover_crops",
-        "missing_fao_date",
-        "iran_sistan"
-    ]
-)
+@pytest.mark.parametrize("subfolder", _folders)
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
-def test_run(mock, subfolder):
+def test_run(mock, subfolder: str):
     folder = f"{fixtures_folder}/{subfolder}"
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)

tests/models/{cycle → hestia}/test_liveAnimal.py

@@ -3,7 +3,7 @@ import json
 from hestia_earth.schema import TermTermType
 
 from tests.utils import fixtures_path, fake_new_product
-from hestia_earth.models.cycle.liveAnimal import MODEL, MODEL_KEY, run, _should_run
+from hestia_earth.models.hestia.liveAnimal import MODEL, MODEL_KEY, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

tests/models/{cycle → hestia}/test_longFallowRatio.py

@@ -3,7 +3,7 @@ import pytest
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.longFallowRatio import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.longFallowRatio import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_management.py

@@ -5,7 +5,7 @@ from unittest.mock import Mock, patch
 from hestia_earth.schema import SiteSiteType
 
 from tests.utils import fixtures_path, fake_new_management
-from hestia_earth.models.site.management import MODEL, MODEL_KEY, run
+from hestia_earth.models.hestia.management import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = os.path.join(fixtures_path, MODEL, MODEL_KEY)

tests/models/{cycle → hestia}/test_materialsAndSubstrate.py

@@ -4,7 +4,7 @@ import pytest
 from hestia_earth.utils.tools import to_precision
 
 from tests.utils import fixtures_path, fake_new_input
-from hestia_earth.models.cycle.materialAndSubstrate import MODEL, MODEL_KEY, run, calculate_value
+from hestia_earth.models.hestia.materialAndSubstrate import MODEL, MODEL_KEY, run, calculate_value
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

tests/models/{cycle → hestia}/test_milkYield.py

@@ -3,7 +3,7 @@ import json
 from hestia_earth.schema import TermTermType
 
 from tests.utils import fixtures_path, fake_new_practice
-from hestia_earth.models.cycle.milkYield import MODEL, MODEL_KEY, run, _should_run
+from hestia_earth.models.hestia.milkYield import MODEL, MODEL_KEY, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

tests/models/{site → hestia}/test_netPrimaryProduction.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.netPrimaryProduction import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.netPrimaryProduction import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_organicCarbonPerHa.py

@@ -4,7 +4,7 @@ from unittest.mock import patch
 
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicCarbonPerHa import (
+from hestia_earth.models.hestia.organicCarbonPerHa import (
     MODEL, TERM_ID, run, _cdf, _c_to_depth, _get_most_relevant_soc_node, _get_last_date
 )
 

tests/models/{site → hestia}/test_organicCarbonPerKgSoil.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicCarbonPerKgSoil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicCarbonPerKgSoil import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_organicCarbonPerM3Soil.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicCarbonPerM3Soil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicCarbonPerM3Soil import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_organicMatterPerKgSoil.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicMatterPerKgSoil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicMatterPerKgSoil import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_organicMatterPerM3Soil.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicMatterPerM3Soil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicMatterPerM3Soil import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_pastureGrass.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fake_new_practice, fixtures_path
 
-from hestia_earth.models.cycle.pastureGrass import MODEL, TERM_ID, KEY_TERM_ID, _should_run, run
+from hestia_earth.models.hestia.pastureGrass import MODEL, TERM_ID, KEY_TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_pastureSystem.py

@@ -3,7 +3,7 @@ import json
 from hestia_earth.schema import TermTermType
 
 from tests.utils import fixtures_path, fake_new_practice
-from hestia_earth.models.cycle.pastureSystem import MODEL, MODEL_KEY, run, _should_run
+from hestia_earth.models.hestia.pastureSystem import MODEL, MODEL_KEY, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

tests/models/{site → hestia}/test_potentialEvapotranspirationAnnual.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.potentialEvapotranspirationAnnual import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.potentialEvapotranspirationAnnual import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_potentialEvapotranspirationMonthly.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.potentialEvapotranspirationMonthly import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.potentialEvapotranspirationMonthly import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_precipitationAnnual.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.precipitationAnnual import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.precipitationAnnual import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"