hestia-earth-models 0.62.1__py3-none-any.whl → 0.62.3__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of hestia-earth-models might be problematic. Click here for more details.

Files changed (56) hide show
  1. hestia_earth/models/agribalyse2016/fuelElectricity.py +1 -1
  2. hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py +1 -1
  3. hestia_earth/models/cycle/coldCarcassWeightPerHead.py +4 -2
  4. hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py +2 -2
  5. hestia_earth/models/cycle/concentrateFeed.py +3 -3
  6. hestia_earth/models/cycle/cycleDuration.py +7 -2
  7. hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py +2 -1
  8. hestia_earth/models/cycle/input/hestiaAggregatedData.py +1 -1
  9. hestia_earth/models/cycle/product/price.py +5 -1
  10. hestia_earth/models/cycle/product/revenue.py +6 -7
  11. hestia_earth/models/cycle/readyToCookWeightPerHead.py +2 -2
  12. hestia_earth/models/ecoinventV3/__init__.py +25 -52
  13. hestia_earth/models/ecoinventV3/utils.py +40 -0
  14. hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py +92 -91
  15. hestia_earth/models/ecoinventV3AndEmberClimate/utils.py +15 -105
  16. hestia_earth/models/faostat2018/product/price.py +1 -2
  17. hestia_earth/models/geospatialDatabase/croppingIntensity.py +2 -1
  18. hestia_earth/models/geospatialDatabase/utils.py +1 -1
  19. hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py +15 -10
  20. hestia_earth/models/ipcc2019/animal/pastureGrass.py +50 -40
  21. hestia_earth/models/ipcc2019/belowGroundCropResidue.py +16 -11
  22. hestia_earth/models/ipcc2019/carbonContent.py +1 -1
  23. hestia_earth/models/ipcc2019/croppingDuration.py +2 -2
  24. hestia_earth/models/ipcc2019/ligninContent.py +1 -1
  25. hestia_earth/models/ipcc2019/nitrogenContent.py +1 -1
  26. hestia_earth/models/ipcc2019/organicCarbonPerHa.py +3 -3
  27. hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py +5 -5
  28. hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py +217 -48
  29. hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py +2 -6
  30. hestia_earth/models/ipcc2019/pastureGrass.py +43 -41
  31. hestia_earth/models/ipcc2019/pastureGrass_utils.py +63 -109
  32. hestia_earth/models/koble2014/cropResidueManagement.py +1 -1
  33. hestia_earth/models/linkedImpactAssessment/emissions.py +15 -14
  34. hestia_earth/models/mocking/search-results.json +249 -257
  35. hestia_earth/models/pooreNemecek2018/longFallowPeriod.py +1 -1
  36. hestia_earth/models/preload_requests.py +1 -1
  37. hestia_earth/models/requirements.py +6 -6
  38. hestia_earth/models/site/organicCarbonPerHa.py +1 -1
  39. hestia_earth/models/utils/__init__.py +1 -1
  40. hestia_earth/models/utils/blank_node.py +52 -9
  41. hestia_earth/models/utils/cycle.py +12 -12
  42. hestia_earth/models/utils/measurement.py +3 -3
  43. hestia_earth/models/utils/property.py +6 -6
  44. hestia_earth/models/utils/term.py +2 -1
  45. hestia_earth/models/version.py +1 -1
  46. {hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.3.dist-info}/METADATA +12 -12
  47. {hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.3.dist-info}/RECORD +56 -55
  48. {hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.3.dist-info}/WHEEL +1 -1
  49. tests/models/cycle/product/test_revenue.py +0 -3
  50. tests/models/cycle/test_cycleDuration.py +1 -1
  51. tests/models/ipcc2019/test_organicCarbonPerHa.py +9 -20
  52. tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py +0 -8
  53. tests/models/test_ecoinventV3.py +12 -0
  54. tests/models/test_ecoinventV3AndEmberClimate.py +5 -72
  55. {hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.3.dist-info}/LICENSE +0 -0
  56. {hestia_earth_models-0.62.1.dist-info → hestia_earth_models-0.62.3.dist-info}/top_level.txt +0 -0
@@ -2,11 +2,11 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
2
2
  hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
3
3
  hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoWpUSoM,6065
4
4
  hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
5
- hestia_earth/models/preload_requests.py,sha256=elhYQTxBVuFlZROWvZ3yErDzzMLdMUIjBhmpdaTUSi8,1012
6
- hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
7
- hestia_earth/models/version.py,sha256=PWB3A1c15lnJ0vIqLFnOlwunRfvIyeg_7b4mAWh_mKI,19
5
+ hestia_earth/models/preload_requests.py,sha256=y_okcYzSbqODvmzkw-wOK2cOZEzkJq3pmRfxRsPsUw0,1012
6
+ hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
7
+ hestia_earth/models/version.py,sha256=7aQk_ZZAw1avQvecDCGEiWz0z9mUZWdHHPPAzm2Hgf0,19
8
8
  hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
9
- hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
9
+ hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=tnGxBmJdPfPFfehLUQcefEqy1lHvzsSpx_s7O8nf3Zs,4412
10
10
  hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
11
11
  hestia_earth/models/akagiEtAl2011AndIpcc2006/__init__.py,sha256=WK7xQwUPX48JGqZeb2S2EKdtXuxMjY7HYyUFHItUqUo,425
12
12
  hestia_earth/models/akagiEtAl2011AndIpcc2006/ch4ToAirCropResidueBurning.py,sha256=Mea3L8blwJpRzzJHIMJH71Pn93gz1M2KN2pb43tGBfs,1642
@@ -35,11 +35,11 @@ hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAvera
35
35
  hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=y6aIHefYOBiw_9HeH_jLozxej9p3LVQAPYJz6Cz6zig,1029
36
36
  hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
37
37
  hestia_earth/models/cycle/aboveGroundCropResidueTotal.py,sha256=9swq4YEeJQ2YjVOmghgBYWkMZWdNU4MKCUBY5FsmBSU,3088
38
- hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=SaTHq8AC3o8HylfN0LE1ird2e5ylz4Jo5pcGL2MJCEI,2913
39
- hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=9i52CQHiqZjFYcW1IwKUAgJvFkUvp0BZT_z3Ik-HiSM,3041
40
- hestia_earth/models/cycle/concentrateFeed.py,sha256=TBhBuh98WYrzMEajXyuFRTdVq_pnp0fokCCqL67nfmk,5594
38
+ hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=fQ7huuxyS5PQkRmR_tRCOz9rV3LJwLfLQJjH_TcTz6k,2955
39
+ hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=k0xg5SIfJGwEKteFr2Fh-lh8yDC_sqQw_lBnnfwl9zU,3069
40
+ hestia_earth/models/cycle/concentrateFeed.py,sha256=wiq9KLRuipHz_2_CVfXDuUek0JN1ZPSyKSimtJntG9E,5636
41
41
  hestia_earth/models/cycle/cropResidueManagement.py,sha256=QTRCCFu9VvD_a3_8aAj216vsuhAJEhlAwTJH7ifMkDo,2237
42
- hestia_earth/models/cycle/cycleDuration.py,sha256=9EvmdBdyjgKqiMi643PMVPvlrzRInP00WKiB2hv96NQ,3016
42
+ hestia_earth/models/cycle/cycleDuration.py,sha256=SuTFqCP3Zr3nOV9HuvvvIVcaHtOlTAdSaaswvRLSEwc,3242
43
43
  hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3Ca__F0KJ_wlwTxbPd7mUyehZW7AJPM,2212
44
44
  hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj7xhucYx3rB8Co,3949
45
45
  hestia_earth/models/cycle/excretaKgN.py,sha256=mgJTneQIYJ9Su-rTK5ppb_k3YhICFNWsfPZtGR98RI0,2968
@@ -50,7 +50,7 @@ hestia_earth/models/cycle/liveAnimal.py,sha256=LWAMnNKRoLDdChrGApVIN-Ns7em0Lspz5
50
50
  hestia_earth/models/cycle/milkYield.py,sha256=RhzePjkvEAGicTzRA4eatc0K_4NSGHhyEhYF0EbbGXw,5820
51
51
  hestia_earth/models/cycle/pastureGrass.py,sha256=7PrmDMJPtsbKGa8WIOh_4NXNtbH3Pxb23pmjawQuY9o,1226
52
52
  hestia_earth/models/cycle/pastureSystem.py,sha256=uksVgl_3bp_t2niwZ5BvS3VT-Kndx26Se6GpzqG0bX8,2709
53
- hestia_earth/models/cycle/readyToCookWeightPerHead.py,sha256=F4UtK1gSsIYqbQ1V2hSUszSrq2HFN5LdMB33Yc-bfTQ,2927
53
+ hestia_earth/models/cycle/readyToCookWeightPerHead.py,sha256=R1Rt3WsTzwnI2Bqljx03RpdG0A1-bGV4M7EqmcP7Dzg,2955
54
54
  hestia_earth/models/cycle/residueBurnt.py,sha256=HwU1D9ibiIul-FlXDUcEMDEc_KxpB8ug0SLz-4rXxKk,2106
55
55
  hestia_earth/models/cycle/residueIncorporated.py,sha256=9_s2RMOy5D20eq9ziDBEA_Y7RiFFMeK0bDJ65CW4qlE,2763
56
56
  hestia_earth/models/cycle/residueLeftOnField.py,sha256=qYxKGAdUORN7Vjqj7AZC2VGV_rM3MN0-padDGhgjiNU,2175
@@ -64,7 +64,7 @@ hestia_earth/models/cycle/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
64
64
  hestia_earth/models/cycle/animal/milkYield.py,sha256=bx8oNw9tZkqSgcRlbxIL6V2nEHx-p0KJc31v7PaLKxI,2926
65
65
  hestia_earth/models/cycle/animal/properties.py,sha256=OGjRl79w-h439jTkjA8b4V61fMuo0McoUs3JrgK-0Zc,596
66
66
  hestia_earth/models/cycle/animal/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
67
- hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=Am0_brWKZmfiZC3qP6ZNlOXzkE1Eo3R45KrmvZrTRvQ,2505
67
+ hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=neIyzpLIuVheD2A42KdqKAtdgVa2SJ15KdpoxQ8JH1E,2505
68
68
  hestia_earth/models/cycle/animal/input/properties.py,sha256=2bKyyclrt0O7zvtD1Ij7g1qfb0raBylrdO--cZjcnpg,3354
69
69
  hestia_earth/models/cycle/completeness/__init__.py,sha256=rkwGtxIay_AleJCT7al_ngnix_xRqySVie7qvHXMQI0,1517
70
70
  hestia_earth/models/cycle/completeness/animalFeed.py,sha256=8Fo1TqwSuiPudvd2vJ-LVxSyOdD8mDCOZMvjuj5W2uo,1012
@@ -79,9 +79,9 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioCarbon.py,sha25
79
79
  hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=zf-v-cAPLpSe7sr1auzUUXkjXwpXRTVvsCrzbZrwBI8,2388
80
80
  hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha256=C6ZyjZDUHU4UlIr6tlvHoCQfsC5jRQ87U7stSn95jzA,1984
81
81
  hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=7Dss1AIbG7GimQ3-Ecv2wsx1PrblZhHFYhMHWoyvPc4,2140
82
- hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=Mgur-o_ki1deMukBS5-ngeqdCIYVBE36kOiY-jB42EY,2581
82
+ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=RV7lLd4PiFRCkH83-DvuZKnOCA9bXbYOcDHea8Wz4LY,2603
83
83
  hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
84
- hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=7WhSOTUKq9A6mrDwOu5gMOHtkhK0oby8n-DAO4LaWLs,5035
84
+ hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=XkO72m16xZxX0ykBOw8Dx14eM4yTEOG12m7HwoUZ9HA,5035
85
85
  hestia_earth/models/cycle/input/properties.py,sha256=r5EF18b_KW8evmdlev0mLQyqwBVgSicKEyilGaBRF6I,3017
86
86
  hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
87
87
  hestia_earth/models/cycle/post_checks/__init__.py,sha256=5ThdvGKp7ilFOzn8Tq23c4XXqhA345PYIe63yOtGJTY,336
@@ -97,10 +97,10 @@ hestia_earth/models/cycle/pre_checks/site.py,sha256=OkrEOxwbo5rzAWQaPt2p9uZ9g7Vc
97
97
  hestia_earth/models/cycle/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
98
98
  hestia_earth/models/cycle/product/currency.py,sha256=lB1pCD1747Ke3oFoqjAKEHbIdHPfrHKNaJSni69iMUQ,2150
99
99
  hestia_earth/models/cycle/product/economicValueShare.py,sha256=jSuwTa94OKnI4vn8B_DVkVyjRHSqDGoF6rAwl4NK1zk,8540
100
- hestia_earth/models/cycle/product/price.py,sha256=E5Q0TkfbbsJHZZD3cBGZvvHj0f2sJrgLGulRCyILTbY,1449
100
+ hestia_earth/models/cycle/product/price.py,sha256=BUkY9V2Frg442HEGG7PLmXZFTrBPbBFDTk5LbS40Ajs,1588
101
101
  hestia_earth/models/cycle/product/primary.py,sha256=FYyl-Mv8AmEml1nhDJwU01N4LrszJm6E31eztQDHzdg,1853
102
102
  hestia_earth/models/cycle/product/properties.py,sha256=PiwCod4dlMScTm_MQhY35QpeLRuHvdsc_nijv_7TqNM,1377
103
- hestia_earth/models/cycle/product/revenue.py,sha256=cuMKdj-oJ0wej-xC35dLyEWA2Qqe0V03SowQ0IIGoFI,2472
103
+ hestia_earth/models/cycle/product/revenue.py,sha256=-PmQWbdOLyoemo2afzYPbI5Te7-BslGK7er1HxDL-t0,2438
104
104
  hestia_earth/models/cycle/product/utils.py,sha256=nCQIFgwfI4meSRftV9v4vuxKAy3uUtShpN1pr2mywCw,359
105
105
  hestia_earth/models/cycle/product/value.py,sha256=8f_6Ornn06lbNR2U70qmxn-iwh_TIEFGjB3_8TzCFxs,1596
106
106
  hestia_earth/models/dammgen2009/__init__.py,sha256=dZ8tIXl6e3ZEixYrWiW7rzoqRJVFOoxi4RPvM3N0L1E,412
@@ -109,9 +109,10 @@ hestia_earth/models/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
109
109
  hestia_earth/models/data/ecoinventV3/__init__.py,sha256=oevyurRuioXy_CsQCtG-S_FXEpiEDeQ-UK5a0jPBXcI,1155
110
110
  hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
111
111
  hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=2z10WqMsGUDDO8xJ3lmXvSUHgzz2t6PPRDha5NHoT5s,3291
112
- hestia_earth/models/ecoinventV3/__init__.py,sha256=nSktsE0c9ohx1FyDEEi-YlnGgMGNd-actCwPs_htzC0,6309
113
- hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=H5fxfUy6HLHxRgvG3oPZ8pnLbq3Axm0Ejkp9CQ2UGlM,5306
114
- hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=dXjLfubt2p-PBj1rKoMPr2o0j6jFMDwLyZXpBL_VV3Q,4426
112
+ hestia_earth/models/ecoinventV3/__init__.py,sha256=QrWtudsuO5MuVn_gENz6KsHuq21j3Jy94gE7eyvm2ug,5214
113
+ hestia_earth/models/ecoinventV3/utils.py,sha256=HqtD8MzK9C_RCJ-ME-5G4J1KoCn5FqmAx4l0kjsCDbM,1577
114
+ hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=XYFDUNpQpzbjPgLus0YlM3UdiXX7LLwn-XJqjrH9ywM,5801
115
+ hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=INWB7gyhzk49GQ0KAcBS-Kzwdoyd5MQJcsCtuT6XxZA,1352
115
116
  hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
116
117
  hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=DfoGlB5HjA1gafO0OutJjfsA6yPP_PsAd-p16evwCiQ,1609
117
118
  hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=R3lRF5-Md4Jd7irvTe8WJZJPc9-wa1pD6UWVk7lnGtQ,1616
@@ -135,11 +136,11 @@ hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=b1_GZQ3oFl88w
135
136
  hestia_earth/models/faostat2018/seed.py,sha256=ts9PKs9UnZnJ9nPFlL7etL1Qb9uIWIES8Mz8W7FWbOw,2917
136
137
  hestia_earth/models/faostat2018/utils.py,sha256=r69UWDdMOLTYkI8_oQeEnUCOAZCnmwj_NwyrypAOb_A,3734
137
138
  hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
138
- hestia_earth/models/faostat2018/product/price.py,sha256=J0G-Si0AnlER69FFbC8Lkwpn_05CtA8wV46KoFAYPm0,7757
139
+ hestia_earth/models/faostat2018/product/price.py,sha256=X7Zxa-rXthzYdgw2lzybbHc-oKGE5nyXpBn-BfZC_7w,7753
139
140
  hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
140
141
  hestia_earth/models/geospatialDatabase/aware.py,sha256=cbxFnShXW8QUCIjU4uuO1DdK9KhYiLf41ZVjS9hSppI,1358
141
142
  hestia_earth/models/geospatialDatabase/clayContent.py,sha256=HWaswqkf1FZXcRHw8DrMvvpH2Uo3nbjX4C0D1tqyTBw,2710
142
- hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=NcUUP3UxpY-Bd5lxLrX5q93OJtYeaq-a3seLq1T2ab0,1876
143
+ hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=V6ra1BvyXWXfHZHdJNfgbQU8D6piI0-rG6GxKHcy1pU,1975
143
144
  hestia_earth/models/geospatialDatabase/drainageClass.py,sha256=CVagB2wxLnHgQQauDyYCJCfJw21OPB7Ry8BVyt2uPak,1883
144
145
  hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=hzK9Je_4NvbLtgAM48G7yf-6jrcMpsDzqSlLkVP3oYg,3625
145
146
  hestia_earth/models/geospatialDatabase/ecoregion.py,sha256=awvHn0YEVu-YaW0ZDgBo_zbjSJU2EvydM_qAT_CL78A,1462
@@ -166,7 +167,7 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=j
166
167
  hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=hJjbnTgefBtRwL5IJHaaPFtRvzTDv7l5nDI8vdadMCg,3353
167
168
  hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=kjP3ue-tlzMQNx2hBM56_CBBRa8Pcosmd2BPgyiNVW4,2081
168
169
  hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=5oasLMYgfnPwSse0D8EEe_pV57AMusac853BgVSUh5E,2070
169
- hestia_earth/models/geospatialDatabase/utils.py,sha256=tjc9Z1wkDzlZ0v82oy5fHwixak3YDq4QCZprNjnm5_M,6208
170
+ hestia_earth/models/geospatialDatabase/utils.py,sha256=5Vs4Y8lttH2-pUUcQRMbxnvmhfndVuOeNDY8OWPR1ns,6208
170
171
  hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
171
172
  hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
172
173
  hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=pajS-6UWxqIqnzW0IjkgNm-2Vl3bMor2UZOQtQQERuc,4096
@@ -216,17 +217,17 @@ hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=8VRg-Vvzc86_CQmB
216
217
  hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
217
218
  hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=PTE0FEV5x7MZgWpA6iu7EtIYaYKl6Udc9icpafkqlEA,979
218
219
  hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
219
- hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=KjCPJ-AoEuBQzz9uBq_tQXG0P3KxM1bEKcwF_Jeq4Dg,2932
220
- hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=DYic7zGSzkDP6kA5f6tRTB5alARCMGWY5ApjPkMU-7c,3323
221
- hestia_earth/models/ipcc2019/carbonContent.py,sha256=I76bJaO1OYSrIjwDKxhwY-DZGZJubgVJSxtZHx5jQxY,7237
220
+ hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQqZRfPEvFT_bMTayMXgIsFLnx8I6iYzw,3089
221
+ hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=7AFU2Q0qPAvv6uEKWByS38jl77FvjTPbGm2GQ53waGg,3499
222
+ hestia_earth/models/ipcc2019/carbonContent.py,sha256=tlQvu4Auhpjmaz7XrZz86xwxVrJhsYYf8DFA_aQeev4,7255
222
223
  hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=khX90NjkmlvosyRZ77QxgwTKwg42Z_ftOWTTAanHViw,11420
223
224
  hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=jEGgEUhMr0JHq_-lPJioKHOQGQXrQvblU51AppXKvB0,6719
224
225
  hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=TJ4J7VA5n4RPrJYZQeR3lc3ZoCw7T1E5Cb1XJewr834,7331
225
226
  hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
226
227
  hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChangeManagementChange.py,sha256=D-4h4a8Ob_radqS6Gj3K8eLqTeXJrFIbfO9viusd6Pc,27585
227
228
  hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=Ofld5SuRKndcKB3FFFoUdzSgNq-gc4kmiNyyrPKQ3Io,3580
228
- hestia_earth/models/ipcc2019/croppingDuration.py,sha256=_jlFrTNDOARH2_g8s4dzuaCoLHSX2BHzSQd3uuQN32Y,3173
229
- hestia_earth/models/ipcc2019/ligninContent.py,sha256=wp5EbCthCDAKyvPBfZULS9-uKEY58TQQ8ey1pf-juv8,7267
229
+ hestia_earth/models/ipcc2019/croppingDuration.py,sha256=-CesZ2cNDOQoU3QyVFnSWYO-6-JXxuhRDQoHoxTawDA,3228
230
+ hestia_earth/models/ipcc2019/ligninContent.py,sha256=Qh-UH4lv1TIf7wWlbAPwIZZHxzbbmQgND3m15pt5Si8,7285
230
231
  hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=Fand7NbT27unwgFTxi_9NxT024s63vQ7U6-tk9yp3d8,3990
231
232
  hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py,sha256=_Oj6Jw8F4rce7FmhWkzeqyB7W3ZQWpOiA10p6xrfSwc,3777
232
233
  hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py,sha256=hw-rFZT9PW_hnWohmMbjTyav7dmasS4jl2wdNuBxsOk,1994
@@ -237,22 +238,22 @@ hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserDirect.py,sha256=Tq0lw-zGq
237
238
  hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=g2ssg9GEH2ShuNtY4g4R5GUIHf85u1azx4c264Hdoag,3700
238
239
  hestia_earth/models/ipcc2019/nh3ToAirInorganicFertiliser.py,sha256=gvfv4VBHmEkppEMoHUIicAelYICdOjKxKBUw5f3meiQ,4480
239
240
  hestia_earth/models/ipcc2019/nh3ToAirOrganicFertiliser.py,sha256=Oih-34cGl7AZ_sIYWXktOWrzmj3_onvk3EW5f8-7QKI,4152
240
- hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=6fGG7diDp9zAidVH75gXz9c8uxURx0Q2COo8KrkT3I4,7191
241
+ hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=YxlcDF0D9F79rYHTeuhl5kEtmb01UcspFInKi6I_zKM,7209
241
242
  hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=8NOjbqJuQ-wnLz3bYmwaygSzKBdaF3N7hoELGNnO4YQ,3115
242
243
  hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=mJUXLGtg9EOZq9LH0KFOKvzER1ypCUucs0ZMaNYMShc,2991
243
244
  hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=eyPfyIi8EqigOTsEA0BSyoUePyy_AjMlQNJ6Z8yyJ_Q,3413
244
245
  hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-uaus2cftXzlsYCUAxLuon6BnDXmaFI9xhQrgU,3347
245
246
  hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2TrrLY03jYly_KvDnCsAXqhL_tmZQQt-A,4480
246
247
  hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
247
- hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=8rQifRZYQdoBz9HpoSbmrKiGP7ayQUZT78KEErgqtwc,8658
248
- hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=B7pwVkpt2YTo49yImTAQ4rr_Lu03zaPb5LEDKm0WJJI,82431
249
- hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=Zb3c5Wby1ZrRXs4n9qPgP04oIRZn9EUjkH65uRSk8Dc,58015
250
- hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=CrQWsDhW--wNQ2HEc_zxdFKuIdBHEwOQnVJGA3HgPpQ,10856
251
- hestia_earth/models/ipcc2019/pastureGrass.py,sha256=VXUqbvNmRWJy-oTD2ENj8wxhZ-YWivNMxjk4znt5t74,9344
252
- hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=ITQSFQ0zLCqbrKoMuYQ9MaP_-F768uNKdltf5zZCwUs,15833
248
+ hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=iRUSVxMpBGgsVDkuBABPKI4Khr5jIpAwuBe66c1PeV0,8658
249
+ hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=JxVJ9mRml63VhwNSNq7H3O7YQJoXLgP4j9fIRs3ms5o,82431
250
+ hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=A84r6u45HFk5jEb2nTWGTFTwX1qjq8F6qwkNUuiyH48,63542
251
+ hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=jIhRks8ewCtQNIIN89N_4A4Tp529YMQnk4YmZV6FOCY,10668
252
+ hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Dg94o-tMVR-SWW6dIK5kwbV4pcMBHEWtcSS2JhAtpXY,9491
253
+ hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=TqGHj4yZmEO6cVV3VeqSTl11TGRpipnliMMUIOqTy1k,13744
253
254
  hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
254
255
  hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
255
- hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=ej1cyJKUqSFP5CsdV0iU_ucpGxN4VWbaw2caKi0rtoE,10966
256
+ hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=QyT0qRO0lAJJU0Tp3PlDtXzbs7J6BXSX9kWo57T9GMw,11417
256
257
  hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=5smSAmKVCIlELCD6S_3I16YuSWNFhcClGDOdvrIuYsE,3657
257
258
  hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
258
259
  hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
@@ -260,7 +261,7 @@ hestia_earth/models/jarvisAndPain1994/__init__.py,sha256=ercUwy29sV7oPIESj8UjsGB
260
261
  hestia_earth/models/jarvisAndPain1994/n2ToAirExcreta.py,sha256=003gtGusD1MFJqb2iRck4d54fw25-1h_O2Zoy8mFHrc,1452
261
262
  hestia_earth/models/koble2014/__init__.py,sha256=jRciLONEhGHtMLu2rlWXEEVwcJqA-URsfH1cCt-Qti4,410
262
263
  hestia_earth/models/koble2014/aboveGroundCropResidue.py,sha256=v_gbHVDjG4ayCt1mKBIOLyZfkvDKpm5Lrs1pqq2Z-Sw,6270
263
- hestia_earth/models/koble2014/cropResidueManagement.py,sha256=2MNBHlPRpGjqAOIRzdSRU1IiOpuD8rhc3jgk10eXiYI,2927
264
+ hestia_earth/models/koble2014/cropResidueManagement.py,sha256=NnHjf7lH3JsTgKkfPwVLXKhcDmcpgSg-S79yFhu5EH0,2927
264
265
  hestia_earth/models/koble2014/residueBurnt.py,sha256=eU592boTzkgOCu7g2h-6BH0Ovcup_p0IWfpzoYMUZ68,2246
265
266
  hestia_earth/models/koble2014/residueLeftOnField.py,sha256=BENMR_BUk0nYfe1YjTSz7y9hP9chZisl1Je1pP7KEyA,382
266
267
  hestia_earth/models/koble2014/residueRemoved.py,sha256=aauhHnw5yFm0uqpvUPRFaVKq1A5548S_Z4wLMn8hB0E,2010
@@ -352,7 +353,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
352
353
  hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py,sha256=U74max756dWZLVbLNUAHcHeUiHADLxuvRbvpJc4eSLc,1182
353
354
  hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py,sha256=-8e8-lt0yByEcVbk7bTF4-z3t51w5iQKVdZ5bgYsyJg,1063
354
355
  hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=SPP09DMS4zUThyQfcgLpivFwsey4WSt77CDMYHJPKWE,423
355
- hestia_earth/models/linkedImpactAssessment/emissions.py,sha256=od49hQAJCnjxG3mI2W7ZoOfiNPoUAWMWtklB5_2syoY,6274
356
+ hestia_earth/models/linkedImpactAssessment/emissions.py,sha256=9VFM9DCk0mw2W62Ff5P5y-X7GZrcFGDfcKFvrLDzkC0,6340
356
357
  hestia_earth/models/linkedImpactAssessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
357
358
  hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py,sha256=SggB_4tpiKNeb6TIQWBm-X9VwG4pzLoyHdK8JroRIsE,576
358
359
  hestia_earth/models/linkedImpactAssessment/landTransformationFromCropland100YearAverageInputsProduction.py,sha256=jxeJS8r1qYIoyeEE-MGKbldEDL3x9CG8aIb4JdcUnj4,1036
@@ -366,7 +367,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
366
367
  hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
367
368
  hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
368
369
  hestia_earth/models/mocking/mock_search.py,sha256=dBCDRfbZmbMLKP21u_VYkxyimomqs-zztjX-_ZNKuuM,2036
369
- hestia_earth/models/mocking/search-results.json,sha256=GyPI-u-c5vWqHmSgPI2684DgFvpNJgLRNiZb91wu3uE,43624
370
+ hestia_earth/models/mocking/search-results.json,sha256=E-YgXbJEDOtPpC7VCv0bf1ckfQbZwkoLT-SzG_TcIh4,43349
370
371
  hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
371
372
  hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
372
373
  hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -375,7 +376,7 @@ hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=kLWtv49c1sD3YrporqRcmw
375
376
  hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=nlnZSDx-bIvtukL79Syhon0cSQ8o4OC1YKtAG6haGhI,8500
376
377
  hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=HB_9q5eE6al2Te3v29hC5wqxsYe4P46ZAPwdWNzx3v0,3939
377
378
  hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=jE110XgPMgfnBMUXyKIL5SL9yZWYhdGr5NrfHcqn2h0,2785
378
- hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=8Z--QMhRItR77RsZFr6v1EPVZdv7pBxyl685t3Iit5M,1561
379
+ hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=yttZiWc1Tr3Tqe2C3-rWYoEyogIUDraoVWnDxwH3vYs,1566
379
380
  hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=HJ7IstImGyasIKosK2lQZ-v6Lqt3_aEfZhoiC4CY0rM,2586
380
381
  hestia_earth/models/pooreNemecek2018/n2ToAirAquacultureSystems.py,sha256=SoZlogDd7_4kq5S9gc8KmVeIXacWWhaUkWlKTuho_OA,2431
381
382
  hestia_earth/models/pooreNemecek2018/nh3ToAirAquacultureSystems.py,sha256=4TDILoagYMVBSBbVXEecIOv-pzQ-W2Hg6rpL58t1-J4,4001
@@ -467,7 +468,7 @@ hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZ
467
468
  hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
468
469
  hestia_earth/models/site/management.py,sha256=iljb0YjZqQcilXNlYIffjfEqszvMaLRKJlgv0TKIe-M,9627
469
470
  hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
470
- hestia_earth/models/site/organicCarbonPerHa.py,sha256=O6t4D3Jj1kjMIBOpnIrJ58kzUP_FIlpMUEFKQAeS77c,14916
471
+ hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
471
472
  hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
472
473
  hestia_earth/models/site/organicCarbonPerM3Soil.py,sha256=pdv5V-ojcfhlGzPwRS9s-vEnxiHZQPZP-ESVcz2pt0g,1945
473
474
  hestia_earth/models/site/organicMatterPerKgSoil.py,sha256=fJpFVkpuCjnrBhgV0RtwKqQHvAJWWtZO9xtmnJnl8O4,1945
@@ -523,19 +524,19 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
523
524
  hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
524
525
  hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
525
526
  hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwThnMXjZymif5buyHiczFiOq_61jOdDMOAyy8vwQ,1018
526
- hestia_earth/models/utils/__init__.py,sha256=EIuMvZCFyeUC4yyJi9LSVYpAMkjpAMMtBs1ljqJhVR4,5228
527
+ hestia_earth/models/utils/__init__.py,sha256=s9kqI1lHCvY6XmssTe5s3CzgrOQ4MKzlCiGmtr3ueE4,5228
527
528
  hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
528
529
  hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
529
530
  hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
530
531
  hestia_earth/models/utils/array_builders.py,sha256=0_Ik0gKoh1QBijyb-55odh8_dIs-CWQ3lgUN1Hnc4Y8,18749
531
- hestia_earth/models/utils/blank_node.py,sha256=TpjIepoRvHnffOjmv-N4HjYyMLCdUBGVrzwoPVCB3S8,43013
532
+ hestia_earth/models/utils/blank_node.py,sha256=WA3cb3QQ0HeCPwao4VDBXp5OssXrg-QElr_14HOUHa4,44499
532
533
  hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
533
534
  hestia_earth/models/utils/constant.py,sha256=7wn5LBdsqlLdCrPaVASYjsxNtbaOSdqVWKedOFgyzfY,3249
534
535
  hestia_earth/models/utils/crop.py,sha256=kG054fryqPSBpmzvJFBy_CLiOdjrt7RMk5uTItO5ADg,2246
535
536
  hestia_earth/models/utils/cropResidue.py,sha256=_0Q35CrliJeo31xGHsPWe8A2oHxijdIsOrf3gBEqhlA,612
536
537
  hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
537
538
  hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
538
- hestia_earth/models/utils/cycle.py,sha256=QgTmfds-SGEqGJNqEZ5A1iAxCZ54Ac0QPSmqECHPFeg,15927
539
+ hestia_earth/models/utils/cycle.py,sha256=78J3pS0nW-S296OPl9RrPlHxDQdXY-3W66tKo_mANXU,15927
539
540
  hestia_earth/models/utils/descriptive_stats.py,sha256=qOyG8_TpWYmaxZ0h99n9L71gDLLiVMrMf0ChtxnZLjw,8559
540
541
  hestia_earth/models/utils/ecoClimateZone.py,sha256=NHFt-A9EiWXC6tUNIxkgOWUZOjj4I4uwJIP9ddDZegw,1112
541
542
  hestia_earth/models/utils/emission.py,sha256=5Dz8Z4P6QXbYSvOzVcqJy3R_oZMrp77_Iwj5xZsxsKc,3769
@@ -549,24 +550,24 @@ hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF
549
550
  hestia_earth/models/utils/input.py,sha256=YycsAbSBfVDMu6PftDsisMFGnEp87wOj-3rrnHnOgzo,4927
550
551
  hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
551
552
  hestia_earth/models/utils/lookup.py,sha256=cPFzUXUsgyvmm98quNJs5J1FbMdl1I7DxlTtmw0IWsw,6673
552
- hestia_earth/models/utils/measurement.py,sha256=rss0nVmgL5uAWE7_aaGWIJAcg7SkWVpDUzgzHpuEpdo,12221
553
+ hestia_earth/models/utils/measurement.py,sha256=rxrrOVdkDm-J0QVjCEapa4z4KY3hUw-brAeb0pW1nIc,12221
553
554
  hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
554
555
  hestia_earth/models/utils/pesticideAI.py,sha256=6f8b-dFm3qr-eY049_eOvj_iDk4XBam61csozdDAvyA,2361
555
556
  hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
556
557
  hestia_earth/models/utils/product.py,sha256=H9UqJNzTqtMWXDQnbRkZlTpv_hg4s-Tya469fBk8InA,10143
557
558
  hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
558
- hestia_earth/models/utils/property.py,sha256=gHPEmy3Sw599ox64Gv-LCvjhP1THlBXBaBlTOK5lvog,5060
559
+ hestia_earth/models/utils/property.py,sha256=_9Wy0oZIBLsa-jOiGLokKehYLNdz-_7LfLaE4fb6SWM,5085
559
560
  hestia_earth/models/utils/site.py,sha256=yei3qk7edxb_boag9h8j713r06KGstjTBWdb1KjqMus,3602
560
561
  hestia_earth/models/utils/source.py,sha256=Y-CcO5Y3q5Hz4A4RdX35C1EUjL9w1NKnOrzVfOWQ7nU,1748
561
562
  hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
562
- hestia_earth/models/utils/term.py,sha256=n_T1Qp_0z9ZUgrbVACNKue-5yDePOCkDw8g8dlMKSTM,17763
563
+ hestia_earth/models/utils/term.py,sha256=pGg59IUaiTWlqKiT2jgIGvfZriVXaPwsLUbxWvBPXtQ,17812
563
564
  hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zuxzsYl3W8xOu2p0,370
564
565
  hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
565
566
  hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=TGXyusrRd9shT842iqbrI6MkQhICgw7uYdrl4jsDrg8,4193
566
567
  tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
567
568
  tests/models/test_cache_sites.py,sha256=AsZSGb4ruFqag74wRaQxpoZxbMxexPY8q8sMb2ergzg,1986
568
- tests/models/test_ecoinventV3.py,sha256=gde7ny9ThMmezkDcTmS3ZKn82MNOaNSrpMcbkTjFJxk,1491
569
- tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_V4d01j6itpwa_22H2GbSlRfOLN5KZLCxCIjkPdwoNg,3660
569
+ tests/models/test_ecoinventV3.py,sha256=ojL19T8kFNCiM5i-EgvXniLWBxU4RCsBOgIQ-sbGaMM,1894
570
+ tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_EOxdrdavXP6L5_LtvaVbXb_-56UJXSaiPhpGntmwVc,801
570
571
  tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
571
572
  tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
572
573
  tests/models/agribalyse2016/test_fuelElectricity.py,sha256=u_wNlqngJc8NELPr16kYsYQ-_2PcL8BnrfJucY7dccU,1353
@@ -602,7 +603,7 @@ tests/models/cycle/test_coldDressedCarcassWeightPerHead.py,sha256=DrdI1TUmggeeQv
602
603
  tests/models/cycle/test_completeness.py,sha256=Ku1ZSApGaACkXe3ae14yP01C4GssHMwlPG_UPrSytPo,1625
603
604
  tests/models/cycle/test_concentrateFeed.py,sha256=tgkThL4g293CexLvb89ftO9UqUbHhNOxiP6QMmsqCCo,2013
604
605
  tests/models/cycle/test_cropResidueManagement.py,sha256=vQWl7rDYLJjiKyBQlCiOA76LpzM4dI2t7JJ30uF8H9M,2020
605
- tests/models/cycle/test_cycleDuration.py,sha256=5anGBbvxFP7YKO9za80bNFL_DoZdtqhMYwJKkvNSi34,856
606
+ tests/models/cycle/test_cycleDuration.py,sha256=2KExiliuOa7_j88rJuPObJKZqq0xsRnFAb0ZEqc5KEM,846
606
607
  tests/models/cycle/test_energyContentLowerHeatingValue.py,sha256=ZvHigQrtneKrRc8qr7rN8aj6tuA0ds0V6Brh0UzN_T8,1204
607
608
  tests/models/cycle/test_excretaKgMass.py,sha256=xpuq0k5HKvnGmWdJy0GmIv6A4xYk2VDFB4BMb8J2Z0g,2925
608
609
  tests/models/cycle/test_excretaKgN.py,sha256=xoe0PF-DwhVkihN-1BonUa7u_QNM9lr7CmGXsOozQ0Y,1090
@@ -659,7 +660,7 @@ tests/models/cycle/product/test_economicValueShare.py,sha256=sFS-gKt6oglqeKuDqHs
659
660
  tests/models/cycle/product/test_price.py,sha256=zmWNdF2P4k2QTje_62NJDklCIwmk2vF8xuOoVzL9qf0,1193
660
661
  tests/models/cycle/product/test_primary.py,sha256=UfLOOxUkDyeSOmDv4NyN6v5Yf0RO9etZNT797fbCbpA,1862
661
662
  tests/models/cycle/product/test_properties.py,sha256=7pcBH_Ny8JeQ2dWXBU-ZSmY5iYl0f_qFejp8Vk5e1H8,1142
662
- tests/models/cycle/product/test_revenue.py,sha256=brcr-zPhhLChw3t-oyApVdcMjvyRszDVELMQLi4t398,917
663
+ tests/models/cycle/product/test_revenue.py,sha256=H_LxjvMEyyr8dr8SAC3zWezGsGcD4lglVt26eT8QoL8,849
663
664
  tests/models/cycle/product/test_value.py,sha256=IfkcE8kgrvXg_iIbnoJ3n0CIjlfgg_lHkILQ8u38HVE,963
664
665
  tests/models/dammgen2009/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
665
666
  tests/models/dammgen2009/test_noxToAirExcreta.py,sha256=RWd9QvzmJtN9M6UC6KDHkXwtKvwv0aAfMuI9HtsJLvk,1213
@@ -795,9 +796,9 @@ tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9
795
796
  tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
796
797
  tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
797
798
  tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
798
- tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=PJ3l2LexjybgA3IIYzYYZ01akYq5EjmCT4y6JYavL54,13989
799
+ tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=9i1xEv5QEc8C9e0c0iVGwLOWisZVYwwlnAsEVmMv5Lg,13245
799
800
  tests/models/ipcc2019/test_organicCarbonPerHa_tier_1_utils.py,sha256=e5RpK4GlH9tNxbwEyPQkO2lMwYBtGNp8ha8j4bZF9eg,20699
800
- tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py,sha256=gHAi0qr9vE2_TtyJOqOc5Wc8ZRIflQz8vKBOcvKTzCE,7020
801
+ tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py,sha256=6YXLqH5wz_cvYlJjCacCv9UTYpnXYxURLKQz6N9ZMPg,6807
801
802
  tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
802
803
  tests/models/ipcc2019/test_pastureGrass.py,sha256=xcFXpszkqgeJImWOp-JlJxpcSHQKC-Pi0zdaKfai4a4,2660
803
804
  tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1087,8 +1088,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
1087
1088
  tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
1088
1089
  tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
1089
1090
  tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
1090
- hestia_earth_models-0.62.1.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
1091
- hestia_earth_models-0.62.1.dist-info/METADATA,sha256=qY8BwGkgTl3hz-Z_6-hq_wEHb2H6bnDiHbC2MdBwu1Q,3350
1092
- hestia_earth_models-0.62.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
1093
- hestia_earth_models-0.62.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
1094
- hestia_earth_models-0.62.1.dist-info/RECORD,,
1091
+ hestia_earth_models-0.62.3.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
1092
+ hestia_earth_models-0.62.3.dist-info/METADATA,sha256=W88V_K9ahWR2FHo76_7FbHPa6QINUx_0glKvYrO5G1c,3343
1093
+ hestia_earth_models-0.62.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
1094
+ hestia_earth_models-0.62.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
1095
+ hestia_earth_models-0.62.3.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: bdist_wheel (0.43.0)
2
+ Generator: bdist_wheel (0.44.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5
 
@@ -20,9 +20,6 @@ def test_should_run():
20
20
  product['price'] = 1
21
21
  assert _should_run({})(product) is True
22
22
 
23
- product['revenue'] = 2
24
- assert not _should_run({})(product)
25
-
26
23
 
27
24
  def test_run():
28
25
  with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -28,4 +28,4 @@ def test_run_with_temporary_crop():
28
28
  data = json.load(f)
29
29
 
30
30
  result = run(data)
31
- assert float(result) == 264.7807110234042
31
+ assert float(result) == 264.781
@@ -28,13 +28,6 @@ COVER_CROP_PROPERTY_TERM_IDS = [
28
28
  "shortFallowCrop"
29
29
  ]
30
30
 
31
- CROP_RESIDUE_INCORP_TERM_IDS = [
32
- "aboveGroundCropResidueIncorporated",
33
- "aboveGroundCropResidueLeftOnField",
34
- "belowGroundCropResidue",
35
- "discardedCropIncorporated",
36
- "discardedCropLeftOnField"
37
- ]
38
31
 
39
32
  IRRIGATED_TERM_IDS = [
40
33
  "rainfedDeepWater",
@@ -104,6 +97,7 @@ def order_list(values: list[dict]) -> list[dict]:
104
97
  PARAMS_SHOULD_RUN = [
105
98
  ("tier-1-and-2/cropland", True),
106
99
  ("tier-1-and-2/with-zero-carbon-input", True), # Closes issue 777
100
+ ("tier-1-and-2/with-residues-removed", True), # Closes issue #758 and #846
107
101
  ("tier-1/cropland-depth-as-float", True),
108
102
  ("tier-1/cropland-with-measured-soc", True),
109
103
  ("tier-1/cropland-without-measured-soc", True),
@@ -130,6 +124,7 @@ PARAMS_SHOULD_RUN = [
130
124
  IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
131
125
 
132
126
 
127
+ # TODO: update mocks
133
128
  @mark.parametrize("subfolder, should_run", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
134
129
  @patch(f"{term_path}.search")
135
130
  @patch(f"{property_path}.download_hestia")
@@ -138,13 +133,11 @@ IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
138
133
  @patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
139
134
  @patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
140
135
  @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
141
- @patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
142
136
  @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
143
137
  @patch(f"{tier_2_path}.related_cycles")
144
138
  def test_should_run(
145
139
  mock_related_cycles: MagicMock,
146
140
  mock_get_cover_crop_property_terms: MagicMock, # utils mocks
147
- mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
148
141
  mock_get_irrigated_terms: MagicMock,
149
142
  mock_get_residue_removed_or_burnt_terms: MagicMock,
150
143
  mock_get_upland_rice_crop_terms: MagicMock,
@@ -172,7 +165,6 @@ def test_should_run(
172
165
 
173
166
  # Ensure that API calls to retrieve term IDs are properly cached.
174
167
  mock_get_cover_crop_property_terms.call_count <= 1
175
- mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
176
168
  mock_get_irrigated_terms.call_count <= 1
177
169
  mock_get_residue_removed_or_burnt_terms.call_count <= 1
178
170
  mock_get_upland_rice_crop_terms.call_count <= 1
@@ -206,6 +198,7 @@ def test_should_run_no_data(
206
198
  PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
207
199
 
208
200
 
201
+ # TODO: update mocks
209
202
  @mark.parametrize("subfolder", PARAMS_RUN)
210
203
  @patch(f"{term_path}.search")
211
204
  @patch(f"{property_path}.download_hestia")
@@ -214,7 +207,6 @@ PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should
214
207
  @patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
215
208
  @patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
216
209
  @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
217
- @patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
218
210
  @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
219
211
  @patch(f"{tier_2_path}.related_cycles")
220
212
  @patch(f"{tier_2_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
@@ -232,7 +224,6 @@ def test_run(
232
224
  _mock_calc_descriptive_stats_t2: MagicMock,
233
225
  mock_related_cycles: MagicMock,
234
226
  mock_get_cover_crop_property_terms: MagicMock, # utils mocks
235
- mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
236
227
  mock_get_irrigated_terms: MagicMock,
237
228
  mock_get_residue_removed_or_burnt_terms: MagicMock,
238
229
  mock_get_upland_rice_crop_terms: MagicMock,
@@ -263,7 +254,6 @@ def test_run(
263
254
 
264
255
  # Ensure that API calls to retrieve term IDs are properly cached.
265
256
  mock_get_cover_crop_property_terms.call_count <= 1
266
- mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
267
257
  mock_get_irrigated_terms.call_count <= 1
268
258
  mock_get_residue_removed_or_burnt_terms.call_count <= 1
269
259
  mock_get_upland_rice_crop_terms.call_count <= 1
@@ -277,13 +267,15 @@ def test_run(
277
267
 
278
268
 
279
269
  PARAMS_RUN_WITH_STATS = [
280
- "tier-1-and-2/with-stats", # Closes issue 753
281
- "tier-1/cropland-with-stats", # Closes issue 753
282
- "tier-1/land-use-change-with-stats", # Closes issue 753
283
- "tier-2/with-stats" # Closes issue 753
270
+ "tier-1-and-2/with-stats", # Closes issue 753
271
+ "tier-1-and-2/with-residues-removed-with-stats", # Closes issue #758 and #846
272
+ "tier-1/cropland-with-stats", # Closes issue 753
273
+ "tier-1/land-use-change-with-stats", # Closes issue 753
274
+ "tier-2/with-stats" # Closes issue 753
284
275
  ]
285
276
 
286
277
 
278
+ # TODO: update mocks
287
279
  @mark.parametrize("subfolder", PARAMS_RUN_WITH_STATS)
288
280
  @patch(f"{term_path}.search")
289
281
  @patch(f"{property_path}.download_hestia")
@@ -292,7 +284,6 @@ PARAMS_RUN_WITH_STATS = [
292
284
  @patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
293
285
  @patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
294
286
  @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
295
- @patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
296
287
  @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
297
288
  @patch(f"{tier_2_path}.related_cycles")
298
289
  @patch(f"{tier_2_path}._new_measurement", side_effect=fake_new_measurement)
@@ -302,7 +293,6 @@ def test_run_with_stats(
302
293
  _mock_new_measurement_t2: MagicMock,
303
294
  mock_related_cycles: MagicMock,
304
295
  mock_get_cover_crop_property_terms: MagicMock, # utils mocks
305
- mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
306
296
  mock_get_irrigated_terms: MagicMock,
307
297
  mock_get_residue_removed_or_burnt_terms: MagicMock,
308
298
  mock_get_upland_rice_crop_terms: MagicMock,
@@ -333,7 +323,6 @@ def test_run_with_stats(
333
323
 
334
324
  # Ensure that API calls to retrieve term IDs are properly cached.
335
325
  mock_get_cover_crop_property_terms.call_count <= 1
336
- mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
337
326
  mock_get_irrigated_terms.call_count <= 1
338
327
  mock_get_residue_removed_or_burnt_terms.call_count <= 1
339
328
  mock_get_upland_rice_crop_terms.call_count <= 1
@@ -25,14 +25,6 @@ YEARS = 100
25
25
  MONTHS = 12
26
26
 
27
27
 
28
- CROP_RESIDUE_INCORP_TERM_IDS = [
29
- "aboveGroundCropResidueIncorporated",
30
- "aboveGroundCropResidueLeftOnField",
31
- "belowGroundCropResidue",
32
- "discardedCropIncorporated",
33
- "discardedCropLeftOnField"
34
- ]
35
-
36
28
  IRRIGATED_TERM_IDS = [
37
29
  "rainfedDeepWater",
38
30
  "rainfedDeepWaterWaterDepth100Cm",
@@ -51,3 +51,15 @@ def test_run(*args):
51
51
 
52
52
  result = run('all', cycle)
53
53
  assert result == expected
54
+
55
+
56
+ @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
57
+ def test_run_ember(*args):
58
+ with open(f"{fixtures_folder}/ember-comparison/cycle.jsonld", encoding='utf-8') as f:
59
+ cycle = json.load(f)
60
+
61
+ with open(f"{fixtures_folder}/ember-comparison/result.jsonld", encoding='utf-8') as f:
62
+ expected = json.load(f)
63
+
64
+ result = run('all', cycle)
65
+ assert result == expected
@@ -1,88 +1,21 @@
1
- import csv
2
- from typing import Tuple, Dict, List
3
- from unittest.mock import patch
4
1
  import json
5
- import pytest
2
+ from unittest.mock import patch
6
3
 
7
4
  from tests.utils import fixtures_path, fake_new_emission
8
- from hestia_earth.models.ecoinventV3AndEmberClimate import MODEL, _should_run_emission, run
5
+ from hestia_earth.models.ecoinventV3AndEmberClimate import MODEL, run
9
6
 
10
7
  class_path = f"hestia_earth.models.{MODEL}"
11
8
  fixtures_folder = f"{fixtures_path}/{MODEL}"
12
9
 
13
- cycle_with_country = {"endDate": "2010", "site": {"country": {"@type": "Term", "termType": "region"}}}
14
- cycle_without_country = {"endDate": "2010", "site": {"country": {}}}
15
10
  ELECTRICITY_TERMS = [
16
- {"@type": "Term", "@id": "electricityGridMarketMix"},
17
- {"@type": "Term", "@id": "electricityGridRenewableMix"}
11
+ 'electricityGridMarketMix',
12
+ 'electricityGridRenewableMix'
18
13
  ]
19
14
 
20
15
 
21
- @pytest.mark.parametrize(
22
- "cycle,inputs,complete,expected_should_run",
23
- [
24
- (cycle_without_country, [], False, (False, [])),
25
- (
26
- cycle_without_country,
27
- [{"@type": "Input", "term": {"@id": "electricityGridMarketMix"}}],
28
- True,
29
- (False, [{"@type": "Input", "term": {"@id": "electricityGridMarketMix"}}])
30
- ),
31
- (cycle_with_country, [], True, (False, [])),
32
- (
33
- cycle_with_country,
34
- [{"@type": "Input", "term": {"@id": "electricityGridRenewableMix"}}],
35
- False,
36
- (False, [{"@type": "Input", "term": {"@id": "electricityGridRenewableMix"}}])
37
- ),
38
- (
39
- cycle_with_country,
40
- [{"@type": "Input", "term": {"@id": "electricityGridMarketMix"}}],
41
- True,
42
- (True, [{"@type": "Input", "term": {"@id": "electricityGridMarketMix"}}])
43
- ),
44
- ]
45
- )
46
- @patch(f"{class_path}.get_electricity_grid_mix_terms", return_value=ELECTRICITY_TERMS)
47
- @patch(f"{class_path}._is_term_type_complete")
48
- def test_should_run_emission(
49
- mock_complete, mock_get_terms, cycle: Dict, inputs: List, complete: bool, expected_should_run: Tuple
50
- ):
51
- mock_complete.return_value = complete
52
- cycle["inputs"] = inputs
53
- assert _should_run_emission(cycle, ELECTRICITY_TERMS, term_id="test") == expected_should_run
54
-
55
-
56
16
  @patch(f"{class_path}.get_electricity_grid_mix_terms", return_value=ELECTRICITY_TERMS)
57
17
  @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
58
- @patch(f"{class_path}.utils.ecoinventV3_emissions")
59
- def test_run(mock_ecoinventV3_emissions, *args):
60
- with open(f"{fixtures_path}/ecoinventV3_excerpt.csv", encoding="utf-8") as f:
61
- reader = csv.DictReader(f, quotechar='"')
62
- ecoinvent_fixture_rows = list(reader)
63
-
64
- test_terms = {
65
- "ch4ToAirInputsProductionFossil", # 0.4
66
- "ch4ToAirInputsProductionNonFossil", # 0.5
67
- "co2ToAirInputsProduction", # 0.2
68
- "n2OToAirInputsProduction" # 0.3
69
- }
70
-
71
- # Create a dictionary indexed by eco_invent_name
72
- # with list of tuples (emissions_term, value)
73
- mock_dict = dict()
74
- for row_dict in ecoinvent_fixture_rows:
75
- # create list of (emissions terms, values)
76
- terms_values_list = []
77
- for k in filter(lambda x: x.endswith(".term.@id"), row_dict.keys()):
78
- if row_dict[k] in test_terms:
79
- terms_values_list.append((row_dict[k], row_dict[f"emissionsResourceUse.{k.split('.')[1]}.value"]))
80
-
81
- mock_dict[row_dict["ecoinventName"]] = terms_values_list
82
-
83
- name = "electricity, high voltage, electricity production, wood, future"
84
- mock_ecoinventV3_emissions.return_value = mock_dict[name]
85
-
18
+ def test_run(*args):
86
19
  with open(f"{fixtures_folder}/cycle.jsonld", encoding="utf-8") as f:
87
20
  cycle = json.load(f)
88
21