uk_bin_collection 0.135.2__py3-none-any.whl → 0.135.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- uk_bin_collection/tests/input.json +1 -2
- uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py +1 -13
- {uk_bin_collection-0.135.2.dist-info → uk_bin_collection-0.135.3.dist-info}/METADATA +1 -1
- {uk_bin_collection-0.135.2.dist-info → uk_bin_collection-0.135.3.dist-info}/RECORD +7 -7
- {uk_bin_collection-0.135.2.dist-info → uk_bin_collection-0.135.3.dist-info}/LICENSE +0 -0
- {uk_bin_collection-0.135.2.dist-info → uk_bin_collection-0.135.3.dist-info}/WHEEL +0 -0
- {uk_bin_collection-0.135.2.dist-info → uk_bin_collection-0.135.3.dist-info}/entry_points.txt +0 -0
@@ -2202,12 +2202,11 @@
|
|
2202
2202
|
"wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
|
2203
2203
|
},
|
2204
2204
|
"WyreCouncil": {
|
2205
|
-
"postcode": "FY6 8HG",
|
2206
2205
|
"skip_get_url": true,
|
2207
2206
|
"uprn": "10003519994",
|
2208
2207
|
"url": "https://www.wyre.gov.uk/bins-rubbish-recycling",
|
2209
2208
|
"wiki_name": "Wyre Council",
|
2210
|
-
"wiki_note": "Provide your UPRN
|
2209
|
+
"wiki_note": "Provide your UPRN. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
|
2211
2210
|
},
|
2212
2211
|
"WyreForestDistrictCouncil": {
|
2213
2212
|
"house_number": "Monday",
|
@@ -19,9 +19,6 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
19
19
|
user_uprn = kwargs.get("uprn")
|
20
20
|
check_uprn(user_uprn)
|
21
21
|
|
22
|
-
user_postcode = kwargs.get("postcode")
|
23
|
-
check_postcode(user_postcode)
|
24
|
-
|
25
22
|
data = {"bins": []}
|
26
23
|
collections = []
|
27
24
|
|
@@ -41,17 +38,8 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
41
38
|
"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.6167.186 Safari/537.36",
|
42
39
|
"x-requested-with": "XMLHttpRequest",
|
43
40
|
}
|
44
|
-
postcode_api = f"https://www.wyre.gov.uk/singlepoint_ajax/{urllib.parse.quote(user_postcode)}"
|
45
|
-
addr_res = requests.post(postcode_api, headers=headers)
|
46
|
-
json_data = addr_res.json()
|
47
|
-
|
48
|
-
for v in json_data.values():
|
49
|
-
v_uprn = v.get("uprn")
|
50
|
-
if v_uprn == user_uprn:
|
51
|
-
addr_line = v.get("label")
|
52
|
-
break
|
53
41
|
|
54
|
-
api_url = f"https://www.wyre.gov.uk/bincollections?uprn={user_uprn}
|
42
|
+
api_url = f"https://www.wyre.gov.uk/bincollections?uprn={user_uprn}"
|
55
43
|
res = requests.get(api_url, headers=headers)
|
56
44
|
|
57
45
|
soup = BeautifulSoup(res.text, features="html.parser")
|
@@ -3,7 +3,7 @@ uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=Iecdja0I3XIiY
|
|
3
3
|
uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
|
4
4
|
uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
|
5
5
|
uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
|
6
|
-
uk_bin_collection/tests/input.json,sha256=
|
6
|
+
uk_bin_collection/tests/input.json,sha256=1WxEeiVgfEgwPt9QE7-fHgW3itmi4SiMJ6DzzXnmq5U,116247
|
7
7
|
uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
|
8
8
|
uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
|
9
9
|
uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
|
@@ -309,14 +309,14 @@ uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=H
|
|
309
309
|
uk_bin_collection/uk_bin_collection/councils/WolverhamptonCityCouncil.py,sha256=ncXfu5RHPCFsArczXHy7g0l_HEZa7GC-QA1QRReP_00,1801
|
310
310
|
uk_bin_collection/uk_bin_collection/councils/WorcesterCityCouncil.py,sha256=dKHB2fPSmOGOwyvfpbdR4U8XW2ctBf63gCPxX06kwKA,1867
|
311
311
|
uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=GnNNMe33YMlK6S7rjM3c4BQkBnXelS0DKl2x5V4fb2w,5775
|
312
|
-
uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=
|
312
|
+
uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=QpCkmRSQmJo0RLsjXoCYPDcoxuDzG_00qNV0AHTDmXo,3000
|
313
313
|
uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py,sha256=3b7WzBXdYub6j13sqDL3jlqgICKmNyQaF4KxRxOMHWk,2000
|
314
314
|
uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
|
315
315
|
uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
|
316
316
|
uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
|
317
317
|
uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
|
318
|
-
uk_bin_collection-0.135.
|
319
|
-
uk_bin_collection-0.135.
|
320
|
-
uk_bin_collection-0.135.
|
321
|
-
uk_bin_collection-0.135.
|
322
|
-
uk_bin_collection-0.135.
|
318
|
+
uk_bin_collection-0.135.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
|
319
|
+
uk_bin_collection-0.135.3.dist-info/METADATA,sha256=hmaNZDf9gPgRkIP7dLin2bsLgIGoGEej5w-VieP-53Q,19741
|
320
|
+
uk_bin_collection-0.135.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
|
321
|
+
uk_bin_collection-0.135.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
|
322
|
+
uk_bin_collection-0.135.3.dist-info/RECORD,,
|
File without changes
|
File without changes
|
{uk_bin_collection-0.135.2.dist-info → uk_bin_collection-0.135.3.dist-info}/entry_points.txt
RENAMED
File without changes
|