hestia-earth-models 0.54.0__py3-none-any.whl → 0.54.1__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.
- hestia_earth/models/cycle/input/ecoinventV3.py +2 -1
- hestia_earth/models/ipcc2019/pastureGrass.py +5 -4
- hestia_earth/models/mocking/search-results.json +51 -51
- hestia_earth/models/utils/lookup.py +2 -2
- hestia_earth/models/version.py +1 -1
- {hestia_earth_models-0.54.0.dist-info → hestia_earth_models-0.54.1.dist-info}/METADATA +1 -1
- {hestia_earth_models-0.54.0.dist-info → hestia_earth_models-0.54.1.dist-info}/RECORD +11 -11
- {hestia_earth_models-0.54.0.dist-info → hestia_earth_models-0.54.1.dist-info}/WHEEL +1 -1
- tests/models/ipcc2019/test_pastureGrass.py +6 -0
- {hestia_earth_models-0.54.0.dist-info → hestia_earth_models-0.54.1.dist-info}/LICENSE +0 -0
- {hestia_earth_models-0.54.0.dist-info → hestia_earth_models-0.54.1.dist-info}/top_level.txt +0 -0
|
@@ -52,7 +52,8 @@ LOOKUPS = {
|
|
|
52
52
|
"material": "ecoinventMapping",
|
|
53
53
|
"pesticideAI": "ecoinventMapping",
|
|
54
54
|
"soilAmendment": "ecoinventMapping",
|
|
55
|
-
"transport": "ecoinventMapping"
|
|
55
|
+
"transport": "ecoinventMapping",
|
|
56
|
+
"veterinaryDrugs": "ecoinventMapping"
|
|
56
57
|
}
|
|
57
58
|
MODEL = 'ecoinventV3'
|
|
58
59
|
MODEL_KEY = 'impactAssessment' # keep to generate entry in "model-links.json"
|
|
@@ -6,6 +6,7 @@ Source:
|
|
|
6
6
|
[IPCC 2019, Vol.4, Chapter 10](https://www.ipcc-nggip.iges.or.jp/public/2019rf/pdf/4_Volume4/19R_V4_Ch10_Livestock.pdf).
|
|
7
7
|
"""
|
|
8
8
|
from hestia_earth.schema import TermTermType, AnimalReferencePeriod
|
|
9
|
+
from hestia_earth.utils.api import download_hestia
|
|
9
10
|
from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name, extract_grouped_data
|
|
10
11
|
from hestia_earth.utils.model import filter_list_term_type
|
|
11
12
|
from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
|
|
@@ -30,7 +31,7 @@ REQUIREMENTS = {
|
|
|
30
31
|
"term.@id": "pastureGrass",
|
|
31
32
|
"key": {
|
|
32
33
|
"@type": "Term",
|
|
33
|
-
"term.termType": ["crop", "
|
|
34
|
+
"term.termType": ["crop", "landCover"]
|
|
34
35
|
}
|
|
35
36
|
}],
|
|
36
37
|
"animals": [{
|
|
@@ -93,7 +94,7 @@ LOOKUPS = {
|
|
|
93
94
|
"crop-property": ["energyDigestibilityRuminants", "energyContentHigherHeatingValue"],
|
|
94
95
|
"crop": "grazedPastureGrassInputId",
|
|
95
96
|
"forage-property": ["energyDigestibilityRuminants", "energyContentHigherHeatingValue"],
|
|
96
|
-
"
|
|
97
|
+
"landCover": "grazedPastureGrassInputId"
|
|
97
98
|
}
|
|
98
99
|
RETURNS = {
|
|
99
100
|
"Input": [{
|
|
@@ -104,7 +105,7 @@ RETURNS = {
|
|
|
104
105
|
MODEL_KEY = 'pastureGrass'
|
|
105
106
|
KEY_TERM_TYPES = [
|
|
106
107
|
TermTermType.CROP.value,
|
|
107
|
-
TermTermType.
|
|
108
|
+
TermTermType.LANDCOVER.value
|
|
108
109
|
]
|
|
109
110
|
|
|
110
111
|
|
|
@@ -382,7 +383,7 @@ def _calculate_NEwool(cycle: dict):
|
|
|
382
383
|
|
|
383
384
|
def _pastureGrass_key_property_value(practice: dict, column: dict):
|
|
384
385
|
term_id = _practice_input_id(practice)
|
|
385
|
-
term =
|
|
386
|
+
term = download_hestia(term_id)
|
|
386
387
|
term_type = term.get('termType')
|
|
387
388
|
value = list_sum(practice.get('value', [0]))
|
|
388
389
|
lookup_value = _node_property_value(MODEL, {'@id': term_id, 'termType': term_type}, column)
|
|
@@ -877,27 +877,27 @@
|
|
|
877
877
|
},
|
|
878
878
|
{
|
|
879
879
|
"@type": "Term",
|
|
880
|
-
"@id": "
|
|
880
|
+
"@id": "discardedCropRemoved"
|
|
881
881
|
},
|
|
882
882
|
{
|
|
883
883
|
"@type": "Term",
|
|
884
|
-
"@id": "
|
|
884
|
+
"@id": "aboveGroundCropResidueTotal"
|
|
885
885
|
},
|
|
886
886
|
{
|
|
887
887
|
"@type": "Term",
|
|
888
|
-
"@id": "
|
|
888
|
+
"@id": "aboveGroundCropResidueIncorporated"
|
|
889
889
|
},
|
|
890
890
|
{
|
|
891
891
|
"@type": "Term",
|
|
892
|
-
"@id": "
|
|
892
|
+
"@id": "aboveGroundCropResidueBurnt"
|
|
893
893
|
},
|
|
894
894
|
{
|
|
895
895
|
"@type": "Term",
|
|
896
|
-
"@id": "
|
|
896
|
+
"@id": "belowGroundCropResidue"
|
|
897
897
|
},
|
|
898
898
|
{
|
|
899
899
|
"@type": "Term",
|
|
900
|
-
"@id": "
|
|
900
|
+
"@id": "aboveGroundCropResidueLeftOnField"
|
|
901
901
|
}
|
|
902
902
|
]
|
|
903
903
|
},
|
|
@@ -930,23 +930,23 @@
|
|
|
930
930
|
"results": [
|
|
931
931
|
{
|
|
932
932
|
"@type": "Term",
|
|
933
|
-
"@id": "
|
|
933
|
+
"@id": "digestibleEnergyRabbits"
|
|
934
934
|
},
|
|
935
935
|
{
|
|
936
936
|
"@type": "Term",
|
|
937
|
-
"@id": "
|
|
937
|
+
"@id": "digestibleEnergyRuminants"
|
|
938
938
|
},
|
|
939
939
|
{
|
|
940
940
|
"@type": "Term",
|
|
941
|
-
"@id": "
|
|
941
|
+
"@id": "digestibleEnergyPoultry"
|
|
942
942
|
},
|
|
943
943
|
{
|
|
944
944
|
"@type": "Term",
|
|
945
|
-
"@id": "
|
|
945
|
+
"@id": "digestibleEnergyPigs"
|
|
946
946
|
},
|
|
947
947
|
{
|
|
948
948
|
"@type": "Term",
|
|
949
|
-
"@id": "
|
|
949
|
+
"@id": "digestibleEnergySalmonids"
|
|
950
950
|
},
|
|
951
951
|
{
|
|
952
952
|
"@type": "Term",
|
|
@@ -987,23 +987,23 @@
|
|
|
987
987
|
"results": [
|
|
988
988
|
{
|
|
989
989
|
"@type": "Term",
|
|
990
|
-
"@id": "
|
|
990
|
+
"@id": "energyDigestibilitySalmonids"
|
|
991
991
|
},
|
|
992
992
|
{
|
|
993
993
|
"@type": "Term",
|
|
994
|
-
"@id": "
|
|
994
|
+
"@id": "energyDigestibilityRuminants"
|
|
995
995
|
},
|
|
996
996
|
{
|
|
997
997
|
"@type": "Term",
|
|
998
|
-
"@id": "
|
|
998
|
+
"@id": "energyDigestibilityPoultry"
|
|
999
999
|
},
|
|
1000
1000
|
{
|
|
1001
1001
|
"@type": "Term",
|
|
1002
|
-
"@id": "
|
|
1002
|
+
"@id": "energyDigestibilityRabbits"
|
|
1003
1003
|
},
|
|
1004
1004
|
{
|
|
1005
1005
|
"@type": "Term",
|
|
1006
|
-
"@id": "
|
|
1006
|
+
"@id": "energyDigestibilityPigs"
|
|
1007
1007
|
},
|
|
1008
1008
|
{
|
|
1009
1009
|
"@type": "Term",
|
|
@@ -1060,47 +1060,47 @@
|
|
|
1060
1060
|
},
|
|
1061
1061
|
{
|
|
1062
1062
|
"@type": "Term",
|
|
1063
|
-
"@id": "
|
|
1063
|
+
"@id": "excretaBuffaloKgN"
|
|
1064
1064
|
},
|
|
1065
1065
|
{
|
|
1066
1066
|
"@type": "Term",
|
|
1067
|
-
"@id": "
|
|
1067
|
+
"@id": "excretaSolidAndLiquidFishCrustaceansKgN"
|
|
1068
1068
|
},
|
|
1069
1069
|
{
|
|
1070
1070
|
"@type": "Term",
|
|
1071
|
-
"@id": "
|
|
1071
|
+
"@id": "excretaTurkeysKgN"
|
|
1072
1072
|
},
|
|
1073
1073
|
{
|
|
1074
1074
|
"@type": "Term",
|
|
1075
|
-
"@id": "
|
|
1075
|
+
"@id": "processedExcretaKgN"
|
|
1076
1076
|
},
|
|
1077
1077
|
{
|
|
1078
1078
|
"@type": "Term",
|
|
1079
|
-
"@id": "
|
|
1079
|
+
"@id": "excretaLiquidFishCrustaceansKgN"
|
|
1080
1080
|
},
|
|
1081
1081
|
{
|
|
1082
1082
|
"@type": "Term",
|
|
1083
|
-
"@id": "
|
|
1083
|
+
"@id": "excretaMixturesKgN"
|
|
1084
1084
|
},
|
|
1085
1085
|
{
|
|
1086
1086
|
"@type": "Term",
|
|
1087
|
-
"@id": "
|
|
1087
|
+
"@id": "excretaDairyCattleKgN"
|
|
1088
1088
|
},
|
|
1089
1089
|
{
|
|
1090
1090
|
"@type": "Term",
|
|
1091
|
-
"@id": "
|
|
1091
|
+
"@id": "excretaSheepKgN"
|
|
1092
1092
|
},
|
|
1093
1093
|
{
|
|
1094
1094
|
"@type": "Term",
|
|
1095
|
-
"@id": "
|
|
1095
|
+
"@id": "excretaHorsesMulesAndAssesKgN"
|
|
1096
1096
|
},
|
|
1097
1097
|
{
|
|
1098
1098
|
"@type": "Term",
|
|
1099
|
-
"@id": "
|
|
1099
|
+
"@id": "excretaCamelsKgN"
|
|
1100
1100
|
},
|
|
1101
1101
|
{
|
|
1102
1102
|
"@type": "Term",
|
|
1103
|
-
"@id": "
|
|
1103
|
+
"@id": "excretaPigsKgN"
|
|
1104
1104
|
}
|
|
1105
1105
|
]
|
|
1106
1106
|
},
|
|
@@ -1121,47 +1121,47 @@
|
|
|
1121
1121
|
},
|
|
1122
1122
|
{
|
|
1123
1123
|
"@type": "Term",
|
|
1124
|
-
"@id": "
|
|
1124
|
+
"@id": "excretaBuffaloKgVs"
|
|
1125
1125
|
},
|
|
1126
1126
|
{
|
|
1127
1127
|
"@type": "Term",
|
|
1128
|
-
"@id": "
|
|
1128
|
+
"@id": "excretaHorsesMulesAndAssesKgVs"
|
|
1129
1129
|
},
|
|
1130
1130
|
{
|
|
1131
1131
|
"@type": "Term",
|
|
1132
|
-
"@id": "
|
|
1132
|
+
"@id": "processedExcretaKgVs"
|
|
1133
1133
|
},
|
|
1134
1134
|
{
|
|
1135
1135
|
"@type": "Term",
|
|
1136
|
-
"@id": "
|
|
1136
|
+
"@id": "excretaTurkeysKgVs"
|
|
1137
1137
|
},
|
|
1138
1138
|
{
|
|
1139
1139
|
"@type": "Term",
|
|
1140
|
-
"@id": "
|
|
1140
|
+
"@id": "excretaPigsKgVs"
|
|
1141
1141
|
},
|
|
1142
1142
|
{
|
|
1143
1143
|
"@type": "Term",
|
|
1144
|
-
"@id": "
|
|
1144
|
+
"@id": "excretaDucksKgVs"
|
|
1145
1145
|
},
|
|
1146
1146
|
{
|
|
1147
1147
|
"@type": "Term",
|
|
1148
|
-
"@id": "
|
|
1148
|
+
"@id": "excretaCamelsKgVs"
|
|
1149
1149
|
},
|
|
1150
1150
|
{
|
|
1151
1151
|
"@type": "Term",
|
|
1152
|
-
"@id": "
|
|
1152
|
+
"@id": "excretaDairyCattleKgVs"
|
|
1153
1153
|
},
|
|
1154
1154
|
{
|
|
1155
1155
|
"@type": "Term",
|
|
1156
|
-
"@id": "
|
|
1156
|
+
"@id": "excretaGeeseKgVs"
|
|
1157
1157
|
},
|
|
1158
1158
|
{
|
|
1159
1159
|
"@type": "Term",
|
|
1160
|
-
"@id": "
|
|
1160
|
+
"@id": "excretaLiquidFishCrustaceansKgVs"
|
|
1161
1161
|
},
|
|
1162
1162
|
{
|
|
1163
1163
|
"@type": "Term",
|
|
1164
|
-
"@id": "
|
|
1164
|
+
"@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
|
|
1165
1165
|
},
|
|
1166
1166
|
{
|
|
1167
1167
|
"@type": "Term",
|
|
@@ -1204,7 +1204,7 @@
|
|
|
1204
1204
|
"@type": "Term",
|
|
1205
1205
|
"name": "Generic crop, seed",
|
|
1206
1206
|
"@id": "genericCropSeed",
|
|
1207
|
-
"_score": 23.
|
|
1207
|
+
"_score": 23.378887
|
|
1208
1208
|
}
|
|
1209
1209
|
]
|
|
1210
1210
|
},
|
|
@@ -1364,15 +1364,15 @@
|
|
|
1364
1364
|
"results": [
|
|
1365
1365
|
{
|
|
1366
1366
|
"@type": "Term",
|
|
1367
|
-
"@id": "
|
|
1367
|
+
"@id": "milkYieldPerSheepRaw"
|
|
1368
1368
|
},
|
|
1369
1369
|
{
|
|
1370
1370
|
"@type": "Term",
|
|
1371
|
-
"@id": "
|
|
1371
|
+
"@id": "milkYieldPerGoatRaw"
|
|
1372
1372
|
},
|
|
1373
1373
|
{
|
|
1374
1374
|
"@type": "Term",
|
|
1375
|
-
"@id": "
|
|
1375
|
+
"@id": "milkYieldPerCowRaw"
|
|
1376
1376
|
},
|
|
1377
1377
|
{
|
|
1378
1378
|
"@type": "Term",
|
|
@@ -1380,19 +1380,19 @@
|
|
|
1380
1380
|
},
|
|
1381
1381
|
{
|
|
1382
1382
|
"@type": "Term",
|
|
1383
|
-
"@id": "
|
|
1383
|
+
"@id": "milkYieldPerCamelRaw"
|
|
1384
1384
|
},
|
|
1385
1385
|
{
|
|
1386
1386
|
"@type": "Term",
|
|
1387
|
-
"@id": "
|
|
1387
|
+
"@id": "milkYieldPerBuffaloRaw"
|
|
1388
1388
|
},
|
|
1389
1389
|
{
|
|
1390
1390
|
"@type": "Term",
|
|
1391
|
-
"@id": "
|
|
1391
|
+
"@id": "milkYieldPerCowFpcm"
|
|
1392
1392
|
},
|
|
1393
1393
|
{
|
|
1394
1394
|
"@type": "Term",
|
|
1395
|
-
"@id": "
|
|
1395
|
+
"@id": "milkYieldPerSheepFpcm"
|
|
1396
1396
|
}
|
|
1397
1397
|
]
|
|
1398
1398
|
},
|
|
@@ -1452,23 +1452,23 @@
|
|
|
1452
1452
|
},
|
|
1453
1453
|
{
|
|
1454
1454
|
"@type": "Term",
|
|
1455
|
-
"@id": "
|
|
1455
|
+
"@id": "deepTillage"
|
|
1456
1456
|
},
|
|
1457
1457
|
{
|
|
1458
1458
|
"@type": "Term",
|
|
1459
|
-
"@id": "
|
|
1459
|
+
"@id": "stripTillage"
|
|
1460
1460
|
},
|
|
1461
1461
|
{
|
|
1462
1462
|
"@type": "Term",
|
|
1463
|
-
"@id": "
|
|
1463
|
+
"@id": "mulchTillage"
|
|
1464
1464
|
},
|
|
1465
1465
|
{
|
|
1466
1466
|
"@type": "Term",
|
|
1467
|
-
"@id": "
|
|
1467
|
+
"@id": "minimumTillage"
|
|
1468
1468
|
},
|
|
1469
1469
|
{
|
|
1470
1470
|
"@type": "Term",
|
|
1471
|
-
"@id": "
|
|
1471
|
+
"@id": "fullTillage"
|
|
1472
1472
|
},
|
|
1473
1473
|
{
|
|
1474
1474
|
"@type": "Term",
|
|
@@ -76,7 +76,7 @@ _ALLOW_ALL = 'all'
|
|
|
76
76
|
def _model_lookup_values(model: str, term: dict, restriction: str):
|
|
77
77
|
lookup = download_lookup(f"{term.get('termType')}-model-{restriction}.csv")
|
|
78
78
|
values = get_table_value(lookup, 'termid', term.get('@id'), column_name(model))
|
|
79
|
-
return (values or _ALLOW_ALL).split(';')
|
|
79
|
+
return (values or _ALLOW_ALL).split(';') if isinstance(values, str) else _ALLOW_ALL
|
|
80
80
|
|
|
81
81
|
|
|
82
82
|
def is_model_siteType_allowed(model: str, term: dict, data: dict):
|
|
@@ -89,7 +89,7 @@ def is_model_siteType_allowed(model: str, term: dict, data: dict):
|
|
|
89
89
|
def _lookup_values(term: dict, column: str):
|
|
90
90
|
lookup = download_lookup(f"{term.get('termType')}.csv")
|
|
91
91
|
values = get_table_value(lookup, 'termid', term.get('@id'), column_name(column))
|
|
92
|
-
return (values or _ALLOW_ALL).split(';')
|
|
92
|
+
return (values or _ALLOW_ALL).split(';') if isinstance(values, str) else _ALLOW_ALL
|
|
93
93
|
|
|
94
94
|
|
|
95
95
|
def is_siteType_allowed(data: dict, term: dict):
|
hestia_earth/models/version.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
VERSION = '0.54.
|
|
1
|
+
VERSION = '0.54.1'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: hestia-earth-models
|
|
3
|
-
Version: 0.54.
|
|
3
|
+
Version: 0.54.1
|
|
4
4
|
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.).
|
|
5
5
|
Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
|
|
6
6
|
Author: Hestia Team
|
|
@@ -3,7 +3,7 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
|
|
|
3
3
|
hestia_earth/models/cache_sites.py,sha256=kp_3D09P-JdAn9vt7eU-KKTwd6BAXWKQL_0UQCDsH2s,4798
|
|
4
4
|
hestia_earth/models/log.py,sha256=kPLBOABkSiiAaPejXYvDJ9g6RbaXQXgtOZP2x9v_FwA,3008
|
|
5
5
|
hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
|
|
6
|
-
hestia_earth/models/version.py,sha256=
|
|
6
|
+
hestia_earth/models/version.py,sha256=zfnCjNaSTHlVSA05T5eojWihV7uCYZpJOHnNMPfNEts,19
|
|
7
7
|
hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
|
|
8
8
|
hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
|
|
9
9
|
hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
|
|
@@ -67,7 +67,7 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha25
|
|
|
67
67
|
hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=RJFNK1g1bnX1146-d0K4ADI-wx-yyVdohHP3MXKJusM,1533
|
|
68
68
|
hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=DtgaZbPhYJ-cSqTNhfusL44ok-7ChAA3LMEa01fVhUI,1819
|
|
69
69
|
hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
70
|
-
hestia_earth/models/cycle/input/ecoinventV3.py,sha256=
|
|
70
|
+
hestia_earth/models/cycle/input/ecoinventV3.py,sha256=aATN9BBz7-jfxMIkUx0BJYDJJd7kAbfOcWTDciaplVM,5882
|
|
71
71
|
hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=pwHaPqJjM23AaXvMn_sPmyGg-lNgnmNbHezFWlBTZns,9136
|
|
72
72
|
hestia_earth/models/cycle/input/properties.py,sha256=i_zRwRzbQsjIhz1PF0foHSPYu18zg1zKhpLoHlSxKiE,1964
|
|
73
73
|
hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
|
|
@@ -226,7 +226,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=WNfaopS9canZs5zeP
|
|
|
226
226
|
hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=X2WPGOiWi_1cQ5yiyjfrBU_rAm3EDsm4WnRJi8ea6g8,3007
|
|
227
227
|
hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=Q6XLA-yUEJFQCrk1N4Tq2DiMSACI7XnsW_Mn595V1as,3102
|
|
228
228
|
hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=UTQ2PkqceBV1UC9u6qfIArrlqIvWuO3r-cvUE5jmEsE,75841
|
|
229
|
-
hestia_earth/models/ipcc2019/pastureGrass.py,sha256=
|
|
229
|
+
hestia_earth/models/ipcc2019/pastureGrass.py,sha256=oqr1z-4F0muU1m636Kbozfs5aaJB7_r28nahqjkGx5I,21894
|
|
230
230
|
hestia_earth/models/ipcc2019/utils.py,sha256=he8OFl72a2UZpqHFRsf7gyQFjrqUxiMYzqmBVSCvD9E,3158
|
|
231
231
|
hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
|
|
232
232
|
hestia_earth/models/ipcc2021/gwp100.py,sha256=HEV4Misbe5h99qCqZeCaKNTs4FkFWmv6RdCty_U2pps,947
|
|
@@ -328,7 +328,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
|
|
|
328
328
|
hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=4UZB1SC_7bzmi4f3qf3yVB7PfEXSCG2OfnAJfgst5bM,3428
|
|
329
329
|
hestia_earth/models/mocking/__init__.py,sha256=kmSeOTSvurMUxw7Ajhf3G-SVPQ1NgmirMTk4TSOEicY,765
|
|
330
330
|
hestia_earth/models/mocking/mock_search.py,sha256=V-ycVBTkJu7PP37Ivy_16hpKBV4aEtJb5S9DfChPNSU,2038
|
|
331
|
-
hestia_earth/models/mocking/search-results.json,sha256=
|
|
331
|
+
hestia_earth/models/mocking/search-results.json,sha256=L11QB1Yg0B3lIVgeHKMJHhuZECuIREEqxjRrFrYxq2g,32915
|
|
332
332
|
hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
|
|
333
333
|
hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
|
|
334
334
|
hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=pAAMrlGgarI3mhi2L07kiEVhfKif_hq1FfzHurmRTag,2071
|
|
@@ -494,7 +494,7 @@ hestia_earth/models/utils/indicator.py,sha256=fPq38ifd53xWbuOfoiVwiA0Nwa7jVPJLSA
|
|
|
494
494
|
hestia_earth/models/utils/inorganicFertiliser.py,sha256=T48wQlPAAZNpmbAq-58y7wlR7HxdIyOulWfuOKkbBZg,1573
|
|
495
495
|
hestia_earth/models/utils/input.py,sha256=4zeBsdVKredh4pjMxVJjJU9mKNoBah1LisKl_Tr3yj0,6879
|
|
496
496
|
hestia_earth/models/utils/liveAnimal.py,sha256=u_Lym0hVinncCZMYF_KscCA3vuelWmlyHn4I-jVRDs4,1505
|
|
497
|
-
hestia_earth/models/utils/lookup.py,sha256=
|
|
497
|
+
hestia_earth/models/utils/lookup.py,sha256=3tXnOaTGF91NhL9NsM0hQ05Vm_bQQG6aNgC5dEq0KdQ,6255
|
|
498
498
|
hestia_earth/models/utils/measurement.py,sha256=yc-0YVsHH5iYdXfrUGhs3OLn6fCLPcgXpMXyG3ivRq8,7933
|
|
499
499
|
hestia_earth/models/utils/pesticideAI.py,sha256=pmjiFJkMLodXSP16VnxT7YizH-LBFFvEsvShplyAPB8,1374
|
|
500
500
|
hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
|
|
@@ -725,7 +725,7 @@ tests/models/ipcc2019/test_no3ToGroundwaterExcreta.py,sha256=Z-pCBQvlUf0ttmCERge
|
|
|
725
725
|
tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9r9a8xroq5aPp0NIzmkad_6MyTuceRTYoKdkE,1613
|
|
726
726
|
tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
|
|
727
727
|
tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=BNr3tPzMbEKXyhCIudq3HC5FJs_Pi387r1gcy8bfZeQ,4852
|
|
728
|
-
tests/models/ipcc2019/test_pastureGrass.py,sha256=
|
|
728
|
+
tests/models/ipcc2019/test_pastureGrass.py,sha256=nT2_TUxehiiUhR3KCKkBhFRnam__NbQOznLOENGkQTw,2229
|
|
729
729
|
tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
730
730
|
tests/models/ipcc2021/test_gwp100.py,sha256=r3pDw_TUcOrNlNRWtFAN3CBWfG5FCkHExypVqg0sZVk,857
|
|
731
731
|
tests/models/jarvisAndPain1994/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -983,8 +983,8 @@ tests/models/utils/test_source.py,sha256=_Ol-OrJs2Tt9iZAZ_RY2qRuSbnE4yz5OuEGkDSb
|
|
|
983
983
|
tests/models/utils/test_term.py,sha256=-Wn2C1jyOLfkvhcKmKWT-Jms7yqLwx5ok91gYJNcGWc,2028
|
|
984
984
|
tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
985
985
|
tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
|
|
986
|
-
hestia_earth_models-0.54.
|
|
987
|
-
hestia_earth_models-0.54.
|
|
988
|
-
hestia_earth_models-0.54.
|
|
989
|
-
hestia_earth_models-0.54.
|
|
990
|
-
hestia_earth_models-0.54.
|
|
986
|
+
hestia_earth_models-0.54.1.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
|
|
987
|
+
hestia_earth_models-0.54.1.dist-info/METADATA,sha256=aa2Ac5WfwSF6rUSBdcv_zQvKCZGiusqSBMWh2e51YGQ,3201
|
|
988
|
+
hestia_earth_models-0.54.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
|
989
|
+
hestia_earth_models-0.54.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
|
|
990
|
+
hestia_earth_models-0.54.1.dist-info/RECORD,,
|
|
@@ -10,6 +10,10 @@ MILK_YIELD_TERMS = ['milkYieldPerCowRaw', 'milkYieldPerSheepRaw']
|
|
|
10
10
|
WOOL_TERMS = ['woolSheepGreasy']
|
|
11
11
|
|
|
12
12
|
|
|
13
|
+
def fake_download_hestia(term_id: str, *args): return {'@id': term_id, 'termType': 'forage'}
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
|
|
13
17
|
@patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
|
|
14
18
|
@patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
|
|
15
19
|
@patch(f"{class_path}._new_input", side_effect=fake_new_input)
|
|
@@ -24,6 +28,7 @@ def test_run(*args):
|
|
|
24
28
|
assert value == expected
|
|
25
29
|
|
|
26
30
|
|
|
31
|
+
@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
|
|
27
32
|
@patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
|
|
28
33
|
@patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
|
|
29
34
|
@patch(f"{class_path}._new_input", side_effect=fake_new_input)
|
|
@@ -38,6 +43,7 @@ def test_run_with_feed(*args):
|
|
|
38
43
|
assert value == expected
|
|
39
44
|
|
|
40
45
|
|
|
46
|
+
@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
|
|
41
47
|
@patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
|
|
42
48
|
@patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
|
|
43
49
|
@patch(f"{class_path}._new_input", side_effect=fake_new_input)
|
|
File without changes
|
|
File without changes
|