From 868a7be415ef764f11672ece29ef1d7d39db6bdb Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 05:11:45 +0700 Subject: [PATCH 01/19] Thailand's EGAT Capacity --- DATA_SOURCES.md | 4 ++++ config/zones.json | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/DATA_SOURCES.md b/DATA_SOURCES.md index 146ce41f19..10a50569cb 100644 --- a/DATA_SOURCES.md +++ b/DATA_SOURCES.md @@ -122,6 +122,7 @@ Real-time electricity data is obtained using [parsers](https://github.com/tmrowc - Sri Lanka: [Ceylon Electricity Board](https://cebcare.ceb.lk/gensum/details) - Switzerland: [ENTSOE](https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html) - Taiwan: [TAIPOWER](http://www.taipower.com.tw/d006/loadGraph/loadGraph/genshx_.html) +- Thailand: [EGAT](https://www.sothailand.com/sysgen/egat/) - Turkey: [ytbs](https://ytbsbilgi.teias.gov.tr/ytbsbilgi/frm_istatistikler.jsf) - Ukraine: [UKRENERGO](https://ua.energy/activity/dispatch-information/ues-operation/) - United Arab Emirates: [GCCIA](https://www.gccia.com.sa/) @@ -353,6 +354,9 @@ For many European countries, data is available from [ENTSO-E](https://transparen - Hydro: [BEF](https://www.bfe.admin.ch/bfe/de/home/versorgung/statistik-und-geodaten/geoinformation/geodaten/wasser/statistik-der-wasserkraftanlagen.html) - Other: [UVEK](https://www.uvek-gis.admin.ch/BFE/storymaps/EE_Elektrizitaetsproduktionsanlagen/) - Taiwan: [TAIPOWER](http://www.taipower.com.tw/d006/loadGraph/loadGraph/genshx_.html) +- Thailand: + - EGAT's production capacity: [EGAT](https://www.egat.co.th/index.php?option=com_content&view=article&id=452&Itemid=116) + - EGAT's purchase capacity: [EGAT](https://www.egat.co.th/index.php?option=com_content&view=article&id=355&Itemid=116) - Turkey: [TEIAS](https://www.teias.gov.tr/tr-TR/kurulu-guc-raporlari) - Ukraine: [UKRENERGO](https://ua.energy/vstanovlena-potuzhnist-energosystemy-ukrayiny/) - United Arab Emirates: [IRENA](https://www.irena.org/publications/2022/Apr/Renewable-Capacity-Statistics-2022) diff --git a/config/zones.json b/config/zones.json index 6ab4450d67..6adca57538 100644 --- a/config/zones.json +++ b/config/zones.json @@ -5853,7 +5853,21 @@ 20.94500640900013 ] ], - "timezone": null + "capacity": { + "biomass": 996.94, + "coal": 6067.50, + "gas": 27356.00, + "geothermal": 0.30, + "hydro": 6993.73, + "hydro storage": 1000.00, + "oil": 1497.40, + "solar": 442.80, + "wind": 1447.69 + }, + "contributors": [ + "https://github.com/PPsyrius", + ], + "timezone": "Asia/Bangkok" }, "TJ": { "flag_file_name": "tj.png", From 2304c7734e8e5473fbaa6be33e704724150eb8ef Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 05:26:44 +0700 Subject: [PATCH 02/19] Update MY-WM->TH Capacity from EGAT's data --- config/exchanges.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/exchanges.json b/config/exchanges.json index d7b92b998e..ced6d68562 100644 --- a/config/exchanges.json +++ b/config/exchanges.json @@ -1954,6 +1954,10 @@ "rotation": 155 }, "MY-WM->TH": { + "capacity": [ + 0, + 300 + ], "lonlat": [ 101.454422, 5.867743 From 8f215afc3d3de2508059a642ae4a85b867cb458c Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 05:30:05 +0700 Subject: [PATCH 03/19] Typo fix --- config/zones.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/zones.json b/config/zones.json index 6adca57538..a69a1c9ffc 100644 --- a/config/zones.json +++ b/config/zones.json @@ -5865,7 +5865,7 @@ "wind": 1447.69 }, "contributors": [ - "https://github.com/PPsyrius", + "https://github.com/PPsyrius" ], "timezone": "Asia/Bangkok" }, From dd62925b78ba846fc116ae52a8d2255e8778f32f Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 16:31:31 +0700 Subject: [PATCH 04/19] Add in TH's pricing info from MEA --- parsers/TH.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 parsers/TH.py diff --git a/parsers/TH.py b/parsers/TH.py new file mode 100644 index 0000000000..1762ef4c7e --- /dev/null +++ b/parsers/TH.py @@ -0,0 +1,34 @@ +import re + +import arrow +from requests import get +from bs4 import BeautifulSoup + +MEA_PRICE = "https://www.mea.or.th/en/profile/109/111" +MEA_URL = "www.mea.or.th/en/home" +TZ = "Asia/Bangkok" + +def fetch_price(zone_key="TH", session=None, target_datetime=None, logger=None) -> dict: + """Fetch price from MEA table.""" + if target_datetime is not None: + raise NotImplementedError("This parser is not yet able to parse past dates") + + with get(MEA_PRICE) as response: + soup = BeautifulSoup(response.content, 'lxml') + + """'Over 400 kWh (up from 401st)' from Table 1.1""" + unit_price_table = soup.find_all('table')[1] + price = unit_price_table.find_all("td")[19] + + return { + "zoneKey": zone_key, + "currency": "THB", + "datetime": arrow.now(TZ).datetime, + "price": float(price.text), + "source": MEA_URL, + } + +if __name__ == "__main__": + """Main method, never used by the Electricity Map backend, but handy for testing.""" + print("fetch_price() ->") + print(fetch_price()) From 865642ae1108581fb8f0d7ebc8e7c32af1f4873f Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 22:06:44 +0700 Subject: [PATCH 05/19] TH Production+Consumption data (non-Websocket ver) --- parsers/TH.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/parsers/TH.py b/parsers/TH.py index 1762ef4c7e..3b15c04456 100644 --- a/parsers/TH.py +++ b/parsers/TH.py @@ -4,22 +4,35 @@ from requests import get from bs4 import BeautifulSoup +EGAT_GENERATION = "https://energy.go.th/index.html" +#EGAT_GENERATION2 = "https://www.sothailand.com/sysgen/egat/" +EGAT_URL = "www.egat.co.th" MEA_PRICE = "https://www.mea.or.th/en/profile/109/111" -MEA_URL = "www.mea.or.th/en/home" +MEA_URL = "www.mea.or.th" TZ = "Asia/Bangkok" +def fetch_EGAT() -> str: + """Pull from Min. of Energy for now as I didn't wanted to write a parser for websocket yet""" + """The website took around 15s to load, unlike the websocket ver.""" + """Consumption = Production + Import(the latter is done separately)""" + with get(EGAT_GENERATION) as response: + EGAT_soup = BeautifulSoup(response.content, 'lxml') + + curr_production = EGAT_soup.find_all('p')[6].text.replace(",", "") + return curr_production + def fetch_price(zone_key="TH", session=None, target_datetime=None, logger=None) -> dict: - """Fetch price from MEA table.""" if target_datetime is not None: raise NotImplementedError("This parser is not yet able to parse past dates") + """Fetch price from MEA table.""" with get(MEA_PRICE) as response: - soup = BeautifulSoup(response.content, 'lxml') + MEA_soup = BeautifulSoup(response.content, 'lxml') """'Over 400 kWh (up from 401st)' from Table 1.1""" - unit_price_table = soup.find_all('table')[1] + unit_price_table = MEA_soup.find_all('table')[1] price = unit_price_table.find_all("td")[19] - + return { "zoneKey": zone_key, "currency": "THB", @@ -28,7 +41,35 @@ def fetch_price(zone_key="TH", session=None, target_datetime=None, logger=None) "source": MEA_URL, } +def fetch_production(zone_key="TH", session=None, target_datetime=None, logger=None) -> dict: + if target_datetime: + raise NotImplementedError("This parser is not yet able to parse past dates") + + """All mapped to unknown as there is no available breakdown""" + return { + "zoneKey": zone_key, + "datetime": arrow.now(TZ).datetime, + "production": {"unknown": float(fetch_EGAT())}, + "source": EGAT_URL, + } + +def fetch_consumption(zone_key="TH", session=None, target_datetime=None, logger=None) -> dict: + if target_datetime: + raise NotImplementedError("This parser is not yet able to parse past dates") + + """all mapped to unknown as there is no available breakdown""" + return { + "zoneKey": zone_key, + "datetime": arrow.now(TZ).datetime, + "consumption": {"unknown": float(fetch_EGAT())}, + "source": EGAT_URL, + } + if __name__ == "__main__": """Main method, never used by the Electricity Map backend, but handy for testing.""" + print("fetch_production() ->") + print(fetch_production()) + print("fetch_consumption() ->") + print(fetch_consumption()) print("fetch_price() ->") print(fetch_price()) From babaf8c8f44942c72dfb4262039ed7e4c1eb4407 Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 22:13:56 +0700 Subject: [PATCH 06/19] set TH's unused capacity type to 0 --- config/zones.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/zones.json b/config/zones.json index a69a1c9ffc..b1990832f0 100644 --- a/config/zones.json +++ b/config/zones.json @@ -5854,14 +5854,17 @@ ] ], "capacity": { + "battery storage": 0, "biomass": 996.94, "coal": 6067.50, "gas": 27356.00, "geothermal": 0.30, "hydro": 6993.73, "hydro storage": 1000.00, + "nuclear": 0, "oil": 1497.40, "solar": 442.80, + "unknown": 0, "wind": 1447.69 }, "contributors": [ From 39d44efff15bf0bddede4fa130e60463bf17599c Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 22:51:35 +0700 Subject: [PATCH 07/19] Update MY-WM->TH and MY-WM->SG cap - https://www.appp.or.th/imgadmins/document/10594009.pdf - https://www.teshmont.com/our-work/hvdc-greenfield/tenaga-nasional-berhad-tnb-and-electricity-generating-authority-egat-hvdc-interconnection-between-thailand-and-malaysia http://www.eppo.go.th/index.php/en/energy-information-services/electricity-trade-between-thailand-and-malaysia --- config/exchanges.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/exchanges.json b/config/exchanges.json index ced6d68562..2a4349503f 100644 --- a/config/exchanges.json +++ b/config/exchanges.json @@ -1944,6 +1944,10 @@ "rotation": 0 }, "MY-WM->SG": { + "capacity": [ + -450, + 450 + ], "lonlat": [ 103.539048, 2.016154 @@ -1955,8 +1959,8 @@ }, "MY-WM->TH": { "capacity": [ - 0, - 300 + -330, + 330 ], "lonlat": [ 101.454422, From 9eb5b0dc426b5ee0db241d4c749ce5a2ed6529c6 Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 22:54:35 +0700 Subject: [PATCH 08/19] Fix TH zone indentation --- config/zones.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/zones.json b/config/zones.json index b1990832f0..eae9b326d7 100644 --- a/config/zones.json +++ b/config/zones.json @@ -5861,10 +5861,10 @@ "geothermal": 0.30, "hydro": 6993.73, "hydro storage": 1000.00, - "nuclear": 0, + "nuclear": 0, "oil": 1497.40, "solar": 442.80, - "unknown": 0, + "unknown": 0, "wind": 1447.69 }, "contributors": [ From 302ec196f3f25f52d79988a2920d22a730f3421a Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 23:39:37 +0700 Subject: [PATCH 09/19] Exchange Capacity indent fixed --- config/exchanges.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/exchanges.json b/config/exchanges.json index 2a4349503f..60ffd25fcc 100644 --- a/config/exchanges.json +++ b/config/exchanges.json @@ -1944,7 +1944,7 @@ "rotation": 0 }, "MY-WM->SG": { - "capacity": [ + "capacity": [ -450, 450 ], @@ -1958,7 +1958,7 @@ "rotation": 155 }, "MY-WM->TH": { - "capacity": [ + "capacity": [ -330, 330 ], From 37bac64ffc825f78f4b164208e645c10184943c7 Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Sun, 24 Apr 2022 23:48:33 +0700 Subject: [PATCH 10/19] TH's Pricing is now for MWh instead of kWh --- parsers/TH.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsers/TH.py b/parsers/TH.py index 3b15c04456..b2b5b31857 100644 --- a/parsers/TH.py +++ b/parsers/TH.py @@ -37,7 +37,7 @@ def fetch_price(zone_key="TH", session=None, target_datetime=None, logger=None) "zoneKey": zone_key, "currency": "THB", "datetime": arrow.now(TZ).datetime, - "price": float(price.text), + "price": float(price.text)*1000, "source": MEA_URL, } From 853b8690ec62e7d5f4e88176ef58b7f169a88f8c Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Mon, 25 Apr 2022 00:22:05 +0700 Subject: [PATCH 11/19] Update TH power origin --- config/co2eq_parameters_all.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/co2eq_parameters_all.json b/config/co2eq_parameters_all.json index 3f01a46f55..0af5bc64d9 100644 --- a/config/co2eq_parameters_all.json +++ b/config/co2eq_parameters_all.json @@ -8362,18 +8362,18 @@ ] }, "TH": { - "_source": "IEA 2019 (used because Our World in Data has a lot of 'other renewables' generation not broken down by type). Biomass includes waste.", - "_url": "https://www.iea.org/data-and-statistics?country=THAILAND&fuel=Electricity%20and%20heat&indicator=ElecGenByFuel", + "_source": "IEA 2020 (used because Our World in Data has a lot of 'other renewables' generation not broken down by type). Biomass includes waste.", + "_url": "https://www.iea.org/data-and-statistics/data-browser?country=THAILAND&fuel=Energy%20supply&indicator=ElecGenByFuel", "powerOriginRatios": { "value": { - "biomass": 0.094720087593017, - "coal": 0.180736632940652, - "gas": 0.646008637644721, - "geothermal": 5.06904032928486e-06, - "hydro": 0.0326142054786188, - "oil": 0.00112025791277195, - "solar": 0.0262677669863541, - "wind": 0.0185273424035362 + "biomass": 0.0912401506077485, + "coal": 0.1934589830217160, + "gas": 0.6467002186068250, + "geothermal": 0.0000053711750520, + "hydro": 0.0248631693155512, + "oil": 0.0007036239318076, + "solar": 0.0264691506560890, + "wind": 0.0165593326852115 } } }, From 51abd8088f9fe387763761d3775f4705e986e21b Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Mon, 25 Apr 2022 00:29:05 +0700 Subject: [PATCH 12/19] =?UTF-8?q?Add=20LA=20power=20origin=20(for=20future?= =?UTF-8?q?=20LTMS=E2=80=93PIP=20modelling)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.hydropower-dams.com/news/asean-countries-plan-cross-border-trading/ --- config/co2eq_parameters_all.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/co2eq_parameters_all.json b/config/co2eq_parameters_all.json index 0af5bc64d9..c8804f5570 100644 --- a/config/co2eq_parameters_all.json +++ b/config/co2eq_parameters_all.json @@ -5702,6 +5702,18 @@ "wind": 0.00449084176120673 } } + }, + "LA": { + "_source": "IEA 2020 (used because Our World in Data has a lot of 'other renewables' generation not broken down by type). Biomass includes waste.", + "_url": "https://www.iea.org/data-and-statistics/data-browser?country=LAO&fuel=Energy%20supply&indicator=ElecGenByFuel", + "powerOriginRatios": { + "value": { + "biomass": 0.0014261409127302, + "coal": 0.2841022818254600, + "hydro": 0.7133957165732590, + "solar": 0.0010758606885508 + } + } }, "LU": { "powerOriginRatios": [ From 2916c881d9cecbfee5a9a37380f743236a1bd61a Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:14:59 +0700 Subject: [PATCH 13/19] TH's Unknown Breakdown for CO2 Lifecycle --- config/co2eq_parameters_lifecycle.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/co2eq_parameters_lifecycle.json b/config/co2eq_parameters_lifecycle.json index c8d06b4656..157f5da78a 100644 --- a/config/co2eq_parameters_lifecycle.json +++ b/config/co2eq_parameters_lifecycle.json @@ -6576,6 +6576,13 @@ "value": 199.07165644246462 } ] + }, + "TH": { + "unknown": { + "_url": "https://www.iea.org/fuels-and-technologies/electricity", + "source": "IEA 2020; assumes 9.1% biomass, 19.3% coal, 64.7% gas, 2.5% hydro, 2.6% solar, 1.7% wind, 0.1% other", + "value": 498.9322479978950 + } }, "TR": { "battery discharge": [ From 3247265ac50099d13da8e39fa58680fa6adb7d05 Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Fri, 29 Apr 2022 13:50:35 +0700 Subject: [PATCH 14/19] add in missing TH parsers for zone.json --- config/zones.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/zones.json b/config/zones.json index eae9b326d7..6db39f6875 100644 --- a/config/zones.json +++ b/config/zones.json @@ -5866,6 +5866,11 @@ "solar": 442.80, "unknown": 0, "wind": 1447.69 + }, + "parsers": { + "consumption": "TH.fetch_consumption", + "price": "TH.fetch_price", + "production": "TH.fetch_production" }, "contributors": [ "https://github.com/PPsyrius" From 9f90904fc7fabb7ea54f902f235fb24fab880cf5 Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Fri, 29 Apr 2022 14:54:38 +0700 Subject: [PATCH 15/19] Fix TH's the CO2 lifecycle value number --- config/co2eq_parameters_lifecycle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/co2eq_parameters_lifecycle.json b/config/co2eq_parameters_lifecycle.json index 157f5da78a..6bd5a64661 100644 --- a/config/co2eq_parameters_lifecycle.json +++ b/config/co2eq_parameters_lifecycle.json @@ -6581,7 +6581,7 @@ "unknown": { "_url": "https://www.iea.org/fuels-and-technologies/electricity", "source": "IEA 2020; assumes 9.1% biomass, 19.3% coal, 64.7% gas, 2.5% hydro, 2.6% solar, 1.7% wind, 0.1% other", - "value": 498.9322479978950 + "value": 509.277 } }, "TR": { From ab3788ce95e68298f4788a5e0b54e7281868102a Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Fri, 29 Apr 2022 22:44:45 +0700 Subject: [PATCH 16/19] TH feedback: remove commented out code for parser --- parsers/TH.py | 1 - 1 file changed, 1 deletion(-) diff --git a/parsers/TH.py b/parsers/TH.py index b2b5b31857..3349c37760 100644 --- a/parsers/TH.py +++ b/parsers/TH.py @@ -5,7 +5,6 @@ from bs4 import BeautifulSoup EGAT_GENERATION = "https://energy.go.th/index.html" -#EGAT_GENERATION2 = "https://www.sothailand.com/sysgen/egat/" EGAT_URL = "www.egat.co.th" MEA_PRICE = "https://www.mea.or.th/en/profile/109/111" MEA_URL = "www.mea.or.th" From b9bfb0af5b889b3335492b9c12a0bf505b7c6365 Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Fri, 29 Apr 2022 22:48:54 +0700 Subject: [PATCH 17/19] TH feedback: override direct emission factor --- config/co2eq_parameters_direct.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/co2eq_parameters_direct.json b/config/co2eq_parameters_direct.json index 3d534d0365..c344677e73 100644 --- a/config/co2eq_parameters_direct.json +++ b/config/co2eq_parameters_direct.json @@ -6172,6 +6172,13 @@ "value": 131.82330997925308 } ] + }, + "TH": { + "unknown": { + "_url": "https://www.iea.org/fuels-and-technologies/electricity", + "source": "IEA 2020; assumes 9.1% biomass, 19.3% coal, 64.7% gas, 2.5% hydro, 2.6% solar, 1.7% wind, 0.1% other", + "value": 386.645 + } }, "TR": { "battery discharge": [ From d3dcc7c9d0b1c2591ef5a2c512122dc04f92e3ad Mon Sep 17 00:00:00 2001 From: PPsyrius <19505219+PPsyrius@users.noreply.github.com> Date: Fri, 29 Apr 2022 22:53:41 +0700 Subject: [PATCH 18/19] TH feedback: change link from IEA to Google Spreadsheet --- config/co2eq_parameters_direct.json | 2 +- config/co2eq_parameters_lifecycle.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/co2eq_parameters_direct.json b/config/co2eq_parameters_direct.json index c344677e73..3fd86ce351 100644 --- a/config/co2eq_parameters_direct.json +++ b/config/co2eq_parameters_direct.json @@ -6175,7 +6175,7 @@ }, "TH": { "unknown": { - "_url": "https://www.iea.org/fuels-and-technologies/electricity", + "_url": "https://docs.google.com/spreadsheets/d/16j5BVc4L34BDqVE0GeDBv0P3zQupT6zU77Kj5UK7GjE/edit?usp=sharing", "source": "IEA 2020; assumes 9.1% biomass, 19.3% coal, 64.7% gas, 2.5% hydro, 2.6% solar, 1.7% wind, 0.1% other", "value": 386.645 } diff --git a/config/co2eq_parameters_lifecycle.json b/config/co2eq_parameters_lifecycle.json index 6bd5a64661..abd19ac171 100644 --- a/config/co2eq_parameters_lifecycle.json +++ b/config/co2eq_parameters_lifecycle.json @@ -6579,7 +6579,7 @@ }, "TH": { "unknown": { - "_url": "https://www.iea.org/fuels-and-technologies/electricity", + "_url": "https://docs.google.com/spreadsheets/d/16j5BVc4L34BDqVE0GeDBv0P3zQupT6zU77Kj5UK7GjE/edit?usp=sharing", "source": "IEA 2020; assumes 9.1% biomass, 19.3% coal, 64.7% gas, 2.5% hydro, 2.6% solar, 1.7% wind, 0.1% other", "value": 509.277 } From 39dc90131ed65a266d9f923cc12849abf362e082 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 May 2022 17:42:32 +0000 Subject: [PATCH 19/19] Bump opencv-python from 4.4.0.46 to 4.5.5.64 Bumps [opencv-python](https://github.com/skvark/opencv-python) from 4.4.0.46 to 4.5.5.64. - [Release notes](https://github.com/skvark/opencv-python/releases) - [Commits](https://github.com/skvark/opencv-python/commits) --- updated-dependencies: - dependency-name: opencv-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 43 +++++++++++++++++++------------------------ pyproject.toml | 2 +- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/poetry.lock b/poetry.lock index 39dcdd6edf..1f1b66d715 100644 --- a/poetry.lock +++ b/poetry.lock @@ -335,12 +335,20 @@ defusedxml = "*" [[package]] name = "opencv-python" -version = "4.4.0.46" +version = "4.5.5.64" description = "Wrapper package for OpenCV python bindings." category = "main" optional = true python-versions = ">=3.6" +[package.dependencies] +numpy = [ + {version = ">=1.21.2", markers = "python_version >= \"3.10\" or python_version >= \"3.6\" and platform_system == \"Darwin\" and platform_machine == \"arm64\""}, + {version = ">=1.19.3", markers = "python_version >= \"3.6\" and platform_system == \"Linux\" and platform_machine == \"aarch64\" or python_version >= \"3.9\""}, + {version = ">=1.14.5", markers = "python_version >= \"3.7\""}, + {version = ">=1.17.3", markers = "python_version >= \"3.8\""}, +] + [[package]] name = "openpyxl" version = "3.0.9" @@ -752,8 +760,8 @@ parsers = ["arrow", "beautifulsoup4", "demjson3", "eiapy", "html5lib", "imageio" [metadata] lock-version = "1.1" -python-versions = '>= 3.7.1, < 4.0' -content-hash = "6fecbd102b82a9cb0c5fb7da68989404f09ec042133766050b48c229834e6b3a" +python-versions = ">= 3.7.1, < 4.0" +content-hash = "bb400834daf8c2c70658bc037e27c118bbed5ffedec9d66ca5fc1b5262ed482a" [metadata.files] appdirs = [ @@ -959,6 +967,7 @@ numpy = [ {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, + {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, @@ -980,27 +989,13 @@ odfpy = [ {file = "odfpy-1.4.1.tar.gz", hash = "sha256:db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec"}, ] opencv-python = [ - {file = "opencv-python-4.4.0.46.tar.gz", hash = "sha256:d80db278a07f51811dbf0f9c31ff7cd5b2501822fb7a7587e71f9ff27d5c04bd"}, - {file = "opencv_python-4.4.0.46-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:14df77490c8aedceae74e660564d48c04761658aecc93895ac5e974006a89606"}, - {file = "opencv_python-4.4.0.46-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:6b6d23de6d5ddc55e865ac8532bf8062b26ba70305fa1c87c671717027dcd370"}, - {file = "opencv_python-4.4.0.46-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:6b1d85cbb64ce20ac5f79ad8e3e76a3dbff53d258c65f2fc0b9411321147a0be"}, - {file = "opencv_python-4.4.0.46-cp36-cp36m-win32.whl", hash = "sha256:4af0053c6a70f127a52c26b112341826d3dbfce6955beb9044d3eabd7e14d1cd"}, - {file = "opencv_python-4.4.0.46-cp36-cp36m-win_amd64.whl", hash = "sha256:135e05b69ab9665cbe2589f56e60895219bc2443a632bdc4bde72fb95eda1582"}, - {file = "opencv_python-4.4.0.46-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:51baebb0f8f3cae4cccd30daf018a5bb75cb759d5658aea29100d34cd5cac106"}, - {file = "opencv_python-4.4.0.46-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:9659e80059c9f39728c7dcc22032dff0d1d467f07b6cd8e036613393e4b7c71a"}, - {file = "opencv_python-4.4.0.46-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:f69a56e958ecb549ba84e0497a438080932b4d52ded441cec04d80afde71dc0a"}, - {file = "opencv_python-4.4.0.46-cp37-cp37m-win32.whl", hash = "sha256:68a9ec7e32f82cab267b6f757d9862a9a930371062739f9d00472e7c850c5854"}, - {file = "opencv_python-4.4.0.46-cp37-cp37m-win_amd64.whl", hash = "sha256:17581c68400f828700e5c6b3b082f50c781bf74cb9a7b972a04f05d26c8e894a"}, - {file = "opencv_python-4.4.0.46-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:db874c65654465ef71d6e8618bed8c725722bc90624132b9512bf061abb4eec0"}, - {file = "opencv_python-4.4.0.46-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:8aeda9b2c37bf91fa88d67f09b85f2250661eec43d72184ec544783de204e96a"}, - {file = "opencv_python-4.4.0.46-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:8a8ebd7ceebc0be9c14ca3e25a1c4ae086016b469848258e998247f2fc855314"}, - {file = "opencv_python-4.4.0.46-cp38-cp38-win32.whl", hash = "sha256:e4c072cf4260063ebadc70e34d622fa1127a88e364475ed757709e249ebe990f"}, - {file = "opencv_python-4.4.0.46-cp38-cp38-win_amd64.whl", hash = "sha256:6022609b67f9c0f14e6807e782660d1d1be94d4f0c7bc1794d7d8f600014acb2"}, - {file = "opencv_python-4.4.0.46-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:117dbb2fd184de28d831f14c1da17864efcee7bb7895e43adf40f5e1da9137fb"}, - {file = "opencv_python-4.4.0.46-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:c1382209a771ca8a25fe89d4a2377875538c6ed3cf8745280e65636cbd0988f2"}, - {file = "opencv_python-4.4.0.46-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:744e9ae2fb4c8574e6d4a762146b4d0984bdec60b98480fc54a363c03a07a1ac"}, - {file = "opencv_python-4.4.0.46-cp39-cp39-win32.whl", hash = "sha256:7fe81d08df4eb5dc4c6aa5f09888b6fd390fce5fa7d5624a98cac890b9aa6181"}, - {file = "opencv_python-4.4.0.46-cp39-cp39-win_amd64.whl", hash = "sha256:0548981fe189e0d57b9cc65066b66fd70d4bc84ea906f349a63d9098e1b911c6"}, + {file = "opencv-python-4.5.5.64.tar.gz", hash = "sha256:f65de0446a330c3b773cd04ba10345d8ce1b15dcac3f49770204e37602d0b3f7"}, + {file = "opencv_python-4.5.5.64-cp36-abi3-macosx_10_15_x86_64.whl", hash = "sha256:a512a0c59b6fec0fac3844b2f47d6ecb1a9d18d235e6c5491ce8dbbe0663eae8"}, + {file = "opencv_python-4.5.5.64-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca6138b6903910e384067d001763d40f97656875487381aed32993b076f44375"}, + {file = "opencv_python-4.5.5.64-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b293ced62f4360d9f11cf72ae7e9df95320ff7bf5b834d87546f844e838c0c35"}, + {file = "opencv_python-4.5.5.64-cp36-abi3-win32.whl", hash = "sha256:6247e584813c00c3b9ed69a795da40d2c153dc923d0182e957e1c2f00a554ac2"}, + {file = "opencv_python-4.5.5.64-cp36-abi3-win_amd64.whl", hash = "sha256:408d5332550287aa797fd06bef47b2dfed163c6787668cc82ef9123a9484b56a"}, + {file = "opencv_python-4.5.5.64-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:7787bb017ae93d5f9bb1b817ac8e13e45dd193743cb648498fcab21d00cf20a3"}, ] openpyxl = [ {file = "openpyxl-3.0.9-py2.py3-none-any.whl", hash = "sha256:8f3b11bd896a95468a4ab162fc4fcd260d46157155d1f8bfaabb99d88cfcf79f"}, diff --git a/pyproject.toml b/pyproject.toml index 02dbd51ead..73d87f9382 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ html5lib = {version="0.999999999", optional=true} imageio = {version="^2.18.0", optional=true} lxml = {version="^4.8.0", optional=true} mock = {version="^2.0.0", optional=true} -opencv-python = {version="~4.4.0.46", optional=true} +opencv-python = {version="~4.5.5.64", optional=true} pandas = {version="~1.3.5", optional=true} Pillow = {version="^9.1.0", optional=true} pytesseract = {version="0.2.0", optional=true}