uk_bin_collection 0.92.0__py3-none-any.whl → 0.94.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -42,7 +42,13 @@
         "wiki_name": "Barnsley Metropolitan Borough Council",
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-    "BasingstokeCouncil": {
+"BasildonCouncil": {
+        "skip_get_url": true,
+        "uprn": "10013350430",
+        "url": "https://basildonportal.azurewebsites.net/api/getPropertyRefuseInformation",
+        "wiki_name": "Basildon Council"
+    },
+        "BasingstokeCouncil": {
         "skip_get_url": true,
         "uprn": "100060220926",
         "url": "https://www.basingstoke.gov.uk/bincollection",
@@ -109,6 +115,7 @@
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search). Previously required single field that was UPRN and full address, now requires UPRN and postcode as separate fields."
     },
     "BracknellForestCouncil": {
+        "house_number": "57",
         "paon": "57",
         "postcode": "GU47 9BS",
         "skip_get_url": true,
@@ -155,10 +162,10 @@
         "wiki_name": "Broxtowe Borough Council"
     },
     "BuckinghamshireCouncil": {
-        "house_number": "HUGHENDEN MANOR, MANOR ROAD, HUGHENDEN VALLEY, HIGH WYCOMBE",
-        "postcode": "HP14 4LA",
+        "house_number": "2",
+        "postcode": "HP13 7BA",
         "skip_get_url": true,
-        "url": "https://chiltern.gov.uk/collection-dates",
+        "url": "https://iapp.itouchvision.com/iappcollectionday/collection-day/?uuid=FA353FC74600CBE61BE409534D00A8EC09BDA3AC&lang=en",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Buckinghamshire Council (Chiltern, South Bucks, Wycombe)",
         "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes"
@@ -286,6 +293,14 @@
         "url": "https://service.croydon.gov.uk/wasteservices/w/webpage/bin-day-enter-address",
         "wiki_name": "Croydon Council"
     },
+    "DacorumBoroughCouncil": {
+        "house_number": "13",
+        "postcode": "HP3 9JY",
+        "skip_get_url": true,
+        "web_driver": "http://selenium:4444",
+        "url": "https://webapps.dacorum.gov.uk/bincollections/",
+        "wiki_name": "Dacorum Borough Council"
+    },
     "DartfordBoroughCouncil": {
         "uprn": "010094157511",
         "url": "https://windmz.dartford.gov.uk/ufs/WS_CHECK_COLLECTIONS.eb?UPRN=010094157511",
@@ -337,8 +352,8 @@
         "wiki_name": "East Cambridgeshire Council"
     },
     "EastDevonDC": {
-        "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=010090909915",
-        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-and-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
+        "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=010090909915",
+        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
         "wiki_name": "East Devon District Council",
         "wiki_note": "Replace XXXXXXXX with UPRN."
     },
@@ -589,6 +604,12 @@
         "url": "https://www.hounslow.gov.uk/homepage/86/recycling_and_waste_collection_day_finder",
         "wiki_name": "London Borough Hounslow"
     },
+    "LondonBoroughLambeth": {
+        "skip_get_url": true,
+        "uprn": "100021881738",
+        "url": "https://wasteservice.lambeth.gov.uk/WhitespaceComms/GetServicesByUprn",
+        "wiki_name": "London Borough Lambeth"
+    },
     "LondonBoroughRedbridge": {
         "postcode": "IG2 6LQ",
         "uprn": "10023770353",
@@ -659,9 +680,9 @@
         "wiki_note": "UPRN can only be parsed with a valid postcode."
     },
     "NeathPortTalbotCouncil": {
+        "house_number": "2",
         "postcode": "SA13 3BA",
         "skip_get_url": true,
-        "uprn": "10023947752",
         "url": "https://www.npt.gov.uk",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Neath Port Talbot Council"
@@ -1229,6 +1250,16 @@
         "url": "https://ilambassadorformsprod.azurewebsites.net/wastecollectiondays/index",
         "wiki_name": "Wiltshire Council"
     },
+    "WinchesterCityCouncil": {
+        "house_number": "12",
+        "paon": "12",
+        "postcode": "SO23 7GA",
+        "skip_get_url": false,
+        "url": "https://iportal.itouchvision.com/icollectionday/collection-day",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Winchester City Council",
+        "wiki_note": "Pass the house name/number in the house number parameter, wrapped in double quotes"
+    },
     "WindsorAndMaidenheadCouncil": {
         "web_driver": "http://selenium:4444",
         "uprn": "100080371082",
@@ -1244,6 +1275,13 @@
         "wiki_name": "Woking Borough Council/Joint Waste Solutions",
         "wiki_note": "Works with all collection areas that use Joint Waste Solutions. Just use the correct URL."
     },
+    "WokinghamBoroughCouncil": {
+        "house_number": "90",
+        "postcode": "RG40 2HR",
+        "skip_get_url": true,
+        "url": "https://www.wokingham.gov.uk/rubbish-and-recycling/waste-collection/find-your-bin-collection-day",
+        "wiki_name": "Wokingham Borough Council"
+    },
     "WychavonDistrictCouncil": {
         "postcode": "WR3 7RU",
         "skip_get_url": true,

uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py

@@ -0,0 +1,81 @@
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        url_base = "https://basildonportal.azurewebsites.net/api/getPropertyRefuseInformation"
+
+        uprn = kwargs.get("uprn")
+        # Check the UPRN is valid
+        check_uprn(uprn)
+
+        payload = {
+            # Add your payload details here (replace this with the actual payload structure if required)
+            "uprn": uprn
+        }
+
+        # Headers for the request
+        headers = {
+            "Content-Type": "application/json"
+        }
+
+        response = requests.post(url_base, data=json.dumps(payload), headers=headers)
+
+        # Ensure the request was successful
+        if response.status_code == 200:
+            data = response.json()
+
+            # Initialize an empty list to store the bin collection details
+
+            bins = []
+
+            # Function to add collection details to bins list
+            def add_collection(service_name, collection_data):
+                bins.append({
+                    "type": service_name,
+                    "collectionDate": collection_data.get("current_collection_date")
+                })
+
+            # Extract refuse information
+            available_services = data["refuse"]["available_services"]
+
+            for service_name, service_data in available_services.items():
+                # Append the service name and current collection date to the "bins" list
+                match service_data["container"]:
+                    case "Green Wheelie Bin":
+                        subscription_status = service_data["subscription"]["active"] if service_data["subscription"] else False
+                        type_descr = f"Green Wheelie Bin ({"Active" if subscription_status else "Expired"})"
+                    case "N/A":
+                        type_descr = service_data["name"]
+                    case _:
+                        type_descr = service_data["container"]
+
+
+                date_str = service_data.get("current_collection_date")
+                # Parse the date string into a datetime object
+                date_obj = datetime.strptime(date_str, "%Y-%m-%d")
+
+                # Convert the datetime object to the desired format
+                formatted_date = date_obj.strftime(date_format)
+
+                bins.append({
+                    "type": type_descr,  # Use service name from the data
+                    "collectionDate": formatted_date
+                })
+
+        else:
+            print(f"Failed to fetch data. Status code: {response.status_code}")
+
+        data = {
+            "bins": bins
+        }
+
+        return data

uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py

@@ -1,11 +1,9 @@
-import time
-import pandas as pd
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support.ui import Select
-from io import StringIO
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
 
-from uk_bin_collection.uk_bin_collection.common import create_webdriver
+from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
@@ -16,76 +14,95 @@ class CouncilClass(AbstractGetBinDataClass):
     implementation.
     """
 
-    def get_data(self, df: pd.DataFrame) -> dict:
-        # Create dictionary of data to be returned
-        data = {"bins": []}
-
-        # Output collection data into dictionary
-        for i, row in df.iterrows():
-            dict_data = {
-                "type": row["Collection Name"],
-                "collectionDate": row["Next Collection Due"],
-            }
-
-            data["bins"].append(dict_data)
-
-        return data
-
     def parse_data(self, page: str, **kwargs) -> dict:
         driver = None
         try:
-            page = "https://chiltern.gov.uk/collection-dates"
-
-            # Assign user info
-            user_postcode = kwargs.get("postcode")
+            data = {"bins": []}
             user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
             web_driver = kwargs.get("web_driver")
             headless = kwargs.get("headless")
+            check_paon(user_paon)
+            check_postcode(user_postcode)
 
             # Create Selenium webdriver
             driver = create_webdriver(web_driver, headless, None, __name__)
-            driver.get(page)
+            driver.get(
+                "https://iapp.itouchvision.com/iappcollectionday/collection-day/?uuid=FA353FC74600CBE61BE409534D00A8EC09BDA3AC&lang=en"
+            )
 
-            # Enter postcode in text box and wait
-            inputElement_pc = driver.find_element(
-                By.ID,
-                "COPYOFECHOCOLLECTIONDATES_ADDRESSSELECTION_ADDRESSSELECTIONPOSTCODE",
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "postcodeSearch"))
             )
-            inputElement_pc.send_keys(user_postcode)
-            inputElement_pc.send_keys(Keys.ENTER)
+            inputElement_postcode.send_keys(user_postcode)
 
-            time.sleep(4)
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, '//button[@class="govuk-button mt-4"]')
+                )
+            )
+            findAddress.click()
+
+            # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        "//select[@id='addressSelect']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
 
-            # Select address from dropdown and wait
-            inputElement_ad = Select(
-                driver.find_element(
-                    By.ID,
-                    "COPYOFECHOCOLLECTIONDATES_ADDRESSSELECTION_ADDRESSSELECTIONADDRESS",
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        '//div[@class="ant-row d-flex justify-content-between mb-4 mt-2 css-2rgkd4"]',
+                    )
                 )
             )
 
-            inputElement_ad.select_by_visible_text(user_paon)
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
 
-            time.sleep(4)
+            recyclingcalendar = soup.find(
+                "div",
+                {
+                    "class": "ant-row d-flex justify-content-between mb-4 mt-2 css-2rgkd4"
+                },
+            )
 
-            # Submit address information and wait
-            driver.find_element(
-                By.ID, "COPYOFECHOCOLLECTIONDATES_ADDRESSSELECTION_NAV1_NEXT"
-            ).click()
+            rows = recyclingcalendar.find_all(
+                "div",
+                {
+                    "class": "ant-col ant-col-xs-12 ant-col-sm-12 ant-col-md-12 ant-col-lg-12 ant-col-xl-12 css-2rgkd4"
+                },
+            )
 
-            time.sleep(4)
+            current_year = datetime.now().year
+            current_month = datetime.now().month
 
-            # Read next collection information into Pandas
-            table = driver.find_element(
-                By.ID, "COPYOFECHOCOLLECTIONDATES_PAGE1_DATES2"
-            ).get_attribute("outerHTML")
+            for row in rows:
+                BinType = row.find("h3").text
+                collectiondate = datetime.strptime(
+                    row.find("div", {"class": "text-white fw-bold"}).text,
+                    "%A %d %B",
+                )
+                if (current_month > 10) and (collectiondate.month < 3):
+                    collectiondate = collectiondate.replace(year=(current_year + 1))
+                else:
+                    collectiondate = collectiondate.replace(year=current_year)
 
-            # Wrap the HTML table in a StringIO object to address the warning
-            table_io = StringIO(table)
-            df = pd.read_html(table_io, header=[1])[0]
+                dict_data = {
+                    "type": BinType,
+                    "collectionDate": collectiondate.strftime("%d/%m/%Y"),
+                }
+                data["bins"].append(dict_data)
 
-            # Parse data into dict
-            data = self.get_data(df)
         except Exception as e:
             # Here you can log the exception if needed
             print(f"An error occurred: {e}")

uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py

@@ -0,0 +1,102 @@
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_paon(user_paon)
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get("https://webapps.dacorum.gov.uk/bincollections/")
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "txtBxPCode"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "btnFindAddr"))
+            )
+            findAddress.click()
+
+            # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        "//select[@id='lstBxAddrList']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
+
+            # Click search button
+            findDates = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "MainContent_btnGetSchedules"))
+            )
+            findDates.click()
+
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "lblSelectedAddr"))
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            soup.prettify()
+
+            # Get collections div
+            BinCollectionSchedule = soup.find("div", {"id": "MainContent_updPnl"})
+
+            NextCollections = BinCollectionSchedule.find_all(
+                "div", {"style": " margin:5px;"}
+            )
+
+            for Collection in NextCollections:
+                BinType = Collection.find("strong").text.strip()
+                if BinType:
+                    CollectionDate = datetime.strptime(
+                        Collection.find_all("div", {"style": "display:table-cell;"})[1]
+                        .get_text()
+                        .strip(),
+                        "%a, %d %b %Y",
+                    )
+                    dict_data = {
+                        "type": BinType,
+                        "collectionDate": CollectionDate.strftime("%d/%m/%Y"),
+                    }
+                    data["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
+        return data

uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py

@@ -0,0 +1,54 @@
+import requests
+from requests.structures import CaseInsensitiveDict
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        data = {"bins": []}
+
+        url = "https://wasteservice.lambeth.gov.uk/WhitespaceComms/GetServicesByUprn"
+
+        headers = CaseInsensitiveDict()
+        headers["Content-Type"] = "application/json"
+
+        body = {"uprn": user_uprn, "includeEventTypes": False, "includeFlags": True}
+        json_data = json.dumps(body)
+
+        res = requests.post(url, headers=headers, data=json_data)
+
+        if res.status_code != 200:
+            raise ConnectionRefusedError("Cannot connect to API!")
+
+        json_data = res.json()
+
+        if "SiteServices" in json_data:
+            SiteServices = json_data["SiteServices"]
+            for service in SiteServices:
+                if "NextCollectionDate" in service:
+                    NextCollectionDate = service["NextCollectionDate"]
+                    if NextCollectionDate:
+                        Container = service["Container"]
+                        if Container:
+                            Bin_Type = Container["DisplayPhrase"]
+                            dict_data = {
+                                "type": Bin_Type,
+                                "collectionDate": datetime.strptime(
+                                    NextCollectionDate, "%d/%m/%Y"
+                                ).strftime(date_format),
+                            }
+                            data["bins"].append(dict_data)
+
+        return data

uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py

@@ -22,16 +22,16 @@ class CouncilClass(AbstractGetBinDataClass):
         driver = None
         try:
             data = {"bins": []}
-            user_uprn = kwargs.get("uprn")
+            user_paon = kwargs.get("paon")
             user_postcode = kwargs.get("postcode")
             web_driver = kwargs.get("web_driver")
             headless = kwargs.get("headless")
-            check_uprn(user_uprn)
+            check_paon(user_paon)
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
             driver = create_webdriver(web_driver, headless, None, __name__)
-            driver.get("https://www.npt.gov.uk/2195")
+            driver.get("https://beta.npt.gov.uk/bins-and-recycling/bin-day-finder/")
 
             # Accept cookies banner
             cookieAccept = WebDriverWait(driver, 10).until(
@@ -40,9 +40,13 @@ class CouncilClass(AbstractGetBinDataClass):
             cookieAccept.click()
 
             # Populate postcode field
-            inputElement_postcode = driver.find_element(
-                By.ID,
-                "ContentPlaceHolderDefault_ctl13_nptLLPG2_25_addresslookup_txtTmpPostcode",
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (
+                        By.ID,
+                        "PostCode",
+                    )
+                )
             )
             inputElement_postcode.send_keys(user_postcode)
 
@@ -50,67 +54,69 @@ class CouncilClass(AbstractGetBinDataClass):
             findAddress = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
                     (
-                        By.ID,
-                        "ContentPlaceHolderDefault_ctl13_nptLLPG2_25_addresslookup_btnFindAddress",
+                        By.XPATH,
+                        "//button[@value='Find address']",
                     )
                 )
             )
             findAddress.click()
 
-            time.sleep(1)
-
             # Wait for the 'Select address' dropdown to appear and select option matching UPRN
             dropdown = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
                     (
                         By.ID,
-                        "ContentPlaceHolderDefault_ctl13_nptLLPG2_25_addresslookup_ddlAddressLookup",
+                        "Address",
                     )
                 )
             )
-            # Create a 'Select' for it, then select the matching URPN option
-            dropdownSelect = Select(dropdown)
-            dropdownSelect.select_by_value(user_uprn)
-
-            # Remove back to top button if exists
-            driver.execute_script(
-                """
-            if (document.contains(document.querySelector(".backtotop"))) {
-                document.querySelector(".backtotop").remove();
-            }
-            """
-            )
+            # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        "//select[@ID='Address']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
 
             # Wait for the submit button to appear, then click it to get the collection dates
             submit = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "ContentPlaceHolderDefault_ctl13_nptLLPG2_25_btnDisplay")
+                    (
+                        By.XPATH,
+                        "//input[@value='Find bin day']",
+                    )
                 )
             )
             submit.click()
 
             soup = BeautifulSoup(driver.page_source, features="html.parser")
 
-            # Get the property details
-            property_details = soup.find(
+            soup = soup.find(
                 "div",
-                {
-                    "id": "ContentPlaceHolderDefault_ctl13_nptLLPG2_25_divPropertyDetails"
-                },
+                {"id": "contentInner"},
             )
 
             # Get the dates
-            for date in property_details.find_all("h2"):
+            for date in soup.find_all("h2"):
                 if date.get_text(strip=True) != "Bank Holidays":
                     bin_date = datetime.strptime(
-                        date.get_text(strip=True).replace("&nbsp", " ")
+                        date.get_text(strip=True)
+                        .removesuffix("(Today)")
+                        .replace("&nbsp", " ")
                         + " "
                         + datetime.now().strftime("%Y"),
                         "%A, %d %B %Y",
                     )
                     bin_types_wrapper = date.find_next_sibling("div")
                     for bin_type_wrapper in bin_types_wrapper.find_all(
-                        "div", {"class": "card"}
+                        "div",
+                        {
+                            "class": "card-body ps-5 ps-md-4 ps-lg-5 position-relative bg-white"
+                        },
                     ):
                         if bin_date and bin_type_wrapper:
                             bin_type = bin_type_wrapper.find("a").get_text(strip=True)

uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py

@@ -36,7 +36,8 @@ class CouncilClass(AbstractGetBinDataClass):
                     collection_date = datetime.strptime(
                         remove_ordinal_indicator_from_date_string(
                             week_text[0].split(" - ")[0]
-                        ),
+                        )
+                        .strip(),
                         "%A %d %B",
                     )
                     next_collection = collection_date.replace(year=datetime.now().year)

uk_bin_collection/uk_bin_collection/councils/WinchesterCityCouncil.py

@@ -0,0 +1,114 @@
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_paon(user_paon)
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get("http://www.winchester.gov.uk/bin-calendar")
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "postcodeSearch"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, '//button[@class="govuk-button mt-4"]')
+                )
+            )
+            findAddress.click()
+
+            # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        "//select[@id='addressSelect']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
+
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        '//div[@class="ant-row d-flex justify-content-between mb-4 mt-2 css-2rgkd4"]',
+                    )
+                )
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            recyclingcalendar = soup.find(
+                "div",
+                {
+                    "class": "ant-row d-flex justify-content-between mb-4 mt-2 css-2rgkd4"
+                },
+            )
+
+            rows = recyclingcalendar.find_all(
+                "div",
+                {
+                    "class": "ant-col ant-col-xs-12 ant-col-sm-12 ant-col-md-12 ant-col-lg-12 ant-col-xl-12 css-2rgkd4"
+                },
+            )
+
+            current_year = datetime.now().year
+            current_month = datetime.now().month
+
+            for row in rows:
+                BinType = row.find("h3").text
+                collectiondate = datetime.strptime(
+                    row.find("div", {"class": "text-white fw-bold"}).text,
+                    "%A %d %B",
+                )
+                if (current_month > 10) and (collectiondate.month < 3):
+                    collectiondate = collectiondate.replace(year=(current_year + 1))
+                else:
+                    collectiondate = collectiondate.replace(year=current_year)
+
+                dict_data = {
+                    "type": BinType,
+                    "collectionDate": collectiondate.strftime("%d/%m/%Y"),
+                }
+                data["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
+        return data

uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py

@@ -0,0 +1,99 @@
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            source_date_format = "%d/%m/%Y"
+            timeout = 10
+            user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+
+            check_paon(user_paon)
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(
+                "https://www.wokingham.gov.uk/rubbish-and-recycling/waste-collection/find-your-bin-collection-day"
+            )
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, timeout).until(
+                EC.presence_of_element_located((By.ID, "edit-postcode-search-csv"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Simulates hitting the "Enter" key to submit
+            inputElement_postcode.send_keys(Keys.RETURN)
+
+            # Select the exact address from the drop down box
+            WebDriverWait(driver, timeout).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        ""
+                        "//*[@id='edit-address-options-csv']//option[starts-with(normalize-space(.), '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
+            
+            # Wait for the Show collection dates button to appear, then click it to get the collection dates
+            inputElement_show_dates_button = WebDriverWait(driver, timeout).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, '//*[@id="edit-show-collection-dates-csv"]')
+                )
+            )
+            inputElement_show_dates_button.send_keys(Keys.RETURN)
+
+            # Wait for the collection dates elements to load
+            collection_date_cards = WebDriverWait(driver, timeout).until(
+                EC.presence_of_all_elements_located(
+                    (By.XPATH, '//div[@class = "card__content"]')
+                )
+            )
+
+            for collection_date_card in collection_date_cards:
+                waste_type = collection_date_card.find_element(
+                    By.XPATH, './/h3[@class = "heading heading--sub heading--tiny"]'
+                )
+                collection_date = collection_date_card.find_element(
+                    By.XPATH, './/span[@class = "card__date"]'
+                )
+                dt_collection_date = datetime.strptime(
+                    collection_date.text.split(" ")[1], source_date_format
+                )
+                dict_data = {
+                    "type": waste_type.text,
+                    "collectionDate": dt_collection_date.strftime(date_format),
+                }
+                data["bins"].append(dict_data)
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
+        return data

{uk_bin_collection-0.92.0.dist-info → uk_bin_collection-0.94.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.92.0
+Version: 0.94.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -53,6 +53,21 @@ Most scripts make use of [Beautiful Soup 4](https://pypi.org/project/beautifulso
 
 ---
 
+## Requesting your council
+> :warning: Please check that a request for your council has not already been made. You can do this by searching on the [Issues](https://github.com/robbrad/UKBinCollectionData/issues) page.
+
+If an issue already exists, please comment on that issue to express your interest. Please do not open a new issue, as it will be closed as a duplicate.
+
+If an issue does not already exist, please fill in a new [Council Request](https://github.com/robbrad/UKBinCollectionData/issues/new/choose) form, including as much information as possible, including:
+- Name of the council
+- URL to bin collections
+- An example postcode and/or UPRN (whichever is relevant)
+- Any further information
+
+Please be aware that this project is run by volunteer contributors and completion depends on numerous factors - even with a request, we cannot guarantee if/when your council will get added.
+
+---
+
 ## Home Assistant Usage
 
 ### Install with HACS (recommended)
@@ -255,17 +270,6 @@ docker pull selenium/standalone-chrome docker run -d -p 4444:4444 --name seleniu
 
 ---
 
-## Requesting your council
-To make a request for your council, first check the [Issues](https://github.com/robbrad/UKBinCollectionData/issues) page to make sure it has not already been requested. If not, please fill in a new [Council Request](https://github.com/robbrad/UKBinCollectionData/issues/new/choose) form, including as much information as possible, including:
-- Name of the council
-- URL to bin collections
-- An example postcode and/or UPRN (whichever is relevant)
-- Any further information
-
-Please be aware that this project is run by volunteer contributors and completion depends on numerous factors - even with a request, we cannot guarantee if/when your council will get a script.
-
----
-
 ## Reports
 
 - [3.11](https://robbrad.github.io/UKBinCollectionData/3.11/)
@@ -371,3 +375,4 @@ Contributions are always welcome! See ```CONTRIBUTING.md``` to get started. Plea
   <img src="https://contrib.rocks/image?repo=robbrad/UKBinCollectionData"  alt="Image of contributors"/>
 </a>
 
+

{uk_bin_collection-0.92.0.dist-info → uk_bin_collection-0.94.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=Q3l16fwk4hmvIG6tY6SgP2aZCn-_ghBbMnGjuZCtS_c,61684
+uk_bin_collection/tests/input.json,sha256=vimuJzI_t8_nzD9v1BC2vj3WbLLFpGtPhT10GjlBrAY,63198
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -18,6 +18,7 @@ uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=Louq
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
 uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=n6lNsO_ognmaxq_wIz91Dxt5XjBVQe60X5p6w1_mO1A,8174
 uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=MgF_7XyIcIoNzFR0OJsjBkLCZKgWxBrV6nTcutMxO1Q,4244
+uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=SBvAa0GZM3V7ygK8ARawbHAPH6R_303U30RH8WYPi5Q,3020
 uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py,sha256=VPWGljnH4C3q8qs5ZmCtqjNjgWQvviALzjk00q3EZeQ,2632
 uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py,sha256=N_TPiIv8VBzN3rY0p3JtLlxSEru-6k1wW4UNIhN5X1M,3709
 uk_bin_collection/uk_bin_collection/councils/BedfordBoroughCouncil.py,sha256=CvGB7w9HMn7XyEtwfd9MWZE_HlZ75pDcaKMsQJz0xhk,1669
@@ -33,7 +34,7 @@ uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py,sha256=kJmmDJz_kQ45DHmG7ocrUpNJonEn0kuXYEDQyZaf9ks,5576
 uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py,sha256=_bAFykZWZkEVUB-QKeVLfWO8plG6nRgn71QF2BUN2rk,4329
 uk_bin_collection/uk_bin_collection/councils/BroxtoweBoroughCouncil.py,sha256=-Facq-ToQkcWUePpKBwq90LZUFxgUSydNL2sYaLX4yw,4473
-uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py,sha256=-EAj7-CCb1kWEglITePOsSCUknJRU9hnuS5sysCf19w,3319
+uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py,sha256=_ELVUM5VLp1nwDxRpvpsp6n8SzLJvp_UyMp-i_MXYuo,4383
 uk_bin_collection/uk_bin_collection/councils/BuryCouncil.py,sha256=H7wAxO1nfxkewVoRRolumq8bBJG04siE3jieFH3RGpQ,2632
 uk_bin_collection/uk_bin_collection/councils/CalderdaleCouncil.py,sha256=OJZcHYlvZDzmBpjjPPm3J8CRK9Twc49vRj7O9c5fyQ4,4971
 uk_bin_collection/uk_bin_collection/councils/CannockChaseDistrictCouncil.py,sha256=ZamevXN8_Q8mRZOTESWtkb8jVyDXkTczcmhXMAVVSkM,2276
@@ -50,6 +51,7 @@ uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py,sha256=el75qv
 uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py,sha256=W7_wWHLbE0cyE90GkNaZHmR7Lbd2Aq48A1hKMUNO-vg,2806
 uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=_BEKZAjlS5Ad5DjyxqAEFSLn8F-KYox0zmn4BXaAD6A,2367
 uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=QJH27plySbbmoNcLNUXq-hUiFmZ5zBlRS5mzOJgWSK8,11594
+uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py,sha256=Tm_6pvBPj-6qStbe6-02LXaoCOlnnDvVXAAocGVvf_E,3970
 uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py,sha256=SPirUUoweMwX5Txtsr0ocdcFtKxCQ9LhzTTJN20tM4w,1550
 uk_bin_collection/uk_bin_collection/councils/DerbyshireDalesDistrictCouncil.py,sha256=MQC1-jXezXczrxTcvPQvkpGgyyAbzSKlX38WsmftHak,4007
 uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py,sha256=b7pxoToXu6dBBYXsXmlwfPXE8BjHxt0hjCOBNlNgvX8,3118
@@ -92,6 +94,7 @@ uk_bin_collection/uk_bin_collection/councils/LeedsCityCouncil.py,sha256=iSZApZ9o
 uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py,sha256=vSOzdEwp9ZeUhed7E3eVv9ReD-2XgbSkpyAbVnfc-Gk,3309
 uk_bin_collection/uk_bin_collection/councils/LiverpoolCityCouncil.py,sha256=n17OqZrCGrPrnxGUfHc-RGkb4oJ9Bx6uUWiLdzxfQlY,2587
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py,sha256=UOeiOxGMvVMm2UFaqjmQpm7vxzqJNSSN8LM9lAUjs2c,3021
+uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py,sha256=r9D5lHe5kIRStCd5lRIax16yhb4KTFzzfYEFv1bacWw,2009
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py,sha256=A_6Sis5hsF53Th04KeadHRasGbpAm6aoaWJ6X8eC4Y8,6604
 uk_bin_collection/uk_bin_collection/councils/MaldonDistrictCouncil.py,sha256=PMVt2XFggttPmbWyrBrHJ-W6R_6-0ux1BkY1kj1IKzg,1997
 uk_bin_collection/uk_bin_collection/councils/MalvernHillsDC.py,sha256=iQG0EkX2npBicvsGKQRYyBGSBvKVUbKvUvvwrC9xV1A,2100
@@ -102,7 +105,7 @@ uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,s
 uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=AZgC9wmDLEjUOtIFvf0ehF5LHturXTH4DkE3ioPSVBA,6254
 uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=3olsWa77L34vz-c7NgeGK9xmNuR4Ws_oAk5D4UpIkPw,2005
 uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=54-autRRGAM4pBxlqmUE6g825rmUF-gRqrcgHL_lkIk,3994
-uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=2DJ0gK385CWTdJzWyDdmNBTTrwX6F5YbIXg7di2oXDQ,5506
+uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=V9URKAv3dA_deYmStL2Nmn4GbVCM-tU2qnKobivmGew,5583
 uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py,sha256=ylTn9KmWITtaO9_Z8kJCN2w2ALfhrfGt3SeJ78lgw7M,5391
 uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py,sha256=lAleYfCGUWCKOi7Ye_cjgfpI3pWwTcFctlYmh0hjebM,2140
 uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py,sha256=eJMX10CG9QO7FRhHSmUDL-jO_44qoK3_1ztNTAXhkbw,2085
@@ -129,7 +132,7 @@ uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py
 uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py,sha256=VlWm-w4d-UchoENe_hCTCGlfSHiMlS4wNEeMvxuNR2U,5109
 uk_bin_collection/uk_bin_collection/councils/RhonddaCynonTaffCouncil.py,sha256=wInyVG_0wRrX_dRO9qbAzPhlXDseXapj2zQhsISw8gg,3233
 uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py,sha256=UTSwSw515VehGn4xkjjRhUlzS4lDj4hgna6y-4VW3uM,2379
-uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=_J2Eb5gec2Gmv_QYzKHT6sQleDnIHsn-5qf-T6TM9X0,2613
+uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=7J83wWoFYukSnVgpV_bDLZlAbeTi94xgjMe9x_su7m8,2646
 uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=sjZ00iBdqn2kOvGsWyMpY3h-HWmfC_K6LQ2wz1X5WGg,1761
 uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py,sha256=a5ySLmFvvY56QMA7-bk6MVBxRp5tPBIBg4navH0eYas,4306
 uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py,sha256=wMtiYRirT585vtsEOIyXHugk7aEj3pvyVWBaAePdqtE,4005
@@ -184,16 +187,18 @@ uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha2
 uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=HMFWxM7VMhBuC7iubNGbZYEoCVWi--gRHDJMVdPPFOM,2633
 uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=3gqFA4-BVx_In6QOu3KUNqPN4Fkn9iMlZTeopMK9p6A,3746
 uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py,sha256=it2Oh5Kmq3lD30gAZgk2bzZPNCtJcFHyQO1NgOQtfvU,5653
+uk_bin_collection/uk_bin_collection/councils/WinchesterCityCouncil.py,sha256=W2k00N5n9-1MzjMEqsNjldsQdOJPEPMjK7OGSinZm5Y,4335
 uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=7Qhznj95ktAQjpWm5C8pbD5UcvfXm7Mwb7_DQxwjGSM,1777
 uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=37igH9g0xe4XIhRhcJ-ZJBU8MxTp5yzgpadWbdE33Yg,5205
+uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=qQOg5HjvHMTRuy3SVX8vbXhSqYBFZmN-htk_Dtoae0M,4126
 uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=YuZdzEW0CZLwusm1VQcGRIKXAab_UDFLaCnN60itt_E,5776
 uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5PgDL08A26gD9yOOsOhuexI3x2seaBF4,3511
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 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=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.92.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.92.0.dist-info/METADATA,sha256=I8N4Q2TwfwCtMksjuMddP2UDKku-BH3LrMasukfm4Z0,16642
-uk_bin_collection-0.92.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.92.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.92.0.dist-info/RECORD,,
+uk_bin_collection-0.94.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.94.0.dist-info/METADATA,sha256=E6gDNbSQbwplbWVHaTuOwLPKE3XsRLRIFQRMLCTn7QI,16843
+uk_bin_collection-0.94.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.94.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.94.0.dist-info/RECORD,,