diff --git a/pyproject.toml b/pyproject.toml index 2777fe2e..c48ca1fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,10 +35,10 @@ requires-python = ">=3.8" dependencies = [ "hapi-schema>= 0.9.8", - "hdx-python-api>= 6.3.7", + "hdx-python-api>= 6.3.8", "hdx-python-country>= 3.8.8", "hdx-python-database[postgresql]>= 1.3.5", - "hdx-python-scraper>= 2.5.8", + "hdx-python-scraper>= 2.6.2", "hdx-python-utilities>= 3.8.3", "libhxl", "sqlalchemy" diff --git a/requirements.txt b/requirements.txt index 44761e60..07c3d5e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,7 +56,7 @@ gspread==6.1.4 # via hdx-python-scraper hapi-schema==0.9.8 # via hapi-pipelines (pyproject.toml) -hdx-python-api==6.3.7 +hdx-python-api==6.3.8 # via # hapi-pipelines (pyproject.toml) # hdx-python-scraper @@ -67,7 +67,7 @@ hdx-python-country==3.8.8 # hdx-python-scraper hdx-python-database==1.3.5 # via hapi-pipelines (pyproject.toml) -hdx-python-scraper==2.5.9 +hdx-python-scraper==2.6.2 # via hapi-pipelines (pyproject.toml) hdx-python-utilities==3.8.3 # via @@ -75,7 +75,7 @@ hdx-python-utilities==3.8.3 # hdx-python-api # hdx-python-country # hdx-python-scraper -humanize==4.11.0 +humanize==4.12.0 # via frictionless identify==2.6.7 # via pre-commit @@ -234,7 +234,7 @@ shellingham==1.5.4 # via typer simpleeval==1.0.3 # via frictionless -simplejson==3.19.3 +simplejson==3.20.1 # via ckanapi six==1.17.0 # via @@ -261,7 +261,7 @@ tenacity==9.0.0 # via hdx-python-country text-unidecode==1.3 # via python-slugify -typeguard==4.4.1 +typeguard==4.4.2 # via inflect typer==0.15.1 # via frictionless diff --git a/src/hapi/pipelines/configs/core.yaml b/src/hapi/pipelines/configs/core.yaml index 838eab6f..77d119ac 100755 --- a/src/hapi/pipelines/configs/core.yaml +++ b/src/hapi/pipelines/configs/core.yaml @@ -72,7 +72,7 @@ admin1: "SOM|Juba Hoose": "SO28" "SOM|Shabelle Dhexe": "SO21" "SOM|Shabelle Hoose": "SO23" - "TCD|Mayo Kebbi Ouest": "TD12" + "TCD|Mayo Kebbi Ouest": "TCD12" "UKR|Avtonomna Respublika Krym": "UA01" "UKR|Kyivska": "UA80" "YEM|Amanat Al Asimah": "YE13" @@ -156,9 +156,9 @@ admin2: "SD12|Al Gedaref Rural": "SD12080" "SD15|Wad Madani El Kobra": "SD15030" "SD18|El Salam": "SD18086" - "TD11|La kabbia": "TD1102" - "TD17|Iriba": "TD1703" - "TD22|Tibest-Ouest": "TD2202" + "TCD11|La kabbia": "TCD1102" + "TCD17|Iriba": "TCD1703" + "TCD22|Tibest-Ouest": "TCD2202" "TG05|Kpendial- Ouest": "TG0513" "TZ12|Mbozi": "TZ2606" # TODO: this unit is not getting picked up because of the mismatched admin1 "UA12|Apostolivskyi": "UA1206" diff --git a/tests/fixtures/input/download-global-pcode-lengths.csv b/tests/fixtures/input/download-global-pcode-lengths.csv index 5998e497..9d8a6f9d 100644 --- a/tests/fixtures/input/download-global-pcode-lengths.csv +++ b/tests/fixtures/input/download-global-pcode-lengths.csv @@ -1,67 +1,66 @@ -Location,Country Length,Admin 1 Length,Admin 2 Length,Admin 3 Length,Admin 4 Length,Admin 5 Length +Location,Country Length,Admin 1 Length,Admin 2 Length,Admin 3 Length,Admin 4 Length,Admin 5 Length #country+code,#country+len,#adm1+len,#adm2+len,#adm3+len,#adm4+len,#adm5+len AFG,2,2,2,,, -AGO,2,2,3,3,, ALB,2,2,2,2,, -ARE,2,2,,,, +DZA,2,3,3,,, +AGO,2,2,3,3,, ARG,2,3,3,,, ARM,2,2,1,3,, -ATG,2,2,,,, AZE,2,8,,,, -BDI,3,3,3,,, -BEN,2,2,2,,, -BES,3,1,,,, -BFA,2,2,2,2,, BGD,2,2,2,2,2, -BGR,2,3,3,,, +BRB,2,2,,,, BLR,2,3,3,,, BLZ,2,2,,,, +BEN,2,2,2,,, BMU,2,2,1,,, -BOL,2,2,2,2,, -BRA,2,2,5,,, -BRB,2,2,,,, BTN,2,3,2,,, +BOL,2,2,2,2,, +BES,3,1,,,, BWA,2,2,2,2,, +BRA,2,2,5,,, +BGR,2,3,3,,, +BFA,2,2,2,2,, +BDI,3,3,3,,, +KHM,2,2,2,2,, +CMR,2,3,3,3,, +CPV,2,2,2,,, +CYM,2,2,,,, CAF,2,2,1,1,, +TCD,3,2,2,,, CHL,2,2,1,2,, CHN,2,3,3,,, -CIV,2,2,2,2,, -CMR,2,3,3,3,, -COD,2,2,2,,, -COG,2,2,2,,, COL,2,2,3,,, COM,2,1,1,1,, -CPV,2,2,2,,, +COG,2,2,2,,, +COD,2,2,2,,, CRI,2,1,2,2,, +CIV,2,2,2,2,, CUB,2,2,2,,, CUW,2,2,,,, -CYM,2,2,,,, DJI,2,2,2,,, DMA,2,2,,,, DOM,2,2,2,2,2, -DZA,2,3,3,,, -ECU,2,2|4|9,3|8,2|0|5,, +ECU,2,2,3,2,, EGY,2,2,2,2,, +SLV,2,2,3,3,, +GNQ,2,3,3,,, ERI,2,1,2,,, -ESH,2,2,,,, ETH,2,2,2,2,, FJI,2,1,2,2,, -FSM,2,1,2,,, +GUF,2,1,3,,, GAB,3,3,3,,, +GMB,2,2,2,2,, GEO,2,2,2,,, GHA,2,2,2,,, -GIN,2,3,3,2,, -GLP,2,2,2,,, -GMB,2,2,2,2,, -GNB,2,2,2,,, -GNQ,2,3,3,,, GRC,2,2,2,,, GRD,2,2,,,, +GLP,2,2,2,,, GTM,2,2,2,,, -GUF,2,1,3,,, +GIN,2,3,3,2,, +GNB,2,2,2,,, GUY,2,2,2,,, -HND,2,2,2,,, HTI,2,2,2,3,, +HND,2,2,2,,, HUN,2,3,3,,, IDN,2,2,2,3,, IRN,2,3,3,,, @@ -69,92 +68,91 @@ IRQ,2,3,3,3,, JAM,2,2,2,2,, KAZ,3,3,3,,, KEN,2,3,3,,, -KGZ,2,11,0,0,, -KHM,2,2,2,2,, KIR,2,1,2,,, -KNA,2,2,,,, +PRK,2,2,2,,, KWT,2,2,,,, +KGZ,2,11,0,0,, LAO,2,2,2,,, LBN,2,1,1,,, +LSO,2,1,2,,, LBR,2,2,2,,, LBY,2,2,2,,, -LCA,2,2,9,,, -LKA,2,1,1,2,3, -LSO,2,1,2,,, -MAR,2,3,3,7,1, -MDA,2,3,,,, -MDG,2,2,7|3,-1|3,3, -MDV,2,3,3,,, -MEX,2,2,3,,, -MHL,2,2,2,,, MKD,2,3,,,, +MDG,2,2,3|7,3|-1,3, +MWI,2,1,2,2,, +MYS,2,2,2,,, +MDV,2,3,3,,, MLI,2,2,2,2,, -MMR,3,3,4,-1,, -MNG,2,2,2,,, -MOZ,2,2,2,2,, -MRT,2,2,1,2,, -MSR,2,2,,,, +MHL,2,2,2,,, MTQ,2,2,2,,, +MRT,2,2,1,2,, MUS,2,2,,,, -MWI,2,1,2,2,, -MYS,2,2,2,,, +MEX,2,2,3,,, +FSM,2,1,2,,, +MDA,2,3,,,, +MNG,2,2,2,,, +MSR,2,2,,,, +MAR,2,3,3,7,1, +MOZ,2,2,2,2,, +MMR,3,3,4,-1,, NAM,2,2,2,,, +NPL,2,2,2,3,, +NIC,2,2,2,,, NER,2,3,3,3,, NGA,2,3,3,3,, -NIC,2,2,2,,, -NPL,2,2,2,3,, OMN,2,2,2,,, PAK,2,1,2,2,, +PSE,2,2,2,,, PAN,2,2,2,2,, +PNG,2,2,2,2,, +PRY,2,2,2,,, PER,2,2,2,2,, PHL,2,2,3,2,3, -PNG,2,2,2,2,, POL,2,3,3,,, -PRI,2,2,,,, -PRK,2,2,2,,, -PRY,2,2,2,,, -PSE,2,2,2,,, QAT,3,3,3,3,, ROU,2,3,3,,, RUS,2,3,3,,, RWA,2,1,1,2,2, +KNA,2,2,,,, +LCA,2,2,9,,, +VCT,2,1,2,,, +STP,2,2,2,,, SAU,2,2,,,, -SDN,2,2,3,,, SEN,2,2,2,2,, -SLB,2,2,4,4,, +SYC,2,1,1,4,, SLE,2,2,2,2,2, -SLV,2,2,3,3,, +SXM,2,1,,,, +SVK,2,3,3,,, +SLB,2,2,4,4,, SOM,2,2,2|7,,, +ZAF,2,1,2,1,3, +LKA,2,1,1,2,3, SSD,2,2,2,2,, -STP,2,2,2,,, +SDN,2,2,3,,, SUR,2,2,2,,, -SVK,2,3,3,,, SWZ,2,1,2,,, -SXM,2,1,,,, -SYC,2,1,1,4,, SYR,2,2,2,2,, -TCA,2,1,2,,, -TCD,2,2,2,2,, -TGO,2,2,2,2,, -THA,2,2,2,2,, TJK,0,7,0,,, +TZA,2,2,2,4|3,, +THA,2,2,2,2,, TLS,2,2,2,2,, +TGO,2,2,2,2,, TON,2,1,1,2,, TTO,2,2,,,, TUN,2,1,1,2,2, TUR,3,3,3,,, -TZA,2,2,2,3|4,, +TCA,2,1,2,,, UGA,2,1,3,,2, UKR,2,2,2,3,3, +ARE,2,2,,,, URY,2,2,3,,, UZB,2,2,3,,, -VCT,2,1,2,,, +VUT,2,2,3,,, VEN,2,2,2,2,, -VGB,2,2,,,, -VIR,2,3,5,,, VNM,2,3,2,,, -VUT,2,2,3,,, +VGB,2,2,,,, +ESH,2,2,,,, YEM,2,2,2,2,, -ZAF,2,1,2,1,3, ZMB,2,3,3,3,3, ZWE,2,2,2,2,, +VIR,2,3,5,,, diff --git a/tests/fixtures/input/download-global-pcodes-adm-1-2.csv b/tests/fixtures/input/download-global-pcodes-adm-1-2.csv index 2f8bed04..9485d581 100644 --- a/tests/fixtures/input/download-global-pcodes-adm-1-2.csv +++ b/tests/fixtures/input/download-global-pcodes-adm-1-2.csv @@ -1,4 +1,4 @@ -Location,Admin Level,P-Code,Name,Parent P-Code,Valid from date +Location,Admin Level,P-Code,Name,Parent P-Code,Valid from date #country+code,#geo+admin_level,#adm+code,#adm+name,#adm+code+parent,#date+start AFG,1,AF01,Kabul,AFG,2021-11-17 AFG,1,AF02,Kapisa,AFG,2021-11-17 @@ -1292,14 +1292,6 @@ ARM,2,AM111,Idjevan,AM11,2014-10-01 ARM,2,AM112,Noyemberyan,AM11,2014-10-01 ARM,2,AM113,Tavush,AM11,2014-10-01 ARM,2,AM114,Dilidjan,AM11,2014-10-01 -ATG,1,AG01,Barbuda,ATG,2017-09-07 -ATG,1,AG02,Redonda,ATG,2017-09-07 -ATG,1,AG03,Saint George,ATG,2017-09-07 -ATG,1,AG04,Saint John's,ATG,2017-09-07 -ATG,1,AG05,Saint Mary,ATG,2017-09-07 -ATG,1,AG06,Saint Paul,ATG,2017-09-07 -ATG,1,AG07,Saint Peter,ATG,2017-09-07 -ATG,1,AG08,Saint Philip,ATG,2017-09-07 AZE,1,AZ00000003,Baku,AZE,2023-10-02 AZE,1,AZ10100001,Sadarak,AZE,2023-10-02 AZE,1,AZ10200001,Sharur,AZE,2023-10-02 @@ -12527,8 +12519,6 @@ ECU,1,EC21,Sucumbios,ECU,2017-05-30 ECU,1,EC22,Orellana,ECU,2017-05-30 ECU,1,EC23,Santo Domingo de los Tsachilas,ECU,2017-05-30 ECU,1,EC24,Santa Elena,ECU,2017-05-30 -ECU,1,ECISLA,Isla,ECU,2017-05-30 -ECU,1,ECNO APLICA,No Aplica,ECU,2017-05-30 ECU,2,EC0101,Cuenca,ECU,2017-05-30 ECU,2,EC0102,Giron,ECU,2017-05-30 ECU,2,EC0103,Gualaceo,ECU,2017-05-30 @@ -12750,8 +12740,6 @@ ECU,2,EC2302,La Concordia,ECU,2017-05-30 ECU,2,EC2401,Santa Elena,ECU,2017-05-30 ECU,2,EC2402,La Libertad,ECU,2017-05-30 ECU,2,EC2403,Salinas,ECU,2017-05-30 -ECU,2,ECISLA,Isla,ECU,2017-05-30 -ECU,2,ECNO APLICA,Zona en Estudio: Juval (Canar-Chimborazo),ECU,2017-05-30 EGY,1,EG01,Cairo,EGY,2017-04-21 EGY,1,EG02,Alexandria,EGY,2017-04-21 EGY,1,EG03,Port Said,EGY,2017-04-21 @@ -26376,84 +26364,6 @@ POL,2,PL032018,Lobeski,PL032,2022-04-14 POL,2,PL032061,Koszalin,PL032,2022-04-14 POL,2,PL032062,Szczecin,PL032,2022-04-14 POL,2,PL032063,Swinoujscie,PL032,2022-04-14 -PRI,1,PR01,Adjuntas,PRI,2017-09-06 -PRI,1,PR02,Aguada,PRI,2017-09-06 -PRI,1,PR03,Aguadilla,PRI,2017-09-06 -PRI,1,PR04,Aguas Buenas,PRI,2017-09-06 -PRI,1,PR05,Aibonito,PRI,2017-09-06 -PRI,1,PR06,Anasco,PRI,2017-09-06 -PRI,1,PR07,Arecibo,PRI,2017-09-06 -PRI,1,PR08,Arroyo,PRI,2017-09-06 -PRI,1,PR09,Barceloneta,PRI,2017-09-06 -PRI,1,PR10,Barranquitas,PRI,2017-09-06 -PRI,1,PR11,Bayamon,PRI,2017-09-06 -PRI,1,PR12,Cabo Rojo,PRI,2017-09-06 -PRI,1,PR13,Caguas,PRI,2017-09-06 -PRI,1,PR14,Camuy,PRI,2017-09-06 -PRI,1,PR15,Canovanas,PRI,2017-09-06 -PRI,1,PR16,Carolina,PRI,2017-09-06 -PRI,1,PR17,Catano,PRI,2017-09-06 -PRI,1,PR18,Cayey,PRI,2017-09-06 -PRI,1,PR19,Ceiba,PRI,2017-09-06 -PRI,1,PR20,Ciales,PRI,2017-09-06 -PRI,1,PR21,Cidra,PRI,2017-09-06 -PRI,1,PR22,Coamo,PRI,2017-09-06 -PRI,1,PR23,Comerio,PRI,2017-09-06 -PRI,1,PR24,Corozal,PRI,2017-09-06 -PRI,1,PR25,Culebra,PRI,2017-09-06 -PRI,1,PR26,Dorado,PRI,2017-09-06 -PRI,1,PR27,Fajardo,PRI,2017-09-06 -PRI,1,PR28,Florida,PRI,2017-09-06 -PRI,1,PR29,Guanica,PRI,2017-09-06 -PRI,1,PR30,Guayama,PRI,2017-09-06 -PRI,1,PR31,Guayanilla,PRI,2017-09-06 -PRI,1,PR32,Guaynabo,PRI,2017-09-06 -PRI,1,PR33,Gurabo,PRI,2017-09-06 -PRI,1,PR34,Hatillo,PRI,2017-09-06 -PRI,1,PR35,Hormigueros,PRI,2017-09-06 -PRI,1,PR36,Humacao,PRI,2017-09-06 -PRI,1,PR37,Isabela,PRI,2017-09-06 -PRI,1,PR38,Jayuya,PRI,2017-09-06 -PRI,1,PR39,Juana Diaz,PRI,2017-09-06 -PRI,1,PR40,Juncos,PRI,2017-09-06 -PRI,1,PR41,Lajas,PRI,2017-09-06 -PRI,1,PR42,Lares,PRI,2017-09-06 -PRI,1,PR43,Las Marias,PRI,2017-09-06 -PRI,1,PR44,Las Piedras,PRI,2017-09-06 -PRI,1,PR45,Loiza,PRI,2017-09-06 -PRI,1,PR46,Luquillo,PRI,2017-09-06 -PRI,1,PR47,Manati,PRI,2017-09-06 -PRI,1,PR48,Maricao,PRI,2017-09-06 -PRI,1,PR49,Maunabo,PRI,2017-09-06 -PRI,1,PR50,Mayaguez,PRI,2017-09-06 -PRI,1,PR51,Moca,PRI,2017-09-06 -PRI,1,PR52,Morovis,PRI,2017-09-06 -PRI,1,PR53,Naguabo,PRI,2017-09-06 -PRI,1,PR54,Naranjito,PRI,2017-09-06 -PRI,1,PR55,Orocovis,PRI,2017-09-06 -PRI,1,PR56,Patillas,PRI,2017-09-06 -PRI,1,PR57,Penuelas,PRI,2017-09-06 -PRI,1,PR58,Ponce,PRI,2017-09-06 -PRI,1,PR59,Quebradillas,PRI,2017-09-06 -PRI,1,PR60,Rincon,PRI,2017-09-06 -PRI,1,PR61,Rio Grande,PRI,2017-09-06 -PRI,1,PR62,Sabana Grande,PRI,2017-09-06 -PRI,1,PR63,Salinas,PRI,2017-09-06 -PRI,1,PR64,San German,PRI,2017-09-06 -PRI,1,PR65,San Juan,PRI,2017-09-06 -PRI,1,PR66,San Lorenzo,PRI,2017-09-06 -PRI,1,PR67,San Sebastian,PRI,2017-09-06 -PRI,1,PR68,Santa Isabel,PRI,2017-09-06 -PRI,1,PR69,Toa Alta,PRI,2017-09-06 -PRI,1,PR70,Toa Baja,PRI,2017-09-06 -PRI,1,PR71,Trujillo Alto,PRI,2017-09-06 -PRI,1,PR72,Utuado,PRI,2017-09-06 -PRI,1,PR73,Vega Alta,PRI,2017-09-06 -PRI,1,PR74,Vega Baja,PRI,2017-09-06 -PRI,1,PR75,Vieques,PRI,2017-09-06 -PRI,1,PR76,Villalba,PRI,2017-09-06 -PRI,1,PR77,Yabucoa,PRI,2017-09-06 -PRI,1,PR78,Yauco,PRI,2017-09-06 PRK,1,KP01,Ryanggang,PRK,2019-06-24 PRK,1,KP02,North Hamgyong,PRK,2019-06-24 PRK,1,KP03,South Hamgyong,PRK,2019-06-24 @@ -28187,99 +28097,99 @@ TCA,2,TC414,Turtle Cove and Richmond Hill,TC4,2017-09-09 TCA,2,TC416,Wheeland,TC4,2017-09-09 TCA,2,TC501,Salt Cay,TC5,2017-09-09 TCA,2,TC601,South Caicos,TC6,2017-09-09 -TCD,1,TD01,Batha,TCD,2016-05-09 -TCD,1,TD02,Borkou,TCD,2016-05-09 -TCD,1,TD03,Chari-Baguirmi,TCD,2016-05-09 -TCD,1,TD04,Guera,TCD,2016-05-09 -TCD,1,TD05,Hadjer-Lamis,TCD,2016-05-09 -TCD,1,TD06,Kanem,TCD,2016-05-09 -TCD,1,TD07,Lac,TCD,2016-05-09 -TCD,1,TD08,Logone Occidental,TCD,2016-05-09 -TCD,1,TD09,Logone Oriental,TCD,2016-05-09 -TCD,1,TD10,Mandoul,TCD,2016-05-09 -TCD,1,TD11,Mayo-Kebbi Est,TCD,2016-05-09 -TCD,1,TD12,Mayo-Kebbi Ouest,TCD,2016-05-09 -TCD,1,TD13,Moyen-Chari,TCD,2016-05-09 -TCD,1,TD14,Ouaddai,TCD,2016-05-09 -TCD,1,TD15,Salamat,TCD,2016-05-09 -TCD,1,TD16,Tandjile,TCD,2016-05-09 -TCD,1,TD17,Wadi Fira,TCD,2016-05-09 -TCD,1,TD18,N'Djamena,TCD,2016-05-09 -TCD,1,TD19,Barh-El-Gazel,TCD,2016-05-09 -TCD,1,TD20,Ennedi Est,TCD,2016-05-09 -TCD,1,TD21,Sila,TCD,2016-05-09 -TCD,1,TD22,Tibesti,TCD,2016-05-09 -TCD,1,TD23,Ennedi Ouest,TCD,2016-05-09 -TCD,2,TD0101,Batha Ouest,TD01,2017-06-15 -TCD,2,TD0102,Batha Est,TD01,2017-06-15 -TCD,2,TD0103,Fitri,TD01,2017-06-15 -TCD,2,TD0201,Borkou,TD02,2017-06-15 -TCD,2,TD0202,Borkou Yala,TD02,2017-06-15 -TCD,2,TD0301,Baguirmi,TD03,2017-06-15 -TCD,2,TD0302,Chari,TD03,2017-06-15 -TCD,2,TD0303,Loug-Chari,TD03,2017-06-15 -TCD,2,TD0401,Guera,TD04,2017-06-15 -TCD,2,TD0402,Abtouyour,TD04,2017-06-15 -TCD,2,TD0403,Barh-Signaka,TD04,2017-06-15 -TCD,2,TD0404,Mangalme,TD04,2017-06-15 -TCD,2,TD0501,Dagana,TD05,2017-06-15 -TCD,2,TD0502,Dababa,TD05,2017-06-15 -TCD,2,TD0503,Haraze-Al-Biar,TD05,2017-06-15 -TCD,2,TD0601,Kanem,TD06,2017-06-15 -TCD,2,TD0602,Nord Kanem,TD06,2017-06-15 -TCD,2,TD0603,Wadi Bissam,TD06,2017-06-15 -TCD,2,TD0701,Mamdi,TD07,2017-06-15 -TCD,2,TD0702,Wayi,TD07,2017-06-15 -TCD,2,TD0703,Kaya,TD07,2017-06-15 -TCD,2,TD0704,Fouli,TD07,2017-06-15 -TCD,2,TD0801,Lac Wey,TD08,2017-06-15 -TCD,2,TD0802,Dodje,TD08,2017-06-15 -TCD,2,TD0803,Gueni,TD08,2017-06-15 -TCD,2,TD0804,Ngourkosso,TD08,2017-06-15 -TCD,2,TD0901,La Pende,TD09,2017-06-15 -TCD,2,TD0902,Kouh Est,TD09,2017-06-15 -TCD,2,TD0903,Kouh Ouest,TD09,2017-06-15 -TCD,2,TD0904,La Nya,TD09,2017-06-15 -TCD,2,TD0905,La Nya Pende,TD09,2017-06-15 -TCD,2,TD0906,Monts de Lam,TD09,2017-06-15 -TCD,2,TD1001,Mandoul Oriental,TD10,2017-06-15 -TCD,2,TD1002,Barh-Sara,TD10,2017-06-15 -TCD,2,TD1003,Mandoul Occidental,TD10,2017-06-15 -TCD,2,TD1101,Mayo-Boneye,TD11,2017-06-15 -TCD,2,TD1102,Kabbia,TD11,2017-06-15 -TCD,2,TD1103,Mayo-Lemie,TD11,2017-06-15 -TCD,2,TD1104,Mont Illi,TD11,2017-06-15 -TCD,2,TD1201,Mayo-Dallah,TD12,2017-06-15 -TCD,2,TD1202,Lac Lere,TD12,2017-06-15 -TCD,2,TD1203,Mayo-Binder,TD12,2017-06-15 -TCD,2,TD1301,Bahr-Koh,TD13,2017-06-15 -TCD,2,TD1302,Grande Sido,TD13,2017-06-15 -TCD,2,TD1303,Lac Iro,TD13,2017-06-15 -TCD,2,TD1401,Ouara,TD14,2017-06-15 -TCD,2,TD1402,Abdi,TD14,2017-06-15 -TCD,2,TD1403,Assoungha,TD14,2017-06-15 -TCD,2,TD1501,Bahr-Azoum,TD15,2017-06-15 -TCD,2,TD1502,Aboudeia,TD15,2017-06-15 -TCD,2,TD1503,Haraze-Mangueigne,TD15,2017-06-15 -TCD,2,TD1601,Tandjile Est,TD16,2017-06-15 -TCD,2,TD1602,Tandjile Ouest,TD16,2017-06-15 -TCD,2,TD1603,Tandjile Centre,TD16,2017-06-15 -TCD,2,TD1701,Biltine,TD17,2017-06-15 -TCD,2,TD1702,Dar-Tama,TD17,2017-06-15 -TCD,2,TD1703,Kobe,TD17,2017-06-15 -TCD,2,TD1704,Megri,TD17,2017-06-15 -TCD,2,TD1801,N'Djamena,TD18,2017-06-15 -TCD,2,TD1901,Barh-El-Gazel Sud,TD19,2017-06-15 -TCD,2,TD1902,Barh-El-Gazel Nord,TD19,2017-06-15 -TCD,2,TD1903,Barh-El-Gazel Ouest,TD19,2017-06-15 -TCD,2,TD2001,Am-Djarass,TD20,2017-06-15 -TCD,2,TD2002,Wadi Hawar,TD20,2017-06-15 -TCD,2,TD2101,Kimiti,TD21,2017-06-15 -TCD,2,TD2102,Djourf Al Ahmar,TD21,2017-06-15 -TCD,2,TD2201,Tibesti Est,TD22,2017-06-15 -TCD,2,TD2202,Tibesti Ouest,TD22,2017-06-15 -TCD,2,TD2301,Fada,TD23,2017-06-15 -TCD,2,TD2303,Mourtcha,TD23,2017-06-15 +TCD,1,TCD01,Batha,TCD,2012-09-04 +TCD,1,TCD02,Borkou,TCD,2012-09-04 +TCD,1,TCD03,Chari Baguirmi,TCD,2012-09-04 +TCD,1,TCD04,Guera,TCD,2012-09-04 +TCD,1,TCD05,Hadjer Lamis,TCD,2012-09-04 +TCD,1,TCD06,Kanem,TCD,2012-09-04 +TCD,1,TCD07,Lac,TCD,2012-09-04 +TCD,1,TCD08,Logone Occidental,TCD,2012-09-04 +TCD,1,TCD09,Logone Oriental,TCD,2012-09-04 +TCD,1,TCD10,Mandoul,TCD,2012-09-04 +TCD,1,TCD11,Mayo Kebbi Est,TCD,2012-09-04 +TCD,1,TCD12,Mayo Kebbi Ouest,TCD,2012-09-04 +TCD,1,TCD13,Moyen Chari,TCD,2012-09-04 +TCD,1,TCD14,Ouaddai,TCD,2012-09-04 +TCD,1,TCD15,Salamat,TCD,2012-09-04 +TCD,1,TCD16,Tandjile,TCD,2012-09-04 +TCD,1,TCD17,Wadi Fira,TCD,2012-09-04 +TCD,1,TCD18,N'Djamena,TCD,2012-09-04 +TCD,1,TCD19,Barh El Gazel,TCD,2012-09-04 +TCD,1,TCD20,Ennedi Est,TCD,2012-09-04 +TCD,1,TCD21,Sila,TCD,2012-09-04 +TCD,1,TCD22,Tibesti,TCD,2012-09-04 +TCD,1,TCD23,Ennedi Ouest,TCD,2012-09-04 +TCD,2,TCD0101,Batha Ouest,TCD01,2012-09-04 +TCD,2,TCD0102,Batha Est,TCD01,2012-09-04 +TCD,2,TCD0103,Fitri,TCD01,2012-09-04 +TCD,2,TCD0201,Borkou,TCD02,2012-09-04 +TCD,2,TCD0202,Borkou Yala,TCD02,2012-09-04 +TCD,2,TCD0301,Baguirmi,TCD03,2012-09-04 +TCD,2,TCD0302,Chari,TCD03,2012-09-04 +TCD,2,TCD0303,Loug Chari,TCD03,2012-09-04 +TCD,2,TCD0401,Guera,TCD04,2012-09-04 +TCD,2,TCD0402,Abtouyour,TCD04,2012-09-04 +TCD,2,TCD0403,Bahar Signaka,TCD04,2012-09-04 +TCD,2,TCD0404,Mangalme,TCD04,2012-09-04 +TCD,2,TCD0501,Dagana,TCD05,2012-09-04 +TCD,2,TCD0502,Dababa,TCD05,2012-09-04 +TCD,2,TCD0503,Haraze Al Biar,TCD05,2012-09-04 +TCD,2,TCD0601,Kanem,TCD06,2012-09-04 +TCD,2,TCD0602,Nord Kanem,TCD06,2012-09-04 +TCD,2,TCD0603,Wadi Bissam,TCD06,2012-09-04 +TCD,2,TCD0701,Mamdi,TCD07,2012-09-04 +TCD,2,TCD0702,Wayi,TCD07,2012-09-04 +TCD,2,TCD0703,Kaya,TCD07,2012-09-04 +TCD,2,TCD0704,Fouli,TCD07,2012-09-04 +TCD,2,TCD0801,Lac wey,TCD08,2012-09-04 +TCD,2,TCD0802,Djode,TCD08,2012-09-04 +TCD,2,TCD0803,Gueni,TCD08,2012-09-04 +TCD,2,TCD0804,Ngourkosso,TCD08,2012-09-04 +TCD,2,TCD0901,La pende,TCD09,2012-09-04 +TCD,2,TCD0902,Kouh Est,TCD09,2012-09-04 +TCD,2,TCD0903,Kouh Ouest,TCD09,2012-09-04 +TCD,2,TCD0904,La nya,TCD09,2012-09-04 +TCD,2,TCD0905,La Nya pende,TCD09,2012-09-04 +TCD,2,TCD0906,Monts de lam,TCD09,2012-09-04 +TCD,2,TCD1001,Mandoul Oriental,TCD10,2012-09-04 +TCD,2,TCD1002,Barh Sara,TCD10,2012-09-04 +TCD,2,TCD1003,Mandoul Occidental,TCD10,2012-09-04 +TCD,2,TCD1101,Mayo Boneye,TCD11,2012-09-04 +TCD,2,TCD1102,La kabbia,TCD11,2012-09-04 +TCD,2,TCD1103,Mayo Lemye,TCD11,2012-09-04 +TCD,2,TCD1104,Mont Illi,TCD11,2012-09-04 +TCD,2,TCD1201,Mayo Dallah,TCD12,2012-09-04 +TCD,2,TCD1202,Lac Lere,TCD12,2012-09-04 +TCD,2,TCD1203,Mayo Binder,TCD12,2012-09-04 +TCD,2,TCD1301,Bahr Koh,TCD13,2012-09-04 +TCD,2,TCD1302,Grande Sido,TCD13,2012-09-04 +TCD,2,TCD1303,Lac Iro,TCD13,2012-09-04 +TCD,2,TCD1401,Ouara,TCD14,2012-09-04 +TCD,2,TCD1402,Djourf Al Ahmar,TCD14,2012-09-04 +TCD,2,TCD1403,Assoungha,TCD14,2012-09-04 +TCD,2,TCD1501,Bahr Azoum,TCD15,2012-09-04 +TCD,2,TCD1502,Aboudeia,TCD15,2012-09-04 +TCD,2,TCD1503,Haraze Mangueigne,TCD15,2012-09-04 +TCD,2,TCD1601,Tandjile Est,TCD16,2012-09-04 +TCD,2,TCD1602,Tandjile Ouest,TCD16,2012-09-04 +TCD,2,TCD1603,Tandjile Centre,TCD16,2012-09-04 +TCD,2,TCD1701,Biltine,TCD17,2012-09-04 +TCD,2,TCD1702,Dar Tama,TCD17,2012-09-04 +TCD,2,TCD1703,Kobe,TCD17,2012-09-04 +TCD,2,TCD1704,Megri,TCD17,2012-09-04 +TCD,2,TCD1801,N'Djamena,TCD18,2012-09-04 +TCD,2,TCD1901,Barh El Gazel Sud,TCD19,2012-09-04 +TCD,2,TCD1902,Barh El Gazel Nord,TCD19,2012-09-04 +TCD,2,TCD1903,Barh El Gazel Ouest,TCD19,2012-09-04 +TCD,2,TCD2001,Amdjarass,TCD20,2012-09-04 +TCD,2,TCD2002,Wadi Hawar,TCD20,2012-09-04 +TCD,2,TCD2101,Kimiti,TCD21,2012-09-04 +TCD,2,TCD2102,Abdi,TCD21,2012-09-04 +TCD,2,TCD2201,Tibesti Est,TCD22,2012-09-04 +TCD,2,TCD2202,Tibesti Ouest,TCD22,2012-09-04 +TCD,2,TCD2301,Fada,TCD23,2012-09-04 +TCD,2,TCD2302,Mourtcha,TCD23,2012-09-04 TGO,1,TG01,Centrale,TGO,2021-01-07 TGO,1,TG02,Kara,TGO,2021-01-07 TGO,1,TG03,Maritime,TGO,2021-01-07 diff --git a/tests/test_main.py b/tests/test_main.py index 0e430dd8..4e798997 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -118,9 +118,9 @@ def test_admin(self, configuration, folder, pipelines): count = session.scalar(select(func.count(DBLocation.id))) check.equal(count, 249) count = session.scalar(select(func.count(DBAdmin1.id))) - check.equal(count, 2792) + check.equal(count, 2704) count = session.scalar(select(func.count(DBAdmin2.id))) - check.equal(count, 33479) + check.equal(count, 33391) admins = pipelines._admins max_admin_level = admins.get_max_admin_from_hxltags( [ @@ -341,7 +341,7 @@ def test_idps(self, configuration, folder, pipelines): count = session.scalar(select(func.count(DBDataset.hdx_id))) check.equal(count, 1) count = session.scalar(select(func.count(DBIDPs.resource_hdx_id))) - check.equal(count, 46746) + check.equal(count, 46638) @pytest.mark.parametrize( "themes_to_run", [{"funding": ("AFG", "BFA", "UKR")}]