hestia-earth-models 0.47.5__py3-none-any.whl → 0.49.0__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py

@@ -56,7 +56,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     single_crop_product=single_crop_product,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete, single_crop_product])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py

@@ -56,7 +56,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     single_crop_product=single_crop_product,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete, single_crop_product])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

hestia_earth/models/pooreNemecek2018/saplings.py

@@ -50,7 +50,7 @@ def _should_run(cycle: dict):
     term_type_incomplete = _is_term_type_incomplete(cycle, TERM_ID)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_other_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py

@@ -55,7 +55,7 @@ def _run(measurements: list):
     return measurement(value, depthUpper=depthUpper, depthLower=depthLower)
 
 
-def _should_run(site: dict, measurements: list):
+def _should_run_measurements(site: dict, measurements: list):
     clayContent = find_term_match(measurements, 'clayContent', None)
     soilPh = find_term_match(measurements, 'soilPh', None)
     organicCarbonPerKgSoil = find_term_match(measurements, 'organicCarbonPerKgSoil', None)
@@ -72,12 +72,17 @@ def _should_run(site: dict, measurements: list):
                     **depth_logs)
 
     should_run = all([clayContent is not None, soilPh is not None, organicCarbonPerKgSoil is not None])
-    logShouldRun(site, MODEL, TERM_ID, should_run)
     return should_run
 
 
+def _should_run(site: dict):
+    grouped_measurements = list(group_measurements_by_depth(site.get('measurements', [])).values())
+    values = [(measurements, _should_run_measurements(site, measurements)) for measurements in grouped_measurements]
+    should_run = any([_should_run for measurements, _should_run in values])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+    return should_run, [measurements for measurements, _should_run in values if _should_run]
+
+
 def run(site: dict):
-    grouped_measurements = list(group_measurements_by_depth(site.get('measurements', []), include_dates=False).values())
-    return [
-        _run(measurements) for measurements in grouped_measurements if _should_run(site, measurements)
-    ]
+    should_run, values = _should_run(site)
+    return list(map(_run, values)) if should_run else []

hestia_earth/models/site/organicCarbonPerHa.py

@@ -2,7 +2,9 @@ from hestia_earth.schema import MeasurementStatsDefinition, MeasurementMethodCla
 from hestia_earth.utils.model import find_term_match
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.measurement import _new_measurement, group_measurements_by_depth, measurement_value
+from hestia_earth.models.utils.measurement import (
+    _new_measurement, group_measurements_by_depth, _group_measurement_key, measurement_value
+)
 from . import MODEL
 
 REQUIREMENTS = {
@@ -51,7 +53,7 @@ def _run(measurements: list):
     return measurement(value, depthUpper, depthLower)
 
 
-def _should_run(site: dict, measurements: list):
+def _should_run_measurements(site: dict, measurements: list):
     soilBulkDensity = find_term_match(measurements, 'soilBulkDensity', None)
     has_soilBulkDensity_depthLower = (soilBulkDensity or {}).get('depthLower') is not None
     has_soilBulkDensity_depthUpper = (soilBulkDensity or {}).get('depthUpper') is not None
@@ -59,24 +61,39 @@ def _should_run(site: dict, measurements: list):
     has_organicCarbonPerKgSoil_depthLower = (organicCarbonPerKgSoil or {}).get('depthLower') is not None
     has_organicCarbonPerKgSoil_depthUpper = (organicCarbonPerKgSoil or {}).get('depthUpper') is not None
 
+    depth_logs = {
+        _group_measurement_key(measurements[0], include_dates=False): ';'.join([
+            '_'.join([
+                'id:soilBulkDensity',
+                f"hasDepthLower:{has_soilBulkDensity_depthLower}",
+                f"hasDepthUpper:{has_soilBulkDensity_depthUpper}"
+            ]),
+            '_'.join([
+                'id:organicCarbonPerKgSoil',
+                f"hasDepthLower:{has_organicCarbonPerKgSoil_depthLower}",
+                f"hasDepthUpper:{has_organicCarbonPerKgSoil_depthUpper}"
+            ])
+        ])
+    } if len(measurements) > 0 else {}
+
     logRequirements(site, model=MODEL, term=TERM_ID,
-                    has_soilBulkDensity=soilBulkDensity is not None,
-                    has_soilBulkDensity_depthLower=has_soilBulkDensity_depthLower,
-                    has_soilBulkDensity_depthUpper=has_soilBulkDensity_depthUpper,
-                    has_organicCarbonPerKgSoil=organicCarbonPerKgSoil is not None,
-                    has_organicCarbonPerKgSoil_depthLower=has_organicCarbonPerKgSoil_depthLower,
-                    has_organicCarbonPerKgSoil_depthUpper=has_organicCarbonPerKgSoil_depthUpper)
+                    **depth_logs)
 
     should_run = all([
-        soilBulkDensity is not None, has_soilBulkDensity_depthLower, has_soilBulkDensity_depthUpper,
-        organicCarbonPerKgSoil is not None, has_organicCarbonPerKgSoil_depthLower, has_organicCarbonPerKgSoil_depthUpper
+        has_soilBulkDensity_depthLower, has_soilBulkDensity_depthUpper,
+        has_organicCarbonPerKgSoil_depthLower, has_organicCarbonPerKgSoil_depthUpper
     ])
-    logShouldRun(site, MODEL, TERM_ID, should_run)
     return should_run
 
 
-def run(site: dict):
+def _should_run(site: dict):
     grouped_measurements = list(group_measurements_by_depth(site.get('measurements', [])).values())
-    return [
-        _run(measurements) for measurements in grouped_measurements if _should_run(site, measurements)
-    ]
+    values = [(measurements, _should_run_measurements(site, measurements)) for measurements in grouped_measurements]
+    should_run = any([_should_run for measurements, _should_run in values])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+    return should_run, [measurements for measurements, _should_run in values if _should_run]
+
+
+def run(site: dict):
+    should_run, values = _should_run(site)
+    return list(map(_run, values)) if should_run else []

hestia_earth/models/utils/pesticideAI.py

@@ -16,7 +16,7 @@ def impact_lookup_value(model: str, term_id: str, impact_assessment: dict, looku
         product, cycle_lookup_value(model, term_id, pesticides, lookup_col, False), model=model, term_id=term_id
     )
     logRequirements(impact_assessment, model=model, term=term_id,
-                    pesticides_complete=pesticides_complete,
+                    term_type_pesticidesAntibiotics_complete=pesticides_complete,
                     has_pesticides_inputs=has_pesticides_inputs)
 
     should_run = any([

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.47.5'
+VERSION = '0.49.0'

{hestia_earth_models-0.47.5.dist-info → hestia_earth_models-0.49.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.47.5
+Version: 0.49.0
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team
@@ -11,13 +11,13 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: hestia-earth.schema (==21.*)
-Requires-Dist: hestia-earth.utils (>=0.11.1)
-Requires-Dist: python-dateutil (>=2.8.1)
-Requires-Dist: CurrencyConverter (==0.16.8)
-Requires-Dist: haversine (>=2.7.0)
+Requires-Dist: hestia-earth.schema ==22.*
+Requires-Dist: hestia-earth.utils >=0.11.1
+Requires-Dist: python-dateutil >=2.8.1
+Requires-Dist: CurrencyConverter ==0.16.8
+Requires-Dist: haversine >=2.7.0
 Provides-Extra: spatial
-Requires-Dist: hestia-earth.earth-engine (>=0.2.0) ; extra == 'spatial'
+Requires-Dist: hestia-earth.earth-engine >=0.2.0 ; extra == 'spatial'
 
 # Hestia Engine Models
 

{hestia_earth_models-0.47.5.dist-info → hestia_earth_models-0.49.0.dist-info}/RECORD

@@ -2,10 +2,10 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/log.py,sha256=rOgKa-gSrcS-Y1gO9eJXJaA3ofxcQW_45hGly2Lf00Y,2444
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=QCogfGDSL_9sHwt844dyoXXngFwgb5_5CDlcoalS9yc,19
+hestia_earth/models/version.py,sha256=zgraak42T6rmaFGxWnUUUn4Zle6ivFt4DV9V53AgWbQ,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
-hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=4_6KTvKBFQPESvekql69odXsrr0McvpTaNoHyYNo6qc,3852
-hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=10XV1fz_yBYlqmNJ3cxmT2I2Vp_0w7nT4zMIuBw2wCY,3294
+hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=Vs0cRIUObtxpcvQfh9zPF5FjDdhUf2GhT0KCZzThG24,4460
+hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=rxU6nflJ5QisQTjEGsCSbAF9fYfSOtez3cGaRJVKo14,3303
 hestia_earth/models/akagiEtAl2011AndIpcc2006/__init__.py,sha256=WK7xQwUPX48JGqZeb2S2EKdtXuxMjY7HYyUFHItUqUo,425
 hestia_earth/models/akagiEtAl2011AndIpcc2006/ch4ToAirCropResidueBurning.py,sha256=JUTkKB9EclLu7OkVQm2tTZpZF5vTTZl4HogaH_S4qrs,1779
 hestia_earth/models/akagiEtAl2011AndIpcc2006/n2OToAirCropResidueBurningDirect.py,sha256=3LbL2CgE-SQM1VYpQYh3jqJ5pHTPsvRPFq-zN9251eE,1785
@@ -16,7 +16,7 @@ hestia_earth/models/aware/__init__.py,sha256=F8XRo9nRiX-fHAqyeMARYtFmJWRPs-hnIaC
 hestia_earth/models/aware/scarcityWeightedWaterUse.py,sha256=NOGWGMVg4qxaubriihR_24UHQNCi_UAdH4opaPMy5b4,4520
 hestia_earth/models/blonkConsultants2016/__init__.py,sha256=jJhYkwblgQZRg3QOERBZfl4Nw9szPn-Mljz7KMWlXXM,421
 hestia_earth/models/blonkConsultants2016/ch4ToAirNaturalVegetationBurning.py,sha256=wklXERaNrkdCmpphbpj_59XYKZfP8QAQ-AAUkfSttuU,3324
-hestia_earth/models/blonkConsultants2016/co2ToAirSoilCarbonStockChangeManagementChange.py,sha256=k-zh-HCOIISnmGOXw4czpD2k0DQwAg_trQ_gGVJhKCU,3260
+hestia_earth/models/blonkConsultants2016/co2ToAirAboveGroundBiomassStockChangeLandUseChange.py,sha256=FnEDkJ2DR7XHrZGySqwo-CtJkavz554leLz_PD_8IXk,3265
 hestia_earth/models/blonkConsultants2016/landTransformationFromForest20YearAverageDuringCycle.py,sha256=HsyiHyuZQKKCh0Uoc8krVW5zwsc9G2hNxTCbp5jj9Co,3695
 hestia_earth/models/blonkConsultants2016/n2OToAirNaturalVegetationBurningDirect.py,sha256=ai9BXRbMw_XbRTnmAlGVs5IMrebYYE7UFnrw0FJkCqs,3453
 hestia_earth/models/blonkConsultants2016/utils.py,sha256=tbXCP5585AyIVLRc-nSFfrCiTZToXgP8riJe1Hk7rp0,1479
@@ -90,7 +90,7 @@ hestia_earth/models/dammgen2009/noxToAirExcreta.py,sha256=1e10DHk4UN3UxDJXNWkNfW
 hestia_earth/models/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/data/ecoinventV3/__init__.py,sha256=oevyurRuioXy_CsQCtG-S_FXEpiEDeQ-UK5a0jPBXcI,1155
 hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
-hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=gBso6DiWVsoz3QmMlErywV7xGY-zyasu3qx4SE69LzA,3436
+hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=iFxOC7busuhdO2UOto49r-LeWzzFiYQPavMiflY00bU,3448
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=fcrm4Kw3TLD802isFfZsLdKfDASI7gmbhPMKa2VCAtQ,1623
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=nvbZVtQIMs7TAs_OmM_f3g6298-KIFevZUtEUW-GjX4,1629
@@ -111,10 +111,10 @@ hestia_earth/models/faostat2018/landTransformationFromCropland100YearAverage.py,
 hestia_earth/models/faostat2018/landTransformationFromCropland20YearAverage.py,sha256=0vJHRIb4F2G_8MG9Qgz2n-7dYerG5q6r7pG-j84LKjk,2648
 hestia_earth/models/faostat2018/liveweightPerHead.py,sha256=Y96W7ylz5_FMp3NT05BWocbdOmYuDvKFw-yDLdiL2W8,3262
 hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=gLRPMjbtXyHrn3HEiQ3ud2nns0CyFKLxtx2bR-o9GWg,3301
-hestia_earth/models/faostat2018/seed.py,sha256=smEHzgk5UAkYkPP8OMf_m2rf20ger1gvgARHJ5DYb98,2805
+hestia_earth/models/faostat2018/seed.py,sha256=AqxT1bIPxrij3nYaA3rc9bHVKOP-sciVlUXKomD6rwc,2811
 hestia_earth/models/faostat2018/utils.py,sha256=Uc8KXYIwwS0YJjA16jm3_v1DHQaIQg8_YZpBCU92EDY,3250
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/faostat2018/product/price.py,sha256=gLcLXtgReJrszsY3X80Z62znthb-y-IHWOfvF6mkWIA,8068
+hestia_earth/models/faostat2018/product/price.py,sha256=vE3rtICxjYqnQdYiUNuR0gyjbVjDuCGqrARUT1HILEA,8058
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=2Eh6-hjX812Uuf8nxYnC50uXE6uv_8ofFK8iVMwihXA,419
 hestia_earth/models/geospatialDatabase/aware.py,sha256=LE2Pwp6urX_QV0DlAn6S4NcKwcg0Y_J8lTfr_LzKlBA,1363
 hestia_earth/models/geospatialDatabase/clayContent.py,sha256=SAlHW1TMhOz9S4iUASlC9htuSlydINgk22hXW-v4UDU,2286
@@ -148,7 +148,7 @@ hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiI
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=k6UeqX-JyXKdB6qcEzKUl2UzSOlX8sH1nnPf9LhtKWY,4254
 hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPRIF3C2Y1NnUZ6lfpi0Do,417
 hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/haversineFormula/transport/distance.py,sha256=KNq5_UgxcPiNe_O-oyE-EbqX_UZ03Pk7aIKOZh-2SQ4,3299
+hestia_earth/models/haversineFormula/transport/distance.py,sha256=pii20EpXzxbAW7FASXvHSA_kyKULR-Limx2AdKj8gc0,4139
 hestia_earth/models/hyde32/__init__.py,sha256=hSOwDiK0M0NfmQbW_J7O_SZa8IsJMgITSHSVMsDS4KI,407
 hestia_earth/models/hyde32/landTransformationFromCropland100YearAverageDuringCycle.py,sha256=Ww_BrjgPV6WK6L2VeZkhnoE_I-HQFRLDcVn82fk15fo,2402
 hestia_earth/models/hyde32/landTransformationFromCropland20YearAverageDuringCycle.py,sha256=yr_qmy_fcHk6-he-h90rUlI-LpV6P7DeD3WbdE3MoJw,2398
@@ -161,7 +161,7 @@ hestia_earth/models/hyde32/landTransformationFromPermanentPasture20YearAverageDu
 hestia_earth/models/hyde32/utils.py,sha256=j9QavyBZIQ-ZCNjdPLWjOjg2LrxcNlanQ1wPnT0IKX8,3098
 hestia_earth/models/impact_assessment/__init__.py,sha256=B6UO8z3NR6JjIycyT7adZbnNKcBC49qnF2bOhVcufy4,355
 hestia_earth/models/impact_assessment/emissions.py,sha256=XcHTqyPAZeCz7qPTD8VvccmYMYROqBGrR0zJNpZtmvM,3413
-hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py,sha256=9CavXee24bRHBlVOINLDBH4zzQZqHRu15J_06oDzGRc,3879
+hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py,sha256=ljh9vou6jJzNjWCtdLsvozx2S1K9cQvWVxifk6mMWso,3952
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
 hestia_earth/models/impact_assessment/irrigated.py,sha256=0lFUPRUwQze283F6aCsqiBJ2pbFNPvApcbppwbSF2SE,749
 hestia_earth/models/impact_assessment/landOccupationInputsProduction.py,sha256=SggB_4tpiKNeb6TIQWBm-X9VwG4pzLoyHdK8JroRIsE,576
@@ -182,20 +182,20 @@ hestia_earth/models/impact_assessment/pre_checks/__init__.py,sha256=3FV6tLVLlXzV
 hestia_earth/models/impact_assessment/pre_checks/cycle.py,sha256=drOQaHY5V_LLRH8txgFOp006VGbnftGHJLznNe3tC88,1079
 hestia_earth/models/impact_assessment/pre_checks/site.py,sha256=4xLy_GIYJZpCpKbiR4BEfKNEU1YyPJnMLq4yTgyJVnY,929
 hestia_earth/models/impact_assessment/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/impact_assessment/product/economicValueShare.py,sha256=z3EUHmN-SkGhPIJ_mtMs0EUDlHmvCVHa7UDxEVLgv1E,1426
+hestia_earth/models/impact_assessment/product/economicValueShare.py,sha256=EFVAQ6ZDC_jPRMA3K3lVVLR6Ow3nzMeG6zhNlwICef8,1470
 hestia_earth/models/impact_assessment/product/value.py,sha256=opBfdXZ8GfTxdMkr_XeOFb3gZ4slGpUNE9RXHH1QUHw,1332
 hestia_earth/models/ipcc2006/__init__.py,sha256=ReUFPLqIyp16QEOGaiHmz41QbuwYBQYDKVtw6KuRDIA,409
-hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py,sha256=BiiFYiRxHgo-woPRbVbPtyZmmDZtttYL1iOGwSoI3NA,2867
-hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=oul71JCO_ehoI-K84ipWAHj3eT__Gn9MLQyHP6B8CxY,3553
-hestia_earth/models/ipcc2006/belowGroundCropResidue.py,sha256=KJV1MMS_tUYTAi4DYXVQl9mlo1Xy-YsdPLT-syIaOu0,4269
+hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py,sha256=PAAHVduJgUH3taVvhzWCFJ9shpIHHPNvS-TqITc95oM,2879
+hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=gIKxz6fQmgkejkgQyu1m4Z_sVe3NzJ9H5CfGS4zOHfc,3565
+hestia_earth/models/ipcc2006/belowGroundCropResidue.py,sha256=LE70lRsJeoe9qFWfVGHbnL-__nbDzzvRO9CzqRrySbE,4272
 hestia_earth/models/ipcc2006/co2ToAirOrganicSoilCultivation.py,sha256=3t2t9S5Pkw1JdKVrIhaRkcqNyaiUqiuTmw9z23Leplo,3146
-hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py,sha256=r7JL85_DOBAKRQYwC4ckk6j71m_o-sQohZL2mjSVXd8,2426
-hestia_earth/models/ipcc2006/n2OToAirExcretaDirect.py,sha256=fmL7hVr94Go3XpDGijCnZJUWIRnqDHfDCXuFVjTBehs,2123
-hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py,sha256=fiVI_V1IgXZbJk8x6zSuwQS1GVRFHKDGaaxFqwVEFCo,2836
-hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserDirect.py,sha256=tfKIufK0r5XOF-j0hUzpMX_uHD7GayJMLxDHKP0TjNM,2192
-hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py,sha256=YkEbDn68fC0FkxfFI1oyTM71juwydOY0PVqkKNdV2BM,2933
-hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserDirect.py,sha256=BlxzGRmks9Ob7Fon4VXt9ojnRDhzWkktR8GhF_mG7sA,2222
-hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py,sha256=y1IJ9kKDcdLrHk9tD-czUZdDubAgCv1YnDWegGg5htM,2913
+hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py,sha256=9Xf6g-fMuMpB-xRm2YlYb8VpvZH-c283wLZPK2ZSJrY,2438
+hestia_earth/models/ipcc2006/n2OToAirExcretaDirect.py,sha256=-h5bG6XU5AzEFLSSFeSSU1OZHcxw2h4cZibK4hd2u4Q,2131
+hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py,sha256=bOzIHjm8l0XnyBKvqKzmmCZMFqfbIfmFnec4WtUo5z4,2844
+hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserDirect.py,sha256=1JNRKfzanY_frE20D7wPBoztXPXzX4ZC0soc9J7xk6U,2203
+hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py,sha256=g0afkeml4QTLeFqDHId0BdpdQnWjnSyY0cBLcK7KGjQ,2944
+hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserDirect.py,sha256=VDHhiZF27IF83hVev_zI6NNP8rKKCqql-tHyeEqnpcI,2233
+hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py,sha256=WcOufrihV_nB4Bos43FVwNe6mi6_17FVEcvZo3kxeiY,2924
 hestia_earth/models/ipcc2006/n2OToAirOrganicSoilCultivationDirect.py,sha256=bQ26mD6scu2mVuES8egZwXXBNYV9eO8C92wH_Lwo4oY,3172
 hestia_earth/models/ipcc2006/utils.py,sha256=Y9E0rwWDa_HU7ZyV3-6ridMUSgq5RyC4ZIYGkVOUweo,1200
 hestia_earth/models/ipcc2013ExcludingFeedbacks/__init__.py,sha256=v4Qe-X4w3tqIHGJBNnEAK81x4ZuQMwYxQYXRncugmcU,427
@@ -203,15 +203,15 @@ hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=8VRg-Vvzc86_CQmB
 hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
 hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=PTE0FEV5x7MZgWpA6iu7EtIYaYKl6Udc9icpafkqlEA,979
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
-hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=ej1FHflgAIUNOFqZCDJiFs2a5RygOxqVqkD5He1KwoI,3016
-hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=sCSUXrBBg5l9nhATSThTt-s4TA3QHW35--qp7k1wTYE,3221
+hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=wTQNd81-jBljT_caHRHOcZWam8vbWarznT4KOnfkQ48,3028
+hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=gi1RJHTKxVrpWN6D82YNnDp1YRnYOzSfPr15rcn3q4s,3233
 hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=Kk_QNMqZtmJpNWZvCqJYVddn0833x3zwT3Pa5KZVBdE,7281
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=e8bsMEob5MzJTbc-ohm_0IVY4FcWMslEolNp7L-E9rk,7017
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=VyF9Z_xtbJXslRk2XDlhivN5f5fpDNF6JChsRcJ21uU,6481
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=Q9CGcD1PizZJQ2qdeBQJXn3P_oIpAdbnn02re8HP0D4,2580
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=2CnBlsD10wIbG66Amv4S-1QT5MRVNQGrAG2iN-ZH8o8,3819
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=jipKhjF0MdMzU2KoWmbD6XEwOabnCi4xQwdWz5W3Nuo,2979
-hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=_p3DNDriCiSnixw1q1KmA8KU1omNx87WfvcJKa-tPCM,4746
+hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=hUGujoGptR8rVjCPucebsFZtmXQrE6m-iZjon4YJrwY,4758
 hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py,sha256=gB1NbBKkUQyIFwjy4p8YYJxEEEW35QYWBVhNLduhaJ0,1984
 hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=5LISfKnCtRm5JE3va3F6CU0bshnFpgSAuzmjH0zpev0,6452
 hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=3JOQANIy4rDsFTWBy6pOzJ2NRdAiAL-x--C87gBIZQw,3603
@@ -223,7 +223,7 @@ hestia_earth/models/ipcc2019/utils.py,sha256=u-KBk8xVI0Rcn1_jwjGeSXpF83VHpAiNsjG
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=HEV4Misbe5h99qCqZeCaKNTs4FkFWmv6RdCty_U2pps,947
 hestia_earth/models/koble2014/__init__.py,sha256=jRciLONEhGHtMLu2rlWXEEVwcJqA-URsfH1cCt-Qti4,410
-hestia_earth/models/koble2014/aboveGroundCropResidue.py,sha256=oj0q5mj57LjnzmH_PlfthjtaPN9RF5uj7CcnNnsHP58,5907
+hestia_earth/models/koble2014/aboveGroundCropResidue.py,sha256=jV1hrzD4VeRtEk7qF1dm_kCu_zrXK3-nwehCh1yzqN0,5919
 hestia_earth/models/koble2014/cropResidueManagement.py,sha256=22guAEe6pyi7SS6pswz3H3lMzfygefB1Mlg3aL2k6PQ,2973
 hestia_earth/models/koble2014/residueBurnt.py,sha256=eKvzC4HOj8t7c2-50guVhqQMapTuxcHNBB-_zElHILY,2285
 hestia_earth/models/koble2014/residueLeftOnField.py,sha256=R3D6-21Za9CylMVFWePSUywL55d7n9ohlBHAJyXAwA4,421
@@ -318,10 +318,10 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=x6xsPu-Rwh-7HKsvHuKmgM1YML6fQy2z9Hsy9_BeO2Y,3565
 hestia_earth/models/mocking/__init__.py,sha256=Y39V6yj_3M1q8v9ShCHwPeJOstypOVIvb_FldMEbF7g,766
 hestia_earth/models/mocking/mock_search.py,sha256=ysPhzvMGvsHKqQXKRFi8ZqohcnyKutBlNqT_j0OH8L4,1983
-hestia_earth/models/mocking/search-results.json,sha256=CYJ6vaIKtwThv-nhcM9-FVDf7vYisCBCrDhdTU4y9rw,30800
+hestia_earth/models/mocking/search-results.json,sha256=qhzP5fQTl3cosYM2N_fl_ki1gyTX9Eod9aXwR0VeAvg,31896
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
-hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=C4Sq5Ke8JCKyAToJ8nCNixhULk85o7f3t3Qz9G-QeqI,2198
-hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=oE-RDKgR9V6SOOS6pJUSAs8mcG1oHsheTLhQJOXMaaY,2193
+hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=cJa-2eFuBM0pBAH6tMHUFlpBLhU92rYZzol-JkyDduM,2210
+hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=txjMrM6Q2g5Qsq6HhAL-IpMMLOj37wlWD2KnovyEWvw,2205
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=aFGXvqP6AM-hgkQvyRTCwdphv9UsfsRtn68YkuDODXY,6727
 hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=iDZ9Ge9VfulLvlVT44_bYAGC-xEUDucLtkrjKbGAfiQ,5622
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=EgzUzO0r8UvwhRqh0FzJtznuckuSk3DlDfI3hUXogLs,7634
@@ -341,7 +341,7 @@ hestia_earth/models/pooreNemecek2018/orchardBearingDuration.py,sha256=hhmH6PVkKI
 hestia_earth/models/pooreNemecek2018/orchardDensity.py,sha256=pV3gjtNZ-zbmoKJ7JqLyLz1DLkAt4ycLEXkdKhTlRAU,1178
 hestia_earth/models/pooreNemecek2018/orchardDuration.py,sha256=UCXw_1XtaaL4h9SQJZ--m-iwisN8_Ri6wMAzfVzvCws,1180
 hestia_earth/models/pooreNemecek2018/rotationDuration.py,sha256=sXoWTcTJEwMSh11B2DlkzHqH_Ebtch24cxV3rPxlUec,1233
-hestia_earth/models/pooreNemecek2018/saplings.py,sha256=Uj_X6JbuM6zl9mIELHwtA68yf2NOcaGK9vY1yFeq43E,1798
+hestia_earth/models/pooreNemecek2018/saplings.py,sha256=BAivW7MdFEdTZ3zascGNDYB5e7XnS0Tbh7_EVCYIl5s,1804
 hestia_earth/models/pooreNemecek2018/utils.py,sha256=LcGA8g42XD2xuiF8IFAOYdI5YHG4l101xD_XH9AiSdI,851
 hestia_earth/models/recipe2016Egalitarian/__init__.py,sha256=OvZoSgfaMe6DWIdqr-Sx3ouzXlp994oro7Mi0Xid18Q,422
 hestia_earth/models/recipe2016Egalitarian/damageToFreshwaterEcosystemsSpeciesYear.py,sha256=b1UZAsy3yGlHYxH2YhBhhSnjm5zzQl8Z32DcQBjgWNE,1123
@@ -405,10 +405,10 @@ hestia_earth/models/schererPfister2015/pToGroundwaterSoilFlux.py,sha256=Gt3YdTCu
 hestia_earth/models/schererPfister2015/pToSurfaceWaterSoilFlux.py,sha256=bzgtCAtX0D5cRqoL24Ukg2IDr00Up7Ji4m1QQ9fJ-9w,2741
 hestia_earth/models/schererPfister2015/utils.py,sha256=LEvz9guqto0kuF5rXcQjgYsD3CvEmORvJQqRA1f7uMI,3130
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
-hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=wEcycTmazTrCzXKoqBVhpKW_4cUmp3wWlxDBDSW1GKg,3406
+hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=kQWABi_TWOYKgAkBnMEc0O1VgNOSbJuNkLaeNFMzeEI,3693
 hestia_earth/models/site/flowingWater.py,sha256=ZPeXd2tNYgG24kYOGQZM9lrUzCi9nZsabvHJsaH0hy4,1796
 hestia_earth/models/site/netPrimaryProduction.py,sha256=mwoQcjYkCbHxzZ8PhFN7RtjwKa5igqkICpNVJq08lYc,1901
-hestia_earth/models/site/organicCarbonPerHa.py,sha256=_duLpVHx-rx0f1I5IzreDp9LulC0JULrX63bm2W_tcM,3905
+hestia_earth/models/site/organicCarbonPerHa.py,sha256=jj8zB_TyWB97Eo1eZLw-4RDM4HOY_bMGvB45OHEhXYU,4293
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=zY9QUho9jhaQK-X0x_DszZOoj-Ol8NzNcASk-Ix_qEk,1870
 hestia_earth/models/site/organicCarbonPerM3Soil.py,sha256=r-rDBLr-h10__csvlWreoe2MVBpMT5MMmokZVLRJ7Iw,1870
 hestia_earth/models/site/organicMatterPerKgSoil.py,sha256=VXXLt9lBWkNR8xY4tGOi9DmiaRBKydbevwJ_HL2JNf0,1870
@@ -476,7 +476,7 @@ hestia_earth/models/utils/input.py,sha256=CsoMC_Jjnifl5mjPWhWOBhiHmNI5IGWRfPjshO
 hestia_earth/models/utils/liveAnimal.py,sha256=u_Lym0hVinncCZMYF_KscCA3vuelWmlyHn4I-jVRDs4,1505
 hestia_earth/models/utils/lookup.py,sha256=Tno_-_Q5FKayU3-ZIeIXbOh49V9Go-IDX7qoFbUDefs,5398
 hestia_earth/models/utils/measurement.py,sha256=v2MOXkpCNi1NWjLYqYE7Z9FstI4D1m-y3cibquqfkKk,3396
-hestia_earth/models/utils/pesticideAI.py,sha256=gZOSRG8HSvvYs2h4QZalix_kYjmCoHBjjQ--Q9L9JzI,1353
+hestia_earth/models/utils/pesticideAI.py,sha256=pmjiFJkMLodXSP16VnxT7YizH-LBFFvEsvShplyAPB8,1374
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
 hestia_earth/models/utils/product.py,sha256=RUuEkYdPJvbdCAdYX0O5DO9R_bBErvp2ql4dT8Yzx1o,9840
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
@@ -503,7 +503,7 @@ tests/models/aware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 tests/models/aware/test_scarcityWeightedWaterUse.py,sha256=JmwOQFxcFm45IKn_aJU1K6o8Cp5w_wllcRDAhwbXMj0,2278
 tests/models/blonkConsultants2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/blonkConsultants2016/test_ch4ToAirNaturalVegetationBurning.py,sha256=T4FjcMHaIK5Pp6ZnYKiRUxX_FuK23NWY0TeN7z0fjUc,1155
-tests/models/blonkConsultants2016/test_co2ToAirSoilCarbonStockChangeManagementChange.py,sha256=Y9zJT-My5pvHrwfB54ViSsgV-bMc-wEZpX71PE7Lg40,1176
+tests/models/blonkConsultants2016/test_co2ToAirAboveGroundBiomassStockChangeLandUseChange.py,sha256=70j3jG0dALAnowIQb0AKqP6FmI_utjt7Jd8Jdim_hY4,1181
 tests/models/blonkConsultants2016/test_landTransformationFromForest20YearAverageDuringCycle.py,sha256=0VrYyvnKnfTpElwHLKp2YxXXTQIbv5q8x10NCaZjzTs,1198
 tests/models/blonkConsultants2016/test_n2OToAirNaturalVegetationBurningDirect.py,sha256=JBDTKbPaP-enQLi7281NRDjgO_HtkWuQzREN3kyO5qU,1180
 tests/models/blonkConsultants2016/test_utils.py,sha256=9OYZVBui1pauU-ipisUGzQc9johzMYDkXhqYpCWROnU,456
@@ -593,7 +593,7 @@ tests/models/faostat2018/test_liveweightPerHead.py,sha256=KrjbvyWmnGS-Wy_B5ZSNbo
 tests/models/faostat2018/test_readyToCookWeightPerHead.py,sha256=pMDcONs0WUvANcJ6_OPF7TBwMF45JGMxFRPNPtHLqVI,1570
 tests/models/faostat2018/test_seed.py,sha256=tUXoNVveX0m0ed9UXB4zXxIZsPxktXyUXlbWuUKG0sQ,1705
 tests/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/faostat2018/product/test_price.py,sha256=65K4IwMoAz2giPolZhKWMQifXjYYZr4jSZXfY9g4spk,3543
+tests/models/faostat2018/product/test_price.py,sha256=kVGebepabR8vMrfmVMz1Scq56mg2EDwYwzUE1v7USWY,3860
 tests/models/geospatialDatabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/geospatialDatabase/test_aware.py,sha256=tbBBvXrOqdO0cMPJTa02UfhlwfosH8iNoJLzZNFs1NU,857
 tests/models/geospatialDatabase/test_clayContent.py,sha256=56QuhOUDBwHhVrzjFmDifr6bHgtQExDENlQ1fNi4VQw,1030
@@ -875,10 +875,10 @@ tests/models/schererPfister2015/test_pToDrainageWaterSoilFlux.py,sha256=57MVRyiE
 tests/models/schererPfister2015/test_pToGroundwaterSoilFlux.py,sha256=lOTL-ue6hEbQsKIss6VsN7bJME5UCB3pTbqbLtMp9rk,1064
 tests/models/schererPfister2015/test_pToSurfaceWaterSoilFlux.py,sha256=1VJo9q-Kb2OboK2RMp3-bkP6lXfkFbqMz1ACJC75FWw,1441
 tests/models/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=FOtllJ_E4Ld4MngPn__CsQXXeHhZ5fNB-ruSd8DUgFQ,963
+tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=ZbIt-mQohYE-8xd4zoqDTVj3VC-Dg9wnOTY4ppULsCY,1023
 tests/models/site/test_flowingWater.py,sha256=q7ktHV7sffIUBf0SgIhbkL_U_c7RTHYv6oWhXY4A6io,1274
 tests/models/site/test_netPrimaryProduction.py,sha256=FaC5TEwHnR56_QrXkIB5u3mgSLOcSmBRbL8vzqaZwk0,1056
-tests/models/site/test_organicCarbonPerHa.py,sha256=m392fH_aEt_tI6dVhAzOVHKpeuztNgP5p6yNiLTs4Mw,983
+tests/models/site/test_organicCarbonPerHa.py,sha256=l9I_-c7y3-dlSceqd7LY4CKTGr3TamRw0vtHnWC31YE,1043
 tests/models/site/test_organicCarbonPerKgSoil.py,sha256=fqPe2JbrZwwMK497Qnb2WPx4-n2vda4PW-S3tQa_CGI,1035
 tests/models/site/test_organicCarbonPerM3Soil.py,sha256=8fOwtcBAFH1fSduIXXtYOdL83oYAVxC4f6BAZpY5X_w,1035
 tests/models/site/test_organicMatterPerKgSoil.py,sha256=EvZ6HknxjUjhdmdYostB9eCc_WowpRWpmssWM2vT_NU,1035
@@ -942,8 +942,8 @@ tests/models/utils/test_site.py,sha256=cSKrkLeerymMLZAwCnbQce38NwgxXojQHAVm9DPUT
 tests/models/utils/test_term.py,sha256=-Wn2C1jyOLfkvhcKmKWT-Jms7yqLwx5ok91gYJNcGWc,2028
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.47.5.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.47.5.dist-info/METADATA,sha256=NOBXGcLdnd88uCbP0TuZjS9ttxv5q4sURGh-2dakGtE,3190
-hestia_earth_models-0.47.5.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-hestia_earth_models-0.47.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.47.5.dist-info/RECORD,,
+hestia_earth_models-0.49.0.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.49.0.dist-info/METADATA,sha256=9XuW6DCH40QIwXn3LgZNRC9zOwkFzSSoMn98MFaLIec,3178
+hestia_earth_models-0.49.0.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+hestia_earth_models-0.49.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.49.0.dist-info/RECORD,,

{hestia_earth_models-0.47.5.dist-info → hestia_earth_models-0.49.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.0)
+Generator: bdist_wheel (0.41.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/models/blonkConsultants2016/{test_co2ToAirSoilCarbonStockChangeManagementChange.py → test_co2ToAirAboveGroundBiomassStockChangeLandUseChange.py}

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.blonkConsultants2016.co2ToAirSoilCarbonStockChangeManagementChange import (
+from hestia_earth.models.blonkConsultants2016.co2ToAirAboveGroundBiomassStockChangeLandUseChange import (
     MODEL, TERM_ID, run, _should_run
 )
 

tests/models/faostat2018/product/test_price.py

@@ -2,7 +2,7 @@ import json
 from unittest.mock import patch
 from tests.utils import fixtures_path
 
-from hestia_earth.models.faostat2018.product.price import MODEL, MODEL_KEY, run, _should_run
+from hestia_earth.models.faostat2018.product.price import MODEL, MODEL_KEY, run, _should_run, _lookup_data
 
 class_path = f"hestia_earth.models.{MODEL}.product.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/product/{MODEL_KEY}"
@@ -18,6 +18,12 @@ def test_should_run():
     assert should_run is True
 
 
+def test_lookup_data():
+    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', 'GADM-GHA', 2000, term_type='crop') == 412.9
+    # average price per tonne as year value is missing
+    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', 'GADM-GHA', 2012, term_type='crop') == 844.0047619047618
+
+
 @patch(f"{class_path}.download_hestia", return_value={})
 def test_run_crop(*args):
     with open(f"{fixtures_folder}/crop/cycle.jsonld", encoding='utf-8') as f:

tests/models/site/test_cationExchangeCapacityPerKgSoil.py

@@ -2,21 +2,23 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.cationExchangeCapacityPerKgSoil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.site.cationExchangeCapacityPerKgSoil import (
+    MODEL, TERM_ID, run, _should_run_measurements
+)
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 @patch(f"{class_path}.find_term_match")
-def test_should_run(mock_find):
+def test_should_run_measurements(mock_find):
     # no measurement => no run
     mock_find.return_value = None
-    assert not _should_run({}, [])
+    assert not _should_run_measurements({}, [])
 
     # with measurement => run
     mock_find.return_value = {'value': [10]}
-    assert _should_run({}, []) is True
+    assert _should_run_measurements({}, []) is True
 
 
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)

tests/models/site/test_organicCarbonPerHa.py

@@ -2,21 +2,23 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicCarbonPerHa import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.site.organicCarbonPerHa import (
+    MODEL, TERM_ID, run, _should_run_measurements
+)
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 @patch(f"{class_path}.find_term_match")
-def test_should_run(mock_find):
+def test_should_run_measurements(mock_find):
     # no measurement => no run
     mock_find.return_value = {}
-    assert not _should_run({}, [])
+    assert not _should_run_measurements({}, [])
 
     # with measurement => run
     mock_find.return_value = {'value': [10], 'depthUpper': 0, 'depthLower': 10}
-    assert _should_run({}, []) is True
+    assert _should_run_measurements({}, []) is True
 
 
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)