hestia-earth-models 0.65.5__py3-none-any.whl → 0.65.6__py3-none-any.whl

hestia_earth/models/site/management.py

@@ -10,11 +10,18 @@ tillage, cropResidueManagement and landUseManagement.
 All values are copied from the source node, except for crop and forage terms in which case the dates are copied from the
 cycle.
 
+Where `startDate` is missing from landCover products, gap-filling is attempted using `endDate` - `maximumCycleDuration`.
+This is the `endDate` of the `landCover` product.
+This ensures no overlapping date ranges.
+If both `endDate` and `startDate` are missing from the product, these will be gap-filled from the `Cycle`.
+
 When nodes are chronologically consecutive with "% area" or "boolean" units and the same term and value, they are
 condensed into a single node to aid readability.
 """
+from datetime import timedelta, datetime
 from functools import reduce
 from hestia_earth.schema import TermTermType, SiteSiteType
+from hestia_earth.utils.lookup import column_name, get_table_value, download_lookup
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import safe_parse_float, flatten
 from hestia_earth.utils.blank_node import get_node_value
@@ -23,12 +30,12 @@ from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils import _include, _omit, group_by
 from hestia_earth.models.utils.management import _new_management
 from hestia_earth.models.utils.term import get_lookup_value
-from hestia_earth.models.utils.blank_node import condense_nodes
-from hestia_earth.models.utils.crop import get_landCover_term_id
+from hestia_earth.models.utils.blank_node import condense_nodes, DatestrFormat, _gapfill_datestr, DatestrGapfillMode
 from hestia_earth.models.utils.site import (
     related_cycles, get_land_cover_term_id as get_landCover_term_id_from_site_type
 )
 from . import MODEL
+from ..utils.crop import get_landCover_term_id
 
 REQUIREMENTS = {
     "Site": {
@@ -81,13 +88,13 @@ RETURNS = {
     }]
 }
 LOOKUPS = {
-    "crop": ["landCoverTermId"],
+    "crop": ["landCoverTermId", "maximumCycleDuration"],
     "forage": ["landCoverTermId"],
     "inorganicFertiliser": "nitrogenContent",
     "organicFertiliser": "ANIMAL_MANURE",
     "soilAmendment": "PRACTICE_INCREASING_C_INPUT",
     "landUseManagement": "GAP_FILL_TO_MANAGEMENT",
-    "property": "GAP_FILL_TO_MANAGEMENT"
+    "property": ["GAP_FILL_TO_MANAGEMENT", "CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY"]
 }
 MODEL_KEY = 'management'
 
@@ -126,19 +133,49 @@ _INPUT_RULES = {
 _SKIP_LAND_COVER_SITE_TYPES = [
     SiteSiteType.CROPLAND.value
 ]
+_CYCLE_DATE_TERM_TYPES = {TermTermType.CROP.value, TermTermType.FORAGE.value}
 
 
 def management(data: dict):
     node = _new_management(data.get('id'))
     node['value'] = data['value']
-    node['endDate'] = data['endDate']
+    node['endDate'] = _gap_filled_date_only_str(data['endDate'])
     if data.get('startDate'):
-        node['startDate'] = data['startDate']
+        node['startDate'] = _gap_filled_date_only_str(date_str=data['startDate'], mode=DatestrGapfillMode.START)
     if data.get('properties'):
         node['properties'] = data['properties']
     return node
 
 
+def _get_maximum_cycle_duration(land_cover_id: str):
+    lookup = download_lookup("crop.csv")
+    return safe_parse_float(
+        get_table_value(lookup, column_name('landCoverTermId'), land_cover_id, column_name('maximumCycleDuration'))
+    )
+
+
+def _gap_filled_date_only_str(date_str: str, mode: str = DatestrGapfillMode.END) -> str:
+    return _gapfill_datestr(datestr=date_str, mode=mode)[:10]
+
+
+def _gap_filled_date_obj(date_str: str, mode: str = DatestrGapfillMode.END) -> datetime:
+    return datetime.strptime(
+        _gap_filled_date_only_str(date_str=date_str, mode=mode),
+        DatestrFormat.YEAR_MONTH_DAY.value
+    )
+
+
+def _gap_filled_start_date(land_cover_id: str, end_date: str, cycle: dict) -> str:
+    """If possible, gap-fill the startDate based on the endDate - maximumCycleDuration"""
+    maximum_cycle_duration = _get_maximum_cycle_duration(land_cover_id)
+    return max(
+        _gap_filled_date_obj(end_date) - timedelta(days=maximum_cycle_duration)
+        if maximum_cycle_duration else datetime.fromtimestamp(0),
+        _gap_filled_date_obj(cycle.get("startDate"), mode=DatestrGapfillMode.START)
+        if cycle.get("startDate") else datetime.fromtimestamp(0)
+    ) if any([maximum_cycle_duration, cycle.get("startDate")]) else None
+
+
 def _should_gap_fill(term: dict):
     value = get_lookup_value(lookup_term=term, column='GAP_FILL_TO_MANAGEMENT')
     return bool(value)
@@ -167,20 +204,27 @@ def _copy_item_if_exists(source: dict, keys: list[str] = None, dest: dict = None
     return reduce(lambda p, c: p | ({c: source[c]} if source.get(c) else {}), keys or [], dest or {})
 
 
-def _get_landCover_term_id(product: dict) -> str:
-    term = product.get('term', {})
-    return get_landCover_term_id(term, model=MODEL, term=term.get('@id'), model_key=MODEL_KEY)
-
-
 def _get_relevant_items(cycle: dict, item_name: str, relevant_terms: list):
     """
     Get items from the list of cycles with any of the relevant terms.
     Also adds dates from Cycle.
     """
-    return [
-        _include(cycle, ["startDate", "endDate"]) | item
+    items = [
+        _include(cycle, ["startDate", "endDate"]) |
+        _include(
+            {
+                "startDate": _gap_filled_start_date(
+                    land_cover_id=get_landCover_term_id(item.get('term', {})),
+                    end_date=item.get("endDate") if "endDate" in item else cycle.get("endDate", ""),
+                    cycle=cycle
+                )
+            } if "startDate" not in item else {},
+            "startDate"
+        ) |
+        item
         for item in filter_list_term_type(cycle.get(item_name, []), relevant_terms)
     ]
+    return items
 
 
 def _process_rule(node: dict, term: dict) -> list:
@@ -228,11 +272,12 @@ def _run_products(cycle: dict, products: list, total_products: int = None, use_c
             source=product,
             keys=['properties', 'startDate', 'endDate'],
             dest={
-                "term": {'@id': _get_landCover_term_id(product)},
+                "term": {'@id': get_landCover_term_id(product.get('term', {}))},
                 "value": round(100 / (total_products or len(products)), 2)
             }
         ) | (
-            default_dates if use_cycle_dates else {}
+            default_dates if use_cycle_dates or product.get("term", {}).get("termType") in _CYCLE_DATE_TERM_TYPES
+            else {}
         ))
         for product in products
     ]
@@ -242,7 +287,7 @@ def _run_from_landCover(cycle: dict, crop_forage_products: list):
     """
     Copy landCover items, and include crop/forage landCover items with properties to count in ratio.
     """
-    products = [
+    land_cover_products = [
         _map_to_value(_extract_node_value(
             _include(
                 value=product,
@@ -254,14 +299,29 @@ def _run_from_landCover(cycle: dict, crop_forage_products: list):
             relevant_terms=[TermTermType.LANDCOVER]
         )
     ]
-    return products + _run_products(
+    return land_cover_products + _run_products(
         cycle,
         crop_forage_products,
-        total_products=len(crop_forage_products) + len(products),
+        total_products=len(crop_forage_products) + len(land_cover_products),
         use_cycle_dates=True
     )
 
 
+def _should_group_landCover(term: dict):
+    value = get_lookup_value(lookup_term=term, column='CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY')
+    return bool(value)
+
+
+def _has_prop_grouped_with_landCover(product: dict):
+    return bool(
+        next((
+            p
+            for p in product.get('properties', [])
+            if _should_group_landCover(p.get('term', {}))
+        ), None)
+    )
+
+
 def _run_from_crop_forage(cycle: dict):
     products = _get_relevant_items(
         cycle=cycle,
@@ -269,13 +329,13 @@ def _run_from_crop_forage(cycle: dict):
         relevant_terms=[TermTermType.CROP, TermTermType.FORAGE]
     )
     # only take products with a matching landCover term
-    products = list(filter(_get_landCover_term_id, products))
+    products = [p for p in products if get_landCover_term_id(p.get('term', {}))]
     # remove any properties that should not get gap-filled
     products = list(map(_filter_properties, products))
 
-    # split products with properties and those without
-    products_with_gap_filled_props = [p for p in products if p.get('properties')]
-    products_without_gap_filled_props = [p for p in products if not p.get('properties')]
+    # split products with properties that group with landCover
+    products_with_gap_filled_props = [p for p in products if _has_prop_grouped_with_landCover(p)]
+    products_without_gap_filled_props = [p for p in products if not _has_prop_grouped_with_landCover(p)]
 
     return _run_from_landCover(
         cycle=cycle,

hestia_earth/models/utils/crop.py

@@ -65,4 +65,8 @@ def valid_site_type(cycle: dict, include_permanent_pasture=False):
 
 def get_landCover_term_id(lookup_term: dict, **log_args) -> str:
     value = get_lookup_value(lookup_term, 'landCoverTermId', **log_args)
-    return value.split(';')[0] if value else None
+    return (
+        lookup_term.get("@id") if lookup_term.get("termType") == TermTermType.LANDCOVER.value else
+        value.split(';')[0] if value else
+        None
+    )

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.65.5'
+VERSION = '0.65.6'

{hestia_earth_models-0.65.5.dist-info → hestia_earth_models-0.65.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.65.5
+Version: 0.65.6
 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

{hestia_earth_models-0.65.5.dist-info → hestia_earth_models-0.65.6.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=Llo2SH1Lp-R8x1JRxJ2Ta-vw5RbdUj2FHXUP-c
 hestia_earth/models/log.py,sha256=_zAfyOkL_VknEnMFvcpvenSMghadlDfZhiSx28545Gk,3558
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=FC1vYE-igSWHH_kAACO4-kmSuUUvTiLpGWVaBEvQW50,19
+hestia_earth/models/version.py,sha256=7xFo8Se5gLwBCboxTmtPAStKLrqZnJgu1-olEArI-44,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=rm5ZaRAzJ08m2y4BxkGh-RjudkDWgozmg3XumoRm-fQ,4511
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -27,7 +27,7 @@ hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransfo
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=11H8j9i2h2zChea92CdzPodWZfdegkAnQx6qYC6Ym9A,2623
 hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=Z0IrvVv-dKsRt09LmT7sc6e1bWnhjZ-WBrO-namIngo,1539
 hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZKao-M03gU8uKquUozQ,416
-hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=dpAnytPCO8FfCFbJ9CuplsZqvkZabYdmHDd-L8WMZPs,7919
+hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=nRAwh5UljL7Tg0BGlYsA6nrIGzIlizVPeangtjHOIQE,7869
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=4p9Ui78F69yhZkXCwcM6lwbpaNLdpO9p_uJDnLqYhRM,5919
 hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
 hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=N8neIISqeTAS7VGTNWbbbozOtfCb816qwwHCnv7Nnpw,1113
@@ -200,7 +200,7 @@ hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPR
 hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/haversineFormula/transport/distance.py,sha256=163KrmKzlEQuKYT1ZvpPgmKlv_-mmvxp0A1_uKya99w,4203
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
-hestia_earth/models/hestia/landCover.py,sha256=qWTZ16E1qntPkzmabtMzezayUqIjIg8TNz-Lovh7UKU,27589
+hestia_earth/models/hestia/landCover.py,sha256=10wiHdIBhvWjK2ctHusgOcD2aqTNo8MmJVPW2_DQwu0,29409
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=-7ToRvCVPD6AAcjxorPS5jSWio7JAglHrdSS9PPyPqQ,1551
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=TCskVLhYXBMxdeZM-gN4Tdixk5ua7eVn-o5dfIT_H7o,1543
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=1ySn4d-qkDeU8Ss_80l-uOypPoWsmDsqnS6IM8wkI34,7113
@@ -399,7 +399,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=OY_InmRuCXqEN3EUQTW60UiT0rnkshvCeyiJtrLAHqU,101989
+hestia_earth/models/mocking/search-results.json,sha256=Zc6x4KxDAOvez6v5ZhwLxUB_IKghXr8kWX2TUJ8wAFU,11955
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -501,7 +501,7 @@ hestia_earth/models/site/brackishWater.py,sha256=vLEhIZv5PUKwzwvIuYrWi7K---fq7ZX
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=ffrXelDxwBuCVy7cZbhYQA0SKymMhCogPQES13ySSYE,11679
+hestia_earth/models/site/management.py,sha256=jZqcYxflJWsPef2NrQgPxoKNPKAL3gs616HeMMmQUDY,14503
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -568,7 +568,7 @@ hestia_earth/models/utils/blank_node.py,sha256=-IURt-nrVCJUk2Q51Ar46iEYv4Cn3aSdl
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=6wLx8xb2R8HtpEpVy5e-PbioOo7QCu2n-W72fs6OvgE,3411
-hestia_earth/models/utils/crop.py,sha256=imVLCFGB-h4kAktyg3lJPjXCXDQY3Lr5M0Gz_SqXNOg,2573
+hestia_earth/models/utils/crop.py,sha256=szbmQFIfKAgH18PXkwx4FcmSsYOzDM3AHN5z0aYK9OU,2696
 hestia_earth/models/utils/cropResidue.py,sha256=_0Q35CrliJeo31xGHsPWe8A2oHxijdIsOrf3gBEqhlA,612
 hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
@@ -630,7 +630,7 @@ tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandOccupatio
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandTransformation.py,sha256=lcyMTaNMbIjzZrbPxejujfYyAEj2XOH5Ei9pmAQAi7k,1912
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=NTc3PZZRc9ZqGpaARdbuzLWR5bB0HCPw5AMdGmwVsRg,704
 tests/models/cml2001Baseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=a6TF9qQmpcHCndcF3-xyhrVd4F2KFr1gZzaIw8gimQ0,8805
+tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=-913Bo7_IC8vz3Fi1tYqN0mSx6HzwWmHcQs-jpuRm80,8801
 tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=xBoSGZaNCSpfDdNFIbyJhJslDJD5A_eTywz01GDqFNM,4513
 tests/models/cml2001Baseline/test_eutrophicationPotentialExcludingFate.py,sha256=ZIIx_EiYbUxUoAS7NuQrxqwTFS3rXQm9_1AsqF_bhB8,894
 tests/models/cml2001Baseline/test_terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=t3WBdg_aTYSLfaqeXUDyvQJ8ZqbvKwv9RKaZyRzj61k,925
@@ -791,7 +791,7 @@ tests/models/haversineFormula/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 tests/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/haversineFormula/transport/test_distance.py,sha256=hqzIOA1nGao8uiBE16J0ou52McwV4w30ZLpEAqtfi9k,970
 tests/models/hestia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/hestia/test_landCover.py,sha256=pEy8AgHsOH7K6kUdwzDFt6-estJU7xcCFDbKL8x48SI,6051
+tests/models/hestia/test_landCover.py,sha256=MP5sKjForlG1FGHl6W9zGEV5iQu4DoswrQa_ZhMqGDg,6078
 tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
 tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=257nCGseM8IEc7i3c2lvx0AsJOpk5Cy633PlZZQYRGo,956
 tests/models/hestia/test_seed_emissions.py,sha256=dCUuJBkhwNFBhhcypQN7eMqrWZ9iGCnypoidO5DfQYw,921
@@ -1160,8 +1160,8 @@ tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapC
 tests/models/utils/test_time_series.py,sha256=LMhRPf8rp3nAriKAC-2K3FDkrMWntRTUUCERw7Lt68g,2686
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.65.5.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.65.5.dist-info/METADATA,sha256=-IzI9Vpy_Cx1mhf771Yldw8ryByRbTygSrCA78-a_ik,3344
-hestia_earth_models-0.65.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.65.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.65.5.dist-info/RECORD,,
+hestia_earth_models-0.65.6.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.65.6.dist-info/METADATA,sha256=AqVhpmA7vBW5Tu5lG1ovfvzdbF6QjX6IIodiV6_-JlU,3344
+hestia_earth_models-0.65.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.65.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.65.6.dist-info/RECORD,,

tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py

@@ -193,4 +193,4 @@ def test_download_all_non_renewable_terms(*args):
     fuel_terms = download_all_non_renewable_terms("fuel.csv")
 
     assert "coalTar" in fuel_terms
-    assert "sodPeat" not in fuel_terms
+    assert "sodPeat" in fuel_terms

tests/models/hestia/test_landCover.py

@@ -195,7 +195,8 @@ def test_get_sums_of_crop_expansion():
         "zimbabwe_example",
         "brazil_empty_example",
         "gbr_example",
-        "malaysia"
+        "malaysia",
+        "prior_landCover"
     ]
 )
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)