uk_bin_collection 0.159.3__py3-none-any.whl → 0.160.1__py3-none-any.whl

uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py

@@ -18,197 +18,8 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-<<<<<<< HEAD
-        user_postcode = kwargs.get("postcode")
-        check_postcode(user_postcode)
-        user_uprn = kwargs.get("uprn")
-        check_uprn(user_uprn)
-
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/87.0.4280.141 Safari/537.36"
-        }
-
-        requests.packages.urllib3.disable_warnings()
-        with requests.Session() as s:
-            # Set Headers
-            s.headers = headers
-
-            # Get the first page - This is the Search for property by Post Code page
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/f?p=customer:BIN_DAYS:::NO:RP:UID:6CDD2A34C912312074D8E2410531401A8C00EFF7"
-            )
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-
-            # The page contains a number of values that must be passed into subsequent requests - extract them here
-            payload = {
-                i["name"]: i.get("value", "") for i in soup.select("input[name]")
-            }
-            payload2 = {
-                i["data-for"]: i.get("value", "")
-                for i in soup.select("input[data-for]")
-            }
-            
-            # Check if required form elements exist
-            salt_element = soup.select_one('input[id="pSalt"]')
-            protected_element = soup.select_one('input[id="pPageItemsProtected"]')
-            
-            if not salt_element or not protected_element:
-                raise Exception("Required form elements not found. The council website may have changed or be unavailable.")
-            
-            payload_salt = salt_element.get("value")
-            payload_protected = protected_element.get("value")
-
-            # Add the PostCode and 'SEARCH' to the payload
-            payload["p_request"] = "SEARCH"
-            payload["P153_POST_CODE"] = user_postcode
-
-            # Manipulate the lists and build the JSON that must be submitted in further requests - some data is nested
-            merged_list = {**payload, **payload2}
-            new_list = []
-            other_list = {}
-            for key in merged_list.keys():
-                temp_list = {}
-                val = merged_list[key]
-                if key in [
-                    "P153_UPRN",
-                    "P153_TEMP",
-                    "P153_SYSDATE",
-                    "P0_LANGUAGE",
-                    "P153_POST_CODE",
-                ]:
-                    temp_list = {"n": key, "v": val}
-                    new_list.append(temp_list)
-                elif key in [
-                    "p_flow_id",
-                    "p_flow_step_id",
-                    "p_instance",
-                    "p_page_submission_id",
-                    "p_request",
-                    "p_reload_on_submit",
-                ]:
-                    other_list[key] = val
-                else:
-                    temp_list = {"n": key, "v": "", "ck": val}
-                    new_list.append(temp_list)
-
-            json_builder = {
-                "pageItems": {
-                    "itemsToSubmit": new_list,
-                    "protected": payload_protected,
-                    "rowVersion": "",
-                    "formRegionChecksums": [],
-                },
-                "salt": payload_salt,
-            }
-            json_object = json.dumps(json_builder, separators=(",", ":"))
-            other_list["p_json"] = json_object
-
-            # Set Referrer header
-            s.headers.update(
-                {
-                    "referer": "https://iweb.itouchvision.com/portal/f?p=customer:BIN_DAYS:::NO:RP:UID:6CDD2A34C912312074D8E2410531401A8C00EFF7"
-                }
-            )
-
-            # Generate POST including all the JSON we just built
-            s.post(
-                "https://iweb.itouchvision.com/portal/wwv_flow.accept", data=other_list
-            )
-
-            # The second page on the portal would normally allow you to select your property from a dropdown list of
-            # those that are at the postcode entered on the previous page
-            # The required cookies are stored within the session so re-use the session to keep them
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/itouchvision/r/customer/bin_days"
-            )
-
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-
-            # The page contains a number of values that must be passed into subsequent requests - extract them here
-            payload = {
-                i["name"]: i.get("value", "") for i in soup.select("input[name]")
-            }
-            payload2 = {
-                i["data-for"]: i.get("value", "")
-                for i in soup.select("input[data-for]")
-            }
-            
-            # Check if required form elements exist
-            salt_element = soup.select_one('input[id="pSalt"]')
-            protected_element = soup.select_one('input[id="pPageItemsProtected"]')
-            
-            if not salt_element or not protected_element:
-                raise Exception("Required form elements not found. The council website may have changed or be unavailable.")
-            
-            payload_salt = salt_element.get("value")
-            payload_protected = protected_element.get("value")
-
-            # Add the UPRN and 'SUBMIT' to the payload
-            payload["p_request"] = "SUBMIT"
-            payload["P153_UPRN"] = user_uprn
-
-            # Manipulate the lists and build the JSON that must be submitted in further requests - some data is nested
-            merged_list = {**payload, **payload2}
-            new_list = []
-            other_list = {}
-            for key in merged_list.keys():
-                temp_list = {}
-                val = merged_list[key]
-                if key in ["P153_UPRN", "P153_TEMP", "P153_SYSDATE", "P0_LANGUAGE"]:
-                    temp_list = {"n": key, "v": val}
-                    new_list.append(temp_list)
-                elif key in ["P153_ZABY"]:
-                    temp_list = {"n": key, "v": "1", "ck": val}
-                    new_list.append(temp_list)
-                elif key in ["P153_POST_CODE"]:
-                    temp_list = {"n": key, "v": user_postcode, "ck": val}
-                    new_list.append(temp_list)
-                elif key in [
-                    "p_flow_id",
-                    "p_flow_step_id",
-                    "p_instance",
-                    "p_page_submission_id",
-                    "p_request",
-                    "p_reload_on_submit",
-                ]:
-                    other_list[key] = val
-                else:
-                    temp_list = {"n": key, "v": "", "ck": val}
-                    new_list.append(temp_list)
-
-            json_builder = {
-                "pageItems": {
-                    "itemsToSubmit": new_list,
-                    "protected": payload_protected,
-                    "rowVersion": "",
-                    "formRegionChecksums": [],
-                },
-                "salt": payload_salt,
-            }
-
-            json_object = json.dumps(json_builder, separators=(",", ":"))
-            other_list["p_json"] = json_object
-
-            # Generate POST including all the JSON we just built
-            s.post(
-                "https://iweb.itouchvision.com/portal/wwv_flow.accept", data=other_list
-            )
-
-            # The third and final page on the portal shows the detail of the waste collection services
-            # The required cookies are stored within the session so re-use the session to keep them
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/itouchvision/r/customer/bin_days"
-            )
-
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-=======
         driver = None
         try:
->>>>>>> master
             data = {"bins": []}
             url = kwargs.get("url")
             user_paon = kwargs.get("paon")

uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py

@@ -18,197 +18,8 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-<<<<<<< HEAD
-        user_postcode = kwargs.get("postcode")
-        check_postcode(user_postcode)
-        user_uprn = kwargs.get("uprn")
-        check_uprn(user_uprn)
-
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/87.0.4280.141 Safari/537.36"
-        }
-
-        requests.packages.urllib3.disable_warnings()
-        with requests.Session() as s:
-            # Set Headers
-            s.headers = headers
-
-            # Get the first page - This is the Search for property by Post Code page
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/f?p=customer:BIN_DAYS:::NO:RP:UID:625C791B4D9301137723E9095361401AE8C03934"
-            )
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-
-            # The page contains a number of values that must be passed into subsequent requests - extract them here
-            payload = {
-                i["name"]: i.get("value", "") for i in soup.select("input[name]")
-            }
-            payload2 = {
-                i["data-for"]: i.get("value", "")
-                for i in soup.select("input[data-for]")
-            }
-            
-            # Check if required form elements exist
-            salt_element = soup.select_one('input[id="pSalt"]')
-            protected_element = soup.select_one('input[id="pPageItemsProtected"]')
-            
-            if not salt_element or not protected_element:
-                raise Exception("Required form elements not found. The council website may have changed or be unavailable.")
-            
-            payload_salt = salt_element.get("value")
-            payload_protected = protected_element.get("value")
-
-            # Add the PostCode and 'SEARCH' to the payload
-            payload["p_request"] = "SEARCH"
-            payload["P153_POST_CODE"] = user_postcode
-
-            # Manipulate the lists and build the JSON that must be submitted in further requests - some data is nested
-            merged_list = {**payload, **payload2}
-            new_list = []
-            other_list = {}
-            for key in merged_list.keys():
-                temp_list = {}
-                val = merged_list[key]
-                if key in [
-                    "P153_UPRN",
-                    "P153_TEMP",
-                    "P153_SYSDATE",
-                    "P0_LANGUAGE",
-                    "P153_POST_CODE",
-                ]:
-                    temp_list = {"n": key, "v": val}
-                    new_list.append(temp_list)
-                elif key in [
-                    "p_flow_id",
-                    "p_flow_step_id",
-                    "p_instance",
-                    "p_page_submission_id",
-                    "p_request",
-                    "p_reload_on_submit",
-                ]:
-                    other_list[key] = val
-                else:
-                    temp_list = {"n": key, "v": "", "ck": val}
-                    new_list.append(temp_list)
-
-            json_builder = {
-                "pageItems": {
-                    "itemsToSubmit": new_list,
-                    "protected": payload_protected,
-                    "rowVersion": "",
-                    "formRegionChecksums": [],
-                },
-                "salt": payload_salt,
-            }
-            json_object = json.dumps(json_builder, separators=(",", ":"))
-            other_list["p_json"] = json_object
-
-            # Set Referrer header
-            s.headers.update(
-                {
-                    "referer": "https://iweb.itouchvision.com/portal/f?p=customer:BIN_DAYS:::NO:RP:UID:625C791B4D9301137723E9095361401AE8C03934"
-                }
-            )
-
-            # Generate POST including all the JSON we just built
-            s.post(
-                "https://iweb.itouchvision.com/portal/wwv_flow.accept", data=other_list
-            )
-
-            # The second page on the portal would normally allow you to select your property from a dropdown list of
-            # those that are at the postcode entered on the previous page
-            # The required cookies are stored within the session so re-use the session to keep them
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/itouchvision/r/customer/bin_days"
-            )
-
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-
-            # The page contains a number of values that must be passed into subsequent requests - extract them here
-            payload = {
-                i["name"]: i.get("value", "") for i in soup.select("input[name]")
-            }
-            payload2 = {
-                i["data-for"]: i.get("value", "")
-                for i in soup.select("input[data-for]")
-            }
-            
-            # Check if required form elements exist
-            salt_element = soup.select_one('input[id="pSalt"]')
-            protected_element = soup.select_one('input[id="pPageItemsProtected"]')
-            
-            if not salt_element or not protected_element:
-                raise Exception("Required form elements not found. The council website may have changed or be unavailable.")
-            
-            payload_salt = salt_element.get("value")
-            payload_protected = protected_element.get("value")
-
-            # Add the UPRN and 'SUBMIT' to the payload
-            payload["p_request"] = "SUBMIT"
-            payload["P153_UPRN"] = user_uprn
-
-            # Manipulate the lists and build the JSON that must be submitted in further requests - some data is nested
-            merged_list = {**payload, **payload2}
-            new_list = []
-            other_list = {}
-            for key in merged_list.keys():
-                temp_list = {}
-                val = merged_list[key]
-                if key in ["P153_UPRN", "P153_TEMP", "P153_SYSDATE", "P0_LANGUAGE"]:
-                    temp_list = {"n": key, "v": val}
-                    new_list.append(temp_list)
-                elif key in ["P153_ZABY"]:
-                    temp_list = {"n": key, "v": "1", "ck": val}
-                    new_list.append(temp_list)
-                elif key in ["P153_POST_CODE"]:
-                    temp_list = {"n": key, "v": user_postcode, "ck": val}
-                    new_list.append(temp_list)
-                elif key in [
-                    "p_flow_id",
-                    "p_flow_step_id",
-                    "p_instance",
-                    "p_page_submission_id",
-                    "p_request",
-                    "p_reload_on_submit",
-                ]:
-                    other_list[key] = val
-                else:
-                    temp_list = {"n": key, "v": "", "ck": val}
-                    new_list.append(temp_list)
-
-            json_builder = {
-                "pageItems": {
-                    "itemsToSubmit": new_list,
-                    "protected": payload_protected,
-                    "rowVersion": "",
-                    "formRegionChecksums": [],
-                },
-                "salt": payload_salt,
-            }
-
-            json_object = json.dumps(json_builder, separators=(",", ":"))
-            other_list["p_json"] = json_object
-
-            # Generate POST including all the JSON we just built
-            s.post(
-                "https://iweb.itouchvision.com/portal/wwv_flow.accept", data=other_list
-            )
-
-            # The third and final page on the portal shows the detail of the waste collection services
-            # The required cookies are stored within the session so re-use the session to keep them
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/itouchvision/r/customer/bin_days"
-            )
-
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-=======
         driver = None
         try:
->>>>>>> master
             data = {"bins": []}
             url = kwargs.get("url")
             user_paon = kwargs.get("paon")

uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py

@@ -18,197 +18,8 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-<<<<<<< HEAD
-        user_postcode = kwargs.get("postcode")
-        check_postcode(user_postcode)
-        user_uprn = kwargs.get("uprn")
-        check_uprn(user_uprn)
-
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/87.0.4280.141 Safari/537.36"
-        }
-
-        requests.packages.urllib3.disable_warnings()
-        with requests.Session() as s:
-            # Set Headers
-            s.headers = headers
-
-            # Get the first page - This is the Search for property by Post Code page
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/f?p=customer:BIN_DAYS:::NO:RP:UID:13353F039C4B1454827EE05536414091A8C058F4"
-            )
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-
-            # The page contains a number of values that must be passed into subsequent requests - extract them here
-            payload = {
-                i["name"]: i.get("value", "") for i in soup.select("input[name]")
-            }
-            payload2 = {
-                i["data-for"]: i.get("value", "")
-                for i in soup.select("input[data-for]")
-            }
-            
-            # Check if required form elements exist
-            salt_element = soup.select_one('input[id="pSalt"]')
-            protected_element = soup.select_one('input[id="pPageItemsProtected"]')
-            
-            if not salt_element or not protected_element:
-                raise Exception("Required form elements not found. The council website may have changed or be unavailable.")
-            
-            payload_salt = salt_element.get("value")
-            payload_protected = protected_element.get("value")
-
-            # Add the PostCode and 'SEARCH' to the payload
-            payload["p_request"] = "SEARCH"
-            payload["P153_POST_CODE"] = user_postcode
-
-            # Manipulate the lists and build the JSON that must be submitted in further requests - some data is nested
-            merged_list = {**payload, **payload2}
-            new_list = []
-            other_list = {}
-            for key in merged_list.keys():
-                temp_list = {}
-                val = merged_list[key]
-                if key in [
-                    "P153_UPRN",
-                    "P153_TEMP",
-                    "P153_SYSDATE",
-                    "P0_LANGUAGE",
-                    "P153_POST_CODE",
-                ]:
-                    temp_list = {"n": key, "v": val}
-                    new_list.append(temp_list)
-                elif key in [
-                    "p_flow_id",
-                    "p_flow_step_id",
-                    "p_instance",
-                    "p_page_submission_id",
-                    "p_request",
-                    "p_reload_on_submit",
-                ]:
-                    other_list[key] = val
-                else:
-                    temp_list = {"n": key, "v": "", "ck": val}
-                    new_list.append(temp_list)
-
-            json_builder = {
-                "pageItems": {
-                    "itemsToSubmit": new_list,
-                    "protected": payload_protected,
-                    "rowVersion": "",
-                    "formRegionChecksums": [],
-                },
-                "salt": payload_salt,
-            }
-            json_object = json.dumps(json_builder, separators=(",", ":"))
-            other_list["p_json"] = json_object
-
-            # Set Referrer header
-            s.headers.update(
-                {
-                    "referer": "https://iweb.itouchvision.com/portal/f?p=customer:BIN_DAYS:::NO:RP:UID:13353F039C4B1454827EE05536414091A8C058F4"
-                }
-            )
-
-            # Generate POST including all the JSON we just built
-            s.post(
-                "https://iweb.itouchvision.com/portal/wwv_flow.accept", data=other_list
-            )
-
-            # The second page on the portal would normally allow you to select your property from a dropdown list of
-            # those that are at the postcode entered on the previous page
-            # The required cookies are stored within the session so re-use the session to keep them
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/itouchvision/r/customer/bin_days"
-            )
-
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-
-            # The page contains a number of values that must be passed into subsequent requests - extract them here
-            payload = {
-                i["name"]: i.get("value", "") for i in soup.select("input[name]")
-            }
-            payload2 = {
-                i["data-for"]: i.get("value", "")
-                for i in soup.select("input[data-for]")
-            }
-            
-            # Check if required form elements exist
-            salt_element = soup.select_one('input[id="pSalt"]')
-            protected_element = soup.select_one('input[id="pPageItemsProtected"]')
-            
-            if not salt_element or not protected_element:
-                raise Exception("Required form elements not found. The council website may have changed or be unavailable.")
-            
-            payload_salt = salt_element.get("value")
-            payload_protected = protected_element.get("value")
-
-            # Add the UPRN and 'SUBMIT' to the payload
-            payload["p_request"] = "SUBMIT"
-            payload["P153_UPRN"] = user_uprn
-
-            # Manipulate the lists and build the JSON that must be submitted in further requests - some data is nested
-            merged_list = {**payload, **payload2}
-            new_list = []
-            other_list = {}
-            for key in merged_list.keys():
-                temp_list = {}
-                val = merged_list[key]
-                if key in ["P153_UPRN", "P153_TEMP", "P153_SYSDATE", "P0_LANGUAGE"]:
-                    temp_list = {"n": key, "v": val}
-                    new_list.append(temp_list)
-                elif key in ["P153_ZABY"]:
-                    temp_list = {"n": key, "v": "1", "ck": val}
-                    new_list.append(temp_list)
-                elif key in ["P153_POST_CODE"]:
-                    temp_list = {"n": key, "v": user_postcode, "ck": val}
-                    new_list.append(temp_list)
-                elif key in [
-                    "p_flow_id",
-                    "p_flow_step_id",
-                    "p_instance",
-                    "p_page_submission_id",
-                    "p_request",
-                    "p_reload_on_submit",
-                ]:
-                    other_list[key] = val
-                else:
-                    temp_list = {"n": key, "v": "", "ck": val}
-                    new_list.append(temp_list)
-
-            json_builder = {
-                "pageItems": {
-                    "itemsToSubmit": new_list,
-                    "protected": payload_protected,
-                    "rowVersion": "",
-                    "formRegionChecksums": [],
-                },
-                "salt": payload_salt,
-            }
-
-            json_object = json.dumps(json_builder, separators=(",", ":"))
-            other_list["p_json"] = json_object
-
-            # Generate POST including all the JSON we just built
-            s.post(
-                "https://iweb.itouchvision.com/portal/wwv_flow.accept", data=other_list
-            )
-
-            # The third and final page on the portal shows the detail of the waste collection services
-            # The required cookies are stored within the session so re-use the session to keep them
-            resource = s.get(
-                "https://iweb.itouchvision.com/portal/itouchvision/r/customer/bin_days"
-            )
-
-            # Create a BeautifulSoup object from the page's HTML
-            soup = BeautifulSoup(resource.text, "html.parser")
-=======
         driver = None
         try:
->>>>>>> master
             data = {"bins": []}
             url = kwargs.get("url")
             user_paon = kwargs.get("paon")
@@ -266,9 +77,11 @@ class CouncilClass(AbstractGetBinDataClass):
             for collection in collections:
                 bin_type = collection.find("h3").get_text()
 
-                next_collection = soup.find("div", {"class": "fw-bold"}).get_text()
+                next_collection = collection.find(
+                    "div", {"class": "fw-bold"}
+                ).get_text()
 
-                following_collection = soup.find(
+                following_collection = collection.find(
                     lambda t: (
                         t.name == "div"
                         and t.get_text(strip=True).lower().startswith("followed by")

{uk_bin_collection-0.159.3.dist-info → uk_bin_collection-0.160.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.159.3
+Version: 0.160.1
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.159.3.dist-info → uk_bin_collection-0.160.1.dist-info}/RECORD

@@ -209,7 +209,7 @@ uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py,sha256=lAleY
 uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py,sha256=eJMX10CG9QO7FRhHSmUDL-jO_44qoK3_1ztNTAXhkbw,2085
 uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py,sha256=feuQnAG80xVojQlUBLh8wjVPVU6yLZ6sQKKjfHBKIl8,2514
 uk_bin_collection/uk_bin_collection/councils/NewhamCouncil.py,sha256=zlkKm28E6zIRknAbyLeSd5LNeRctqlZ-2MIrAsdaqHg,2260
-uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py,sha256=nWWoE_cI6TM7d_JlYO4mwnToOzBVy_JzfxWwWGBbgGc,13137
+uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py,sha256=5Cg8MdxHLM9STKsSfCbRdHhbK9oToRsm1SlwyJcUCi8,5164
 uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py,sha256=o8zv40Wt19d51mrN5lsgLMCKMokMPmI1cMHBNT5yAho,1976
 uk_bin_collection/uk_bin_collection/councils/NorthDevonCountyCouncil.py,sha256=tgJKIvu7nnCAHu_HImfG5SQABD6ygKFqrZU-ZoC6ObY,6260
 uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py,sha256=BfNpYcjG3z0Yz8OYN6NkfzvZ5k1FI-80D-rv211kPPU,5449
@@ -261,7 +261,7 @@ uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py,sha256=9g9A
 uk_bin_collection/uk_bin_collection/councils/ShropshireCouncil.py,sha256=6OIEhJmv-zLJiEo8WaJePA7JuhNRGkh2WohFLhzN8Kk,1477
 uk_bin_collection/uk_bin_collection/councils/SloughBoroughCouncil.py,sha256=ADa-8bcTnD39Lof6FdRp_WAHQSYmHgXN3uz0uqKnW64,6367
 uk_bin_collection/uk_bin_collection/councils/SolihullCouncil.py,sha256=gbTHjbdV46evGfLfF8rxVMQIgNZD-XPHgZeuyje7kGY,1609
-uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py,sha256=dJkrO4w2b-4bm8BhWkreTenSD_t91Cqxbx1S-Jm9V48,13033
+uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py,sha256=ae-rTJL43l54glGkjjH8xciJWmyeBb_u6ZV9Smz7Egw,5060
 uk_bin_collection/uk_bin_collection/councils/SouthAyrshireCouncil.py,sha256=03eapeXwxneKI4ccKPSHoviIbhmV1m90I-0WQ_s3KsY,2722
 uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py,sha256=xGSMcikxjS4UzqKs0X50LJKmn09C-XAAs98SPhNZgkQ,2308
 uk_bin_collection/uk_bin_collection/councils/SouthDerbyshireDistrictCouncil.py,sha256=irqelQSENPsZLlNtYtpt-Z7GwKUyvhp94kKKVIIDjQg,2087
@@ -299,7 +299,7 @@ uk_bin_collection/uk_bin_collection/councils/TandridgeDistrictCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/TeignbridgeCouncil.py,sha256=-NowMNcxsnktzUxTk-XUfzFJgXKSSerCmdZ7cN4cE1s,2703
 uk_bin_collection/uk_bin_collection/councils/TelfordAndWrekinCouncil.py,sha256=p1ZS5R4EGxbEWlRBrkGXgKwE_lkyBT-R60yKFFhVObc,1844
 uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py,sha256=1_CkpWPTfRUEP5YJ9R4_dJRLtb-O9i83hfWJc1shw_c,4283
-uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=GQ_MaPpTd8DqDL4DpyaMjYGxqHm8Wi6qqTO9nCk7370,13117
+uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=c6aTRvA9kmgNadJUvUb3R1bA6EkQ7fQ3twUienAv_jY,5194
 uk_bin_collection/uk_bin_collection/councils/TewkesburyBoroughCouncil.py,sha256=cSULCQBddk4tfaJZHv7mrNwM4sZkOYJpmlQXlvrZvPk,1396
 uk_bin_collection/uk_bin_collection/councils/ThanetDistrictCouncil.py,sha256=Cxrf0tUryDL-wFclPH5yovVt8i7Sc7g-ZFrU9_wg6KY,2717
 uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha256=RHt3e9oeKzwxjjY-M8aC0nk-ZXhHIoyC81JzxkPVxsE,5531
@@ -350,8 +350,8 @@ uk_bin_collection/uk_bin_collection/councils/tests/test_south_kesteven_district_
 uk_bin_collection/uk_bin_collection/councils/tests/test_south_kesteven_integration.py,sha256=ax_kevIIB1BpDTVjEnoiZnDk0srkc1Vw7B2i5XLLqiE,6647
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=Qb76X46V0UMZJwO8zMNPvnVY7jNa-bmTlrirDi1tuJA,4553
-uk_bin_collection-0.159.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.159.3.dist-info/METADATA,sha256=rpPRS0cSxYKCH_0ApiU5RhyR-sZS_XKeqimNW3FEEyM,26815
-uk_bin_collection-0.159.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.159.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.159.3.dist-info/RECORD,,
+uk_bin_collection-0.160.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.160.1.dist-info/METADATA,sha256=BrA1hO7vKk1aIW8SBBbSX8GxyMXK5hE30pXo42V5Ny8,26815
+uk_bin_collection-0.160.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.160.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.160.1.dist-info/RECORD,,