uk_bin_collection 0.152.7__py3-none-any.whl → 0.152.9__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.
- uk_bin_collection/tests/input.json +11 -15
- uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py +69 -46
- uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py +119 -37
- uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py +158 -115
- uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py +87 -66
- uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py +2 -0
- uk_bin_collection/uk_bin_collection/councils/BlabyDistrictCouncil.py +5 -1
- uk_bin_collection/uk_bin_collection/councils/BlaenauGwentCountyBoroughCouncil.py +91 -66
- uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py +88 -67
- uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py +67 -56
- uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py +63 -95
- uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py +39 -18
- uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py +106 -97
- uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py +80 -75
- uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py +191 -67
- uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py +6 -2
- uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py +12 -3
- uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py +2 -1
- uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py +8 -2
- uk_bin_collection/uk_bin_collection/councils/SouthwarkCouncil.py +23 -1
- uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py +2 -1
- uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py +4 -1
- uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py +3 -3
- uk_bin_collection/uk_bin_collection/get_bin_data.py +1 -1
- {uk_bin_collection-0.152.7.dist-info → uk_bin_collection-0.152.9.dist-info}/METADATA +1 -1
- {uk_bin_collection-0.152.7.dist-info → uk_bin_collection-0.152.9.dist-info}/RECORD +29 -30
- uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py +0 -69
- {uk_bin_collection-0.152.7.dist-info → uk_bin_collection-0.152.9.dist-info}/LICENSE +0 -0
- {uk_bin_collection-0.152.7.dist-info → uk_bin_collection-0.152.9.dist-info}/WHEEL +0 -0
- {uk_bin_collection-0.152.7.dist-info → uk_bin_collection-0.152.9.dist-info}/entry_points.txt +0 -0
@@ -42,12 +42,12 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
42
42
|
wait = WebDriverWait(driver, 60)
|
43
43
|
address_entry_field = wait.until(
|
44
44
|
EC.presence_of_element_located(
|
45
|
-
(By.XPATH, '//*[@id="combobox-input-
|
45
|
+
(By.XPATH, '//*[@id="combobox-input-23"]')
|
46
46
|
)
|
47
47
|
)
|
48
48
|
|
49
49
|
address_entry_field = wait.until(
|
50
|
-
EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-
|
50
|
+
EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-23"]'))
|
51
51
|
)
|
52
52
|
address_entry_field.click()
|
53
53
|
address_entry_field.send_keys(str(full_address))
|
@@ -56,7 +56,7 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
56
56
|
|
57
57
|
first_found_address = wait.until(
|
58
58
|
EC.element_to_be_clickable(
|
59
|
-
(By.XPATH, '//*[@id="dropdown-element-
|
59
|
+
(By.XPATH, '//*[@id="dropdown-element-23"]/ul')
|
60
60
|
)
|
61
61
|
)
|
62
62
|
|
@@ -121,7 +121,7 @@ class AbstractGetBinDataClass(ABC):
|
|
121
121
|
urllib3.disable_warnings(category=urllib3.exceptions.InsecureRequestWarning)
|
122
122
|
|
123
123
|
try:
|
124
|
-
full_page = requests.get(url, headers, verify=False, timeout=120)
|
124
|
+
full_page = requests.get(url, headers=headers, verify=False, timeout=120)
|
125
125
|
return full_page
|
126
126
|
except requests.exceptions.RequestException as err:
|
127
127
|
_LOGGER.error(f"Request Error: {err}")
|
@@ -7,7 +7,7 @@ uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-c
|
|
7
7
|
uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
|
8
8
|
uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
|
9
9
|
uk_bin_collection/tests/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
|
10
|
-
uk_bin_collection/tests/input.json,sha256=
|
10
|
+
uk_bin_collection/tests/input.json,sha256=9m5r4S7nWUlXEJTko7KU52SPei8n97ewA5DQNQRwlAI,132641
|
11
11
|
uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
|
12
12
|
uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
|
13
13
|
uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
|
@@ -21,7 +21,7 @@ uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.py,sha256=Je8Vw
|
|
21
21
|
uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py,sha256=aO1CSdyqa8oAD0fB79y1Q9bikAWCP_JFa7CsyTa2j9s,1655
|
22
22
|
uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=2fU4E2hnblgzlS-hGkaczbzg4I3-lwIU0Fiszp_WnqM,4406
|
23
23
|
uk_bin_collection/uk_bin_collection/councils/AmberValleyBoroughCouncil.py,sha256=mTeluIIEcuxLxhfDQ95A1fp8RM6AkJT5tRGZPUbYGdk,1853
|
24
|
-
uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py,sha256=
|
24
|
+
uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py,sha256=NVNKU0jwZzhltOU0aB4UXN5cYiQCnFHaBXgmBmgQGvM,6955
|
25
25
|
uk_bin_collection/uk_bin_collection/councils/AntrimAndNewtonabbeyCouncil.py,sha256=Hp5pteaC5RjL5ZqPZ564S9WQ6ZTKLMO6Dl_fxip2TUc,1653
|
26
26
|
uk_bin_collection/uk_bin_collection/councils/ArdsAndNorthDownCouncil.py,sha256=iMBldxNErgi-ok1o6xpqdNgMvR6qapaNqoTWDTqMeGo,3824
|
27
27
|
uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py,sha256=NBeXjzv0bOblkS5xjSy5D0DdW9vtx_TGMLVP0FP1JqA,5073
|
@@ -29,23 +29,22 @@ uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py,
|
|
29
29
|
uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py,sha256=yfhthv9nuogP19VOZ3TYQrq51qqjiCZcSel4sXhiKjs,4012
|
30
30
|
uk_bin_collection/uk_bin_collection/councils/AshfieldDistrictCouncil.py,sha256=fhX7S_A3jqoND7NE6qITPMPvdk3FJSKZ3Eoa5RtSg3I,4247
|
31
31
|
uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py,sha256=kuL7ujTdbuvExy84Wl2LVrPlcmnpU-mgBIW3krEBXew,5227
|
32
|
-
uk_bin_collection/uk_bin_collection/councils/
|
33
|
-
uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
|
32
|
+
uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=HATwYRi6KfAO3OhgMW1f0UwNz1Ja23OLJnc_XW1dT5E,6699
|
34
33
|
uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py,sha256=1eXdST58xFRMdYl8AGNG_EwyQeLa31WSWUe882hQ2ec,6329
|
35
34
|
uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py,sha256=fgbaD8jsUBJrnUWKbcjSdJHDVRAh9KRUsG6JwB31NYA,6263
|
36
|
-
uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=
|
35
|
+
uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=uBIgJVrxc-MdcRDvDzeN8BzCK9Q5yctEXSk4wv-hd-I,11508
|
37
36
|
uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=hqzVKEqwYmjcQjCYBletcCt9_pE96qQ3kn7eDroJeNk,4764
|
38
|
-
uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=
|
37
|
+
uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=n4vudXZja4HqMBhS9dG4q6l9aiX0CKWpai8xIyG-mwY,4401
|
39
38
|
uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py,sha256=VPWGljnH4C3q8qs5ZmCtqjNjgWQvviALzjk00q3EZeQ,2632
|
40
39
|
uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py,sha256=N_TPiIv8VBzN3rY0p3JtLlxSEru-6k1wW4UNIhN5X1M,3709
|
41
40
|
uk_bin_collection/uk_bin_collection/councils/BedfordBoroughCouncil.py,sha256=CvGB7w9HMn7XyEtwfd9MWZE_HlZ75pDcaKMsQJz0xhk,1669
|
42
|
-
uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py,sha256=
|
41
|
+
uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py,sha256=aCwDVb1z3_KVPL8XcvJG94Tzp2CZM8n5pu8MGM8mv1o,2725
|
43
42
|
uk_bin_collection/uk_bin_collection/councils/BelfastCityCouncil.py,sha256=SGOv9mm3fByyR3TQDyNcSLeidX_7FlHelkxnh-NUTcY,4327
|
44
43
|
uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py,sha256=WXrrlMYxvYWtKUiLV6ZxJy4RRCIr1CCETfrJTdq3faQ,5306
|
45
44
|
uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py,sha256=now2xgpfshYM33UWC18j6xa6BuBydO5Sl7OrDQOo6b0,4687
|
46
|
-
uk_bin_collection/uk_bin_collection/councils/BlabyDistrictCouncil.py,sha256=
|
45
|
+
uk_bin_collection/uk_bin_collection/councils/BlabyDistrictCouncil.py,sha256=MT1b1C5HNGn77GeoR-YpdbQ3I9ZdV9jh-QgdewS41MA,2062
|
47
46
|
uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py,sha256=ZLA2V3qPsJTom7SeQdGDhF4tJSfgIV5Qi202QvGKJZ0,4477
|
48
|
-
uk_bin_collection/uk_bin_collection/councils/BlaenauGwentCountyBoroughCouncil.py,sha256=
|
47
|
+
uk_bin_collection/uk_bin_collection/councils/BlaenauGwentCountyBoroughCouncil.py,sha256=Fp83gwF6RQieDgELpAdurjm6tDF4C6pBBukfPQSBHtc,6190
|
49
48
|
uk_bin_collection/uk_bin_collection/councils/BolsoverCouncil.py,sha256=_NZuSvSblS0NlxIhrzqbB9GNnY0xjT4SrIBi9bQ6UC8,10354
|
50
49
|
uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=WI68r8jB0IHPUT4CgmZMtng899AAMFTxkyTdPg9yLF8,4117
|
51
50
|
uk_bin_collection/uk_bin_collection/councils/BostonBoroughCouncil.py,sha256=8xv6FMNj8Qgwn5K0nMdB5X8hkcNFzhcJ48DMordflJY,5631
|
@@ -59,9 +58,9 @@ uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py,sha256=nQeRBK
|
|
59
58
|
uk_bin_collection/uk_bin_collection/councils/BroadlandDistrictCouncil.py,sha256=YhzP8zar_oSSkBOA3mdMAehnMTrcTBmGO0RfC4UBzvM,8236
|
60
59
|
uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py,sha256=dii85JLmYU1uMidCEsWVo3stTcq_QqyC65DxG8u1UmE,4302
|
61
60
|
uk_bin_collection/uk_bin_collection/councils/BromsgroveDistrictCouncil.py,sha256=PUfxP8j5Oh9wFHkdjbrJzQli9UzMHZzwrZ2hkThrvhI,1781
|
62
|
-
uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py,sha256=
|
61
|
+
uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py,sha256=YXt9Tb6J0YiPs7Y4blNc2vWgdVhsFYRGT8OWz8yfEsM,4239
|
63
62
|
uk_bin_collection/uk_bin_collection/councils/BroxtoweBoroughCouncil.py,sha256=-Facq-ToQkcWUePpKBwq90LZUFxgUSydNL2sYaLX4yw,4473
|
64
|
-
uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py,sha256=
|
63
|
+
uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py,sha256=EUgAdwvAxNyGfTnDFPIcHuOKEru5X08We9_qN9OZjH0,5600
|
65
64
|
uk_bin_collection/uk_bin_collection/councils/BurnleyBoroughCouncil.py,sha256=GJf1OPvUVj3vqsR3KjG0DFHZrSBu4ogIz_MJeVV8tNA,3192
|
66
65
|
uk_bin_collection/uk_bin_collection/councils/BuryCouncil.py,sha256=H7wAxO1nfxkewVoRRolumq8bBJG04siE3jieFH3RGpQ,2632
|
67
66
|
uk_bin_collection/uk_bin_collection/councils/CalderdaleCouncil.py,sha256=OJZcHYlvZDzmBpjjPPm3J8CRK9Twc49vRj7O9c5fyQ4,4971
|
@@ -73,20 +72,20 @@ uk_bin_collection/uk_bin_collection/councils/CarmarthenshireCountyCouncil.py,sha
|
|
73
72
|
uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha256=AjxuIqKxx0tYHMaTBITXTcnN2L-Zrx78uwUkqTjI0xU,3599
|
74
73
|
uk_bin_collection/uk_bin_collection/councils/CeredigionCountyCouncil.py,sha256=np9iLnMVWpMYUiHZ4sJaSaU5pOWfmiCLQ8TIrOlY48o,5924
|
75
74
|
uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=FC8jftZFfMnqV-Of_eQAYBcUiCIJDSNFO2DMZbtDy6E,2569
|
76
|
-
uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=
|
75
|
+
uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=thagz60NeEDbOHdnBH-ByKDBRNElPvo0UU0lwZ6c2OQ,3891
|
77
76
|
uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=bGxfMO4PpTd6ZTfm1hA9tmNUFDKGt20CMJolZ3K_CeM,16411
|
78
|
-
uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=
|
77
|
+
uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=h8jgpTra9H-aqfDB7tcOd8fveRcQXEXRUnG35SF7ARg,3484
|
79
78
|
uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=RoybPitUD4u0xk4Kc9hXqHbUXCqGJG9Z4uRHWKj4ttk,2495
|
80
79
|
uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
|
81
80
|
uk_bin_collection/uk_bin_collection/councils/ChesterfieldBoroughCouncil.py,sha256=mZiM8Ugm_OP0JkC5pLaQmi4i79mAp4SNNrcIdsREjHw,7198
|
82
81
|
uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=bvtqXSZN64jSND0NxwzJ-WA9H49FwARQMGS3PlUSiUg,6311
|
83
|
-
uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py,sha256=
|
82
|
+
uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py,sha256=_Ybtpwux5EdQk5AF96Yhd95jJcNGVV6wlvMy_VIrMAY,6898
|
84
83
|
uk_bin_collection/uk_bin_collection/councils/ColchesterCityCouncil.py,sha256=Mny-q2rQkWe2Tj1gINwEM1L4AkqQl1EDMAaKY0-deD4,3968
|
85
84
|
uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py,sha256=QcFHTzW7Q1jYyHWq6thpA6fhO8w38eCOpUPk9EfjGIA,1291
|
86
|
-
uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py,sha256=
|
85
|
+
uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py,sha256=PwTbTVNDdGZnSkPcIHYf-LHItDyIbR68Avr96T1FrX8,3308
|
87
86
|
uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py,sha256=6zHe_Qu-R9hTB52QRk215rYfO3OocbJ_D62kVWnrve8,2912
|
88
|
-
uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py,sha256=
|
89
|
-
uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py,sha256=
|
87
|
+
uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py,sha256=SPe6GONcQ_wHlILXIY4qbIfD4I8bZqgI9c5aT0nzTUI,11812
|
88
|
+
uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py,sha256=Rlv97vMwLXM4uWH0Vq6916j0n8bqxEuv8byAXZsC4Eo,2300
|
90
89
|
uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=Oaj5INA3zNjtzBRsfLvRTIxZzcd4E4bJfVF1ULWlrL4,4322
|
91
90
|
uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=6UCT2Q75NANXPP7kR1ktM65lTKEDI2pDwfc5qnOL1io,5369
|
92
91
|
uk_bin_collection/uk_bin_collection/councils/CumberlandAllerdaleCouncil.py,sha256=bPOmkyzNnHrOtUprbouHdOsgpu7WilUADcaccWTCPFI,2839
|
@@ -197,7 +196,7 @@ uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py,sha256
|
|
197
196
|
uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=AZgC9wmDLEjUOtIFvf0ehF5LHturXTH4DkE3ioPSVBA,6254
|
198
197
|
uk_bin_collection/uk_bin_collection/councils/MidUlsterDistrictCouncil.py,sha256=ev_T8LoI9tZzkymmAD9yEk2leKc4Y0Cqsde56aAJPa8,5114
|
199
198
|
uk_bin_collection/uk_bin_collection/councils/MiddlesbroughCouncil.py,sha256=BiYexiZj-9PxRnB7sYRy0G-72s3L9jfh2vd1Y2NQwtg,4223
|
200
|
-
uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256
|
199
|
+
uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=TW4U63T5-n0l-786gMTfPm7oxivHhRHEIG6NCeV84Zo,7304
|
201
200
|
uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=7e2pGBLCw24pNItHeI9jkxQ3rEOZ4WC4zVlbvKYGdXE,2600
|
202
201
|
uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=xWR5S0gwQu9gXxjl788Wux1KaC0CT7ZFw0iXuRLZCEM,5599
|
203
202
|
uk_bin_collection/uk_bin_collection/councils/MonmouthshireCountyCouncil.py,sha256=PC2tui10S-DXmiKUqXZun5MInIgqqQjtT5wII1K_9a0,2532
|
@@ -206,7 +205,7 @@ uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=p9
|
|
206
205
|
uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py,sha256=Vdmv_p75OJwSeltWE5wZhE8wy5XW0CIKIn1cKNvI0pQ,5336
|
207
206
|
uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py,sha256=lAleYfCGUWCKOi7Ye_cjgfpI3pWwTcFctlYmh0hjebM,2140
|
208
207
|
uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py,sha256=eJMX10CG9QO7FRhHSmUDL-jO_44qoK3_1ztNTAXhkbw,2085
|
209
|
-
uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py,sha256=
|
208
|
+
uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py,sha256=feuQnAG80xVojQlUBLh8wjVPVU6yLZ6sQKKjfHBKIl8,2514
|
210
209
|
uk_bin_collection/uk_bin_collection/councils/NewhamCouncil.py,sha256=zlkKm28E6zIRknAbyLeSd5LNeRctqlZ-2MIrAsdaqHg,2260
|
211
210
|
uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py,sha256=dAcl5P97bttl2xCPvxof1a18kmqOrMmiElgtn3Ej7zs,8480
|
212
211
|
uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py,sha256=o8zv40Wt19d51mrN5lsgLMCKMokMPmI1cMHBNT5yAho,1976
|
@@ -247,7 +246,7 @@ uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py,sha256=UTSwSw515
|
|
247
246
|
uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=rfhD66A9HfHL46ldF9sbxvV7fPaaoNxzIJbHjVT6A90,2621
|
248
247
|
uk_bin_collection/uk_bin_collection/councils/RotherDistrictCouncil.py,sha256=-fdLvtik9ytfwXrrhwWdBxqQOMq2N1pvrIuvShhf8PU,3090
|
249
248
|
uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=dfAqXtmbptHGZGGWkurjY9snaVm1aH5CGjhzdtoe4JM,2058
|
250
|
-
uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py,sha256=
|
249
|
+
uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py,sha256=AziuKhP6wKu_316MA4xXRN-ayDU6RSB21EfSWjmMqU8,3800
|
251
250
|
uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py,sha256=WlmOD-xHJFdowI9fGuGDHOpnAVHGUWxGZqmJ6z4fGXs,5687
|
252
251
|
uk_bin_collection/uk_bin_collection/councils/RunnymedeBoroughCouncil.py,sha256=vmTZfijt9b6sKzRdRwROE94lrMVnqs6kn6tg-xi1jR4,1618
|
253
252
|
uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py,sha256=nWo8xeER71FEbnMTX8W9bcwZNpLEExWzPvgRT7DmcMc,4221
|
@@ -275,7 +274,7 @@ uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py,sha256=juX7pg
|
|
275
274
|
uk_bin_collection/uk_bin_collection/councils/SouthStaffordshireDistrictCouncil.py,sha256=ACQMHWyamnj1ag3gNF-8Jhp-DKUok1GhFdnzH4nCzwU,3201
|
276
275
|
uk_bin_collection/uk_bin_collection/councils/SouthTynesideCouncil.py,sha256=dxXGrJfg_fn2IPTBgq6Duwy0WY8GYLafMuisaCjOnbs,3426
|
277
276
|
uk_bin_collection/uk_bin_collection/councils/SouthamptonCityCouncil.py,sha256=exNoI-Vun_C5FowCYhZ_600MBUe_OPR7MdGZEMNLL0I,1542
|
278
|
-
uk_bin_collection/uk_bin_collection/councils/SouthwarkCouncil.py,sha256=
|
277
|
+
uk_bin_collection/uk_bin_collection/councils/SouthwarkCouncil.py,sha256=xgxOKyy-jFKOl_5zYaJovr0ijEMN20ssOSB7I7Jtfhw,5685
|
279
278
|
uk_bin_collection/uk_bin_collection/councils/SpelthorneBoroughCouncil.py,sha256=iamG0wxIyYprttJPVc0jdbOoHavc1AmRpMhyc02MUrE,5703
|
280
279
|
uk_bin_collection/uk_bin_collection/councils/StAlbansCityAndDistrictCouncil.py,sha256=mPZz6Za6kTSkrfHnj0OfwtnpRYR1dKvxbuFEKnWsiL8,1451
|
281
280
|
uk_bin_collection/uk_bin_collection/councils/StHelensBC.py,sha256=X9dvnQTNn7QUO8gv1A587e1aDI92TWN4iNLATTn3H3w,4777
|
@@ -292,7 +291,7 @@ uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py,sha256=Eya
|
|
292
291
|
uk_bin_collection/uk_bin_collection/councils/SurreyHeathBoroughCouncil.py,sha256=MROVvf7RSRYYjM2ZDD83rAEwf8BSnqXVrasgBiJC92A,5220
|
293
292
|
uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=FuQGlPaiFxfQS3KzkyrvcuTaVb8VkwdWYgjm42FfUt8,5762
|
294
293
|
uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py,sha256=nmVPoPhnFgVi--vczX2i4Sf3bqM5RWJuwfhioRUr5XE,2303
|
295
|
-
uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py,sha256=
|
294
|
+
uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py,sha256=T9xWZ9eHjB-U1Eh-f5iEcba3S86jAqJY-OVo5uJlueY,2026
|
296
295
|
uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py,sha256=k2TAAZG7n2S1BWVyxbE_-4-lZuzhOimCNz4yimUCOGk,1995
|
297
296
|
uk_bin_collection/uk_bin_collection/councils/TandridgeDistrictCouncil.py,sha256=KLVvM2NNq_DQylVe5dwO2l7qPahLHg08jJGLCv1MBQ4,2324
|
298
297
|
uk_bin_collection/uk_bin_collection/councils/TeignbridgeCouncil.py,sha256=-NowMNcxsnktzUxTk-XUfzFJgXKSSerCmdZ7cN4cE1s,2703
|
@@ -310,7 +309,7 @@ uk_bin_collection/uk_bin_collection/councils/TunbridgeWellsCouncil.py,sha256=s8N
|
|
310
309
|
uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=GSELWbSn5jtznv6FSLIMxK6CyQ27MW9FoY_m5jhTEBA,4175
|
311
310
|
uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=dz3zDJsJKYYqUB-Gxf6twvP6kG_wyENaszxXxK4iJn0,5089
|
312
311
|
uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=fyskrQ4-osGOeCZuB_8m2TpW8iwHr7lpl52nrR06Xpo,4441
|
313
|
-
uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=
|
312
|
+
uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=XeNftiIzDM5wr66RLGBUCq4u5uERwsUC-ZOXz7LC-8I,5143
|
314
313
|
uk_bin_collection/uk_bin_collection/councils/WalsallCouncil.py,sha256=aniL34mc0ehLl5fDUi8Y_L_TK8HFoE605IJIarb5CSk,2363
|
315
314
|
uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=8Xoi9G8iXJi8uqnyNuqba37RwTqvuvMj9FZxi4NA-n4,4924
|
316
315
|
uk_bin_collection/uk_bin_collection/councils/WandsworthCouncil.py,sha256=aQoJpC7YkhKewQyZlsv5m4__2IPoKRsOrPxjNH5xRNo,2594
|
@@ -327,7 +326,7 @@ uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py,sha25
|
|
327
326
|
uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py,sha256=dq0jimtARvRkZiGbVFrXXZgY-BODtz3uYZ5UKn0bf64,4114
|
328
327
|
uk_bin_collection/uk_bin_collection/councils/WestMorlandAndFurness.py,sha256=jbqV3460rn9D0yTBGWjpSe1IvWWcdGur5pzgj-hJcQ4,2513
|
329
328
|
uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha256=Se3Cfn_6ADjhsUzEJI_JnGkVcIbXxSTferM4ZC6pZ0g,1166
|
330
|
-
uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py,sha256=
|
329
|
+
uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py,sha256=LLgpBE-yZFTpyZ5StGPVYtiBGxzttZt4f4YEqiYqocE,4858
|
331
330
|
uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=9i8AQHh-qIRPZ_5Ad97_h04-qgyLQDPV064obBzab1Y,2587
|
332
331
|
uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=W9FGN47bTHvzARa6UInXEB3X6cToqfgzTkNlROzHgcM,3743
|
333
332
|
uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py,sha256=Q0ooHTQb9ynMXpSNBPk7XXEjI7zcHst3id4wxGdmVx4,5698
|
@@ -345,9 +344,9 @@ uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py,sha256
|
|
345
344
|
uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
|
346
345
|
uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
|
347
346
|
uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
|
348
|
-
uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=
|
349
|
-
uk_bin_collection-0.152.
|
350
|
-
uk_bin_collection-0.152.
|
351
|
-
uk_bin_collection-0.152.
|
352
|
-
uk_bin_collection-0.152.
|
353
|
-
uk_bin_collection-0.152.
|
347
|
+
uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=Qb76X46V0UMZJwO8zMNPvnVY7jNa-bmTlrirDi1tuJA,4553
|
348
|
+
uk_bin_collection-0.152.9.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
|
349
|
+
uk_bin_collection-0.152.9.dist-info/METADATA,sha256=ki99XW12C-4HDTNenYbqKcCfvxB1tMYuVFNrgQxw4QQ,26688
|
350
|
+
uk_bin_collection-0.152.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
|
351
|
+
uk_bin_collection-0.152.9.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
|
352
|
+
uk_bin_collection-0.152.9.dist-info/RECORD,,
|
@@ -1,69 +0,0 @@
|
|
1
|
-
from bs4 import BeautifulSoup
|
2
|
-
from uk_bin_collection.uk_bin_collection.common import *
|
3
|
-
from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
|
4
|
-
|
5
|
-
|
6
|
-
# import the wonderful Beautiful Soup and the URL grabber
|
7
|
-
class CouncilClass(AbstractGetBinDataClass):
|
8
|
-
"""
|
9
|
-
Concrete classes have to implement all abstract operations of the
|
10
|
-
base class. They can also override some operations with a default
|
11
|
-
implementation.
|
12
|
-
"""
|
13
|
-
|
14
|
-
def parse_data(self, page: str, **kwargs) -> dict:
|
15
|
-
uprn = kwargs.get("uprn")
|
16
|
-
check_uprn(uprn)
|
17
|
-
|
18
|
-
# Make SOAP Request
|
19
|
-
headers = {
|
20
|
-
"Content-Type": "text/xml; charset=UTF-8",
|
21
|
-
"SOAPAction": '"http://tempuri.org/GetCollections"',
|
22
|
-
}
|
23
|
-
|
24
|
-
post_data = (
|
25
|
-
'<?xml version="1.0" encoding="utf-8"?><soap:Envelope '
|
26
|
-
'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
|
27
|
-
'xmlns:xsd="http://www.w3.org/2001/XMLSchema" '
|
28
|
-
'xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><GetCollections '
|
29
|
-
'xmlns="http://tempuri.org/"><uprn>'
|
30
|
-
+ uprn
|
31
|
-
+ "</uprn></GetCollections></soap:Body></soap:Envelope>"
|
32
|
-
)
|
33
|
-
|
34
|
-
response = requests.post(
|
35
|
-
"http://avdcbins.web-labs.co.uk/RefuseApi.asmx",
|
36
|
-
data=post_data,
|
37
|
-
headers=headers,
|
38
|
-
)
|
39
|
-
|
40
|
-
if response.status_code != 200:
|
41
|
-
raise ValueError("No collection data found for provided UPRN.")
|
42
|
-
|
43
|
-
# Make a BS4 object
|
44
|
-
soup = BeautifulSoup(response.text, "xml")
|
45
|
-
soup.prettify()
|
46
|
-
|
47
|
-
data = {"bins": []}
|
48
|
-
|
49
|
-
all_collections = soup.find_all("BinCollection")
|
50
|
-
|
51
|
-
for i in range(len(all_collections)):
|
52
|
-
collection_date = datetime.strptime(
|
53
|
-
all_collections[i].Date.get_text(), "%Y-%m-%dT%H:%M:%S"
|
54
|
-
)
|
55
|
-
children = all_collections[i].find_all(
|
56
|
-
["Refuse", "Recycling", "Garden", "Food"], string="true"
|
57
|
-
)
|
58
|
-
|
59
|
-
for collection in children:
|
60
|
-
dict_data = {
|
61
|
-
"type": collection.name,
|
62
|
-
"collectionDate": collection_date.strftime(date_format),
|
63
|
-
}
|
64
|
-
data["bins"].append(dict_data)
|
65
|
-
|
66
|
-
data["bins"].sort(
|
67
|
-
key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
|
68
|
-
)
|
69
|
-
return data
|
File without changes
|
File without changes
|
{uk_bin_collection-0.152.7.dist-info → uk_bin_collection-0.152.9.dist-info}/entry_points.txt
RENAMED
File without changes
|