uk_bin_collection 0.138.0__tar.gz → 0.139.0__tar.gz

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/PKG-INFO

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

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.138.0"
+version = "0.139.0"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/tests/input.json

@@ -386,6 +386,14 @@
         "wiki_name": "Castlepoint District Council",
         "wiki_note": "For this council, 'uprn' is actually a 4-digit code for your street. Go [here](https://apps.castlepoint.gov.uk/cpapps/index.cfm?fa=wastecalendar) and inspect the source of the dropdown box to find the 4-digit number for your street."
     },
+    "CeredigionCountyCouncil":{
+        "house_number":"BLAEN CWMMAGWR, TRISANT, CEREDIGION, SY23 4RQ",
+        "postcode":"SY23 4RQ",
+        "url":"https://www.ceredigion.gov.uk/resident/bins-recycling/",
+        "web_driver":"http://selenium:4444",
+        "wiki_name":"Ceredigion County Council",
+        "wiki_note":"House Number is the full address as it appears on the drop-down on the site when you search by postcode. This parser requires a Selenium webdriver."
+    },
     "CharnwoodBoroughCouncil": {
         "url": "https://my.charnwood.gov.uk/location?put=cbc10070067259&rememberme=0&redirect=%2F",
         "wiki_command_url_override": "https://my.charnwood.gov.uk/location?put=cbcXXXXXXXX&rememberme=0&redirect=%2F",
@@ -1327,6 +1335,16 @@
         "wiki_name": "North Ayrshire Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
+    "NorthDevonCountyCouncil":{
+        "house_number": "1",
+        "uprn": "100040249471",
+        "postcode": "EX31 2LE",
+        "skip_get_url": true,
+        "url": "https://my.northdevon.gov.uk/service/WasteRecyclingCollectionCalendar",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "North Devon County Council",
+        "wiki_note": "Pass the house number and postcode in their respective parameters. This parser requires a Selenium webdriver."
+    },
     "NorthEastDerbyshireDistrictCouncil": {
         "postcode": "S42 5RB",
         "skip_get_url": true,
@@ -1715,6 +1733,16 @@
         "wiki_name": "South Hams District Council",
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "SouthHollandDistrictCouncil": {
+        "house_number": "1",
+        "postcode": "PE6 0HE",
+        "uprn": "100030872493",
+        "skip_get_url": true,
+        "url": "https://www.sholland.gov.uk/mycollections",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "South Holland District Council",
+        "wiki_note": "Pass the UPRN and postcode in their respective parameters. This parser requires a Selenium webdriver."
+    },
     "SouthKestevenDistrictCouncil": {
         "house_number": "2 Althorpe Close, Market Deeping, PE6 8BL",
         "postcode": "PE68BL",

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.py

@@ -5,6 +5,7 @@ import requests
 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):
     """
@@ -12,7 +13,7 @@ class CouncilClass(AbstractGetBinDataClass):
     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")

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py

@@ -4,6 +4,7 @@ from bs4 import BeautifulSoup
 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):
     """

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/ArdsAndNorthDownCouncil.py

@@ -6,6 +6,7 @@ from bs4 import BeautifulSoup
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete classes have to implement all abstract operations of the

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py

@@ -36,6 +36,7 @@ def parse_bin_text(bin_type_str: str, bin_date_str: str) -> List[Dict[str, str]]
 
     return bins
 
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete classes have to implement all abstract operations of the

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py

@@ -43,7 +43,7 @@ class CouncilClass(AbstractGetBinDataClass):
         rows = table.find_all("tr")
 
         current_year = datetime.now().year
-        current_month = datetime.now().month 
+        current_month = datetime.now().month
 
         # Process each row into a list of dictionaries
         for row in rows[1:]:  # Skip the header row
@@ -56,13 +56,17 @@ class CouncilClass(AbstractGetBinDataClass):
             # Safely try to parse collection date
             if collection_date_text:
                 try:
-                    collection_date = datetime.strptime(collection_date_text, "%a %d %b")
+                    collection_date = datetime.strptime(
+                        collection_date_text, "%a %d %b"
+                    )
                     if collection_date.month == 1 and current_month != 1:
                         collection_date = collection_date.replace(year=current_year + 1)
                     else:
                         collection_date = collection_date.replace(year=current_year)
 
-                    formatted_collection_date = collection_date.strftime("%d/%m/%Y")  # Use your desired date format
+                    formatted_collection_date = collection_date.strftime(
+                        "%d/%m/%Y"
+                    )  # Use your desired date format
                     dict_data = {
                         "type": service,
                         "collectionDate": formatted_collection_date,

uk_bin_collection-0.139.0/uk_bin_collection/uk_bin_collection/councils/CeredigionCountyCouncil.py

@@ -0,0 +1,157 @@
+from time import sleep
+
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select, 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:
+            house_number = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_paon(house_number)
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get("https://www.ceredigion.gov.uk/resident/bins-recycling/")
+
+            try:
+                accept_cookies = WebDriverWait(driver, timeout=10).until(
+                    EC.element_to_be_clickable(
+                        (By.XPATH, "//button[@id='ccc-reject-settings']")
+                    )
+                )
+                accept_cookies.click()
+            except:
+                print(
+                    "Accept cookies banner not found or clickable within the specified time."
+                )
+                pass
+
+            # Wait for postcode entry box
+            postcode_search = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//a[contains(text(), 'Postcode Search')]")
+                )
+            )
+            driver.execute_script("arguments[0].scrollIntoView(true);", postcode_search)
+
+            sleep(2)  # Wait for the element to be in view
+
+            postcode_search.click()
+
+            postcode_entry_box = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//input[@data-ebv-desc='Postcode']")
+                )
+            )
+
+            # Enter postcode
+            postcode_entry_box.send_keys(user_postcode)
+
+            postcode_button = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//input[@value='Find Address']")
+                )
+            )
+
+            postcode_button.click()
+
+            address_dropdown = Select(
+                WebDriverWait(driver, 10).until(
+                    EC.presence_of_element_located(
+                        (By.XPATH, "//select[@data-ebv-desc='Select Address']")
+                    )
+                )
+            )
+
+            address_dropdown.select_by_visible_text(house_number)
+
+            address_next_button = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.XPATH, "//input[@value='Next']"))
+            )
+
+            address_next_button.click()
+
+            result = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//form[contains(., 'Next collection:')]")
+                )
+            )
+
+            # Make a BS4 object
+            soup = BeautifulSoup(
+                result.get_attribute("innerHTML"), features="html.parser"
+            )
+
+            data = {"bins": []}
+
+            # Find all panels containing collection info
+            collection_panels = soup.find_all("div", class_="eb-OL2RoeVH-panel")
+
+            for panel in collection_panels:
+                try:
+                    # Extract the 'Next collection' date string
+                    next_text = panel.find_all("span")[-1].text.strip()
+                    match = re.search(
+                        r"Next collection:\s*(\w+day)\s+(\d{1,2})(?:st|nd|rd|th)?\s+(\w+)",
+                        next_text,
+                    )
+                    if not match:
+                        continue
+
+                    _, day, month = match.groups()
+                    year = (
+                        datetime.now().year
+                    )  # You could enhance this to calculate the correct year if needed
+                    full_date = f"{day} {month} {year}"
+
+                    collection_date = datetime.strptime(full_date, "%d %B %Y").strftime(
+                        date_format
+                    )
+
+                    # Now get all bin types in the sibling image blocks
+                    bin_image_blocks = panel.find_next_siblings(
+                        "div", class_="waste_image"
+                    )
+                    for block in bin_image_blocks:
+                        label = block.find("span")
+                        if label:
+                            bin_type = label.text.strip()
+                            dict_data = {
+                                "type": bin_type,
+                                "collectionDate": collection_date,
+                            }
+                            data["bins"].append(dict_data)
+                except Exception as e:
+                    print(f"Skipping one panel due to: {e}")
+
+            data["bins"].sort(
+                key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+            )
+        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.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -36,21 +36,29 @@ class CouncilClass(AbstractGetBinDataClass):
         s = requests.session()
 
         # Ask for a new SessionId from the server
-        session_id_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/"\
-            "RequestSession?userName=guest+CBC&password=&"\
+        session_id_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/"
+            "RequestSession?userName=guest+CBC&password=&"
             "script=%5CAurora%5CCBC+Waste+Streets.AuroraScript%24"
+        )
         session_id_response = s.get(session_id_url)
         session_id_response.raise_for_status()
         session_id = session_id_response.json().get("Session").get("SessionId")
 
         # Ask what tasks we can do within the session
-        tasks_url = f"https://maps.cheltenham.gov.uk/map/Aurora.svc/"\
+        tasks_url = (
+            f"https://maps.cheltenham.gov.uk/map/Aurora.svc/"
             f"GetWorkflow?sessionId={session_id}&workflowId=wastestreet"
+        )
         tasks_response = s.get(tasks_url)
         tasks_response.raise_for_status()
         # JSON response contained a BOM marker
         tasks = json.loads(tasks_response.text[1:])
-        retrieve_results_task_id, initialise_map_task_id, drilldown_task_id = None, None, None
+        retrieve_results_task_id, initialise_map_task_id, drilldown_task_id = (
+            None,
+            None,
+            None,
+        )
         # Pull out the ID's of the tasks we will need
         for task in tasks.get("Tasks"):
             if task.get("$type") == "StatMap.Aurora.FetchResultSetTask, StatMapService":
@@ -59,64 +67,86 @@ class CouncilClass(AbstractGetBinDataClass):
                 initialise_map_task_id = task.get("Id")
             elif task.get("$type") == "StatMap.Aurora.DrillDownTask, StatMapService":
                 drilldown_task_id = task.get("Id")
-        if not all([retrieve_results_task_id, initialise_map_task_id, drilldown_task_id]):
+        if not all(
+            [retrieve_results_task_id, initialise_map_task_id, drilldown_task_id]
+        ):
             raise ValueError("Not all task ID's found")
 
         # Find the X / Y coordinates for the requested postcode
-        postcode_search_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"\
+        postcode_search_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"
             f"sessionId={session_id}&address={postcode}&limit=1000"
+        )
         postcode_search_response = s.get(postcode_search_url)
         postcode_search_response.raise_for_status()
         if len(locations_list := postcode_search_response.json().get("Locations")) == 0:
             raise ValueError("Address locations empty")
         for location in locations_list:
-            location_search_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"\
+            location_search_url = (
+                "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"
                 f"sessionId={session_id}&locationId={location.get('Id')}"
+            )
             location_search_response = s.get(location_search_url)
             location_search_response.raise_for_status()
             if not (location_list := location_search_response.json().get("Locations")):
                 raise KeyError("Locations wasn't present in results")
             if not (location_detail := location_list[0].get("Details")):
                 raise KeyError("Details wasn't present in location")
-            location_uprn = [detail.get(
-                "Value") for detail in location_detail if detail.get("Name") == "UPRN"][0]
+            location_uprn = [
+                detail.get("Value")
+                for detail in location_detail
+                if detail.get("Name") == "UPRN"
+            ][0]
             if str(location_uprn) == uprn:
-                location_usrn = str([detail.get(
-                    "Value") for detail in location_detail if detail.get("Name") == "USRN"][0])
+                location_usrn = str(
+                    [
+                        detail.get("Value")
+                        for detail in location_detail
+                        if detail.get("Name") == "USRN"
+                    ][0]
+                )
                 location_x = location_list[0].get("X")
                 location_y = location_list[0].get("Y")
                 break
 
         # Needed to initialise the server to allow follow on call
-        open_map_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/OpenScriptMap?"\
+        open_map_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/OpenScriptMap?"
             f"sessionId={session_id}"
+        )
         if res := s.get(open_map_url):
             res.raise_for_status()
 
         # Needed to initialise the server to allow follow on call
-        save_state_map_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"\
-            f"sessionId={session_id}&taskId={initialise_map_task_id}&job="\
-            "%7BTask%3A+%7B+%24type%3A+%27StatMap.Aurora.SaveStateTask%2C"\
+        save_state_map_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"
+            f"sessionId={session_id}&taskId={initialise_map_task_id}&job="
+            "%7BTask%3A+%7B+%24type%3A+%27StatMap.Aurora.SaveStateTask%2C"
             "+StatMapService%27+%7D%7D"
+        )
         if res := s.get(save_state_map_url):
             res.raise_for_status()
 
         # Start search for address given by x / y coord
-        drilldown_map_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"\
-            f"sessionId={session_id}&taskId={drilldown_task_id}&job=%7B%22"\
-            f"QueryX%22%3A{location_x}%2C%22QueryY%22%3A{location_y}%2C%22"\
-            "Task%22%3A%7B%22Type%22%3A%22StatMap.Aurora.DrillDownTask%2C"\
+        drilldown_map_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"
+            f"sessionId={session_id}&taskId={drilldown_task_id}&job=%7B%22"
+            f"QueryX%22%3A{location_x}%2C%22QueryY%22%3A{location_y}%2C%22"
+            "Task%22%3A%7B%22Type%22%3A%22StatMap.Aurora.DrillDownTask%2C"
             "+StatMapService%22%7D%7D"
+        )
         if res := s.get(drilldown_map_url):
             res.raise_for_status()
 
         # Get results from search for address given by x / y coord
-        address_details_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"\
-            f"sessionId={session_id}&taskId={retrieve_results_task_id}"\
-            f"&job=%7B%22QueryX%22%3A{location_x}%2C%22QueryY%22%3A"\
-            f"{location_y}%2C%22Task%22%3A%7B%22Type%22%3A%22"\
-            "StatMap.Aurora.FetchResultSetTask%2C+StatMapService"\
+        address_details_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"
+            f"sessionId={session_id}&taskId={retrieve_results_task_id}"
+            f"&job=%7B%22QueryX%22%3A{location_x}%2C%22QueryY%22%3A"
+            f"{location_y}%2C%22Task%22%3A%7B%22Type%22%3A%22"
+            "StatMap.Aurora.FetchResultSetTask%2C+StatMapService"
             "%22%2C%22ResultSetName%22%3A%22inspection%22%7D%7D"
+        )
         address_details_response = s.get(address_details_url)
         address_details_response.raise_for_status()
         # JSON response contained a BOM marker, skip first character
@@ -150,7 +180,9 @@ class CouncilClass(AbstractGetBinDataClass):
         # After we've got the correct result, pull out the week number each bin type is taken on
         if (refuse_week_raw := result_dict.get("New_Refuse_Week".upper())) is not None:
             refuse_week = int(refuse_week_raw)
-        if (recycling_week_raw := result_dict.get("New_Recycling_Week".upper())) is not None:
+        if (
+            recycling_week_raw := result_dict.get("New_Recycling_Week".upper())
+        ) is not None:
             recycling_week = int(recycling_week_raw)
         if (garden_week_raw := result_dict.get("Garden_Bin_Week".upper())) is not None:
             garden_week = int(garden_week_raw)
@@ -169,13 +201,17 @@ class CouncilClass(AbstractGetBinDataClass):
         ]
 
         refuse_day_offset = days_of_week.index(
-            str(result_dict.get("New_Refuse_Day_internal".upper())).upper())
+            str(result_dict.get("New_Refuse_Day_internal".upper())).upper()
+        )
         recycling_day_offset = days_of_week.index(
-            str(result_dict.get("New_Recycling_Day".upper())).upper())
+            str(result_dict.get("New_Recycling_Day".upper())).upper()
+        )
         garden_day_offset = days_of_week.index(
-            str(result_dict.get("New_Garden_Day".upper())).upper())
+            str(result_dict.get("New_Garden_Day".upper())).upper()
+        )
         food_day_offset = days_of_week.index(
-            str(result_dict.get("New_Food_Day".upper())).upper())
+            str(result_dict.get("New_Food_Day".upper())).upper()
+        )
 
         # Initialise WEEK-1/WEEK-2 based on known details
         week_1_epoch = datetime(2025, 1, 13)
@@ -186,27 +222,20 @@ class CouncilClass(AbstractGetBinDataClass):
         # If there's an even number of weeks between the week-1
         # epoch and this week, then this week is of type week-1
         if (((this_week - week_1_epoch).days // 7)) % 2 == 0:
-            week = {
-                1: this_week,
-                2: this_week + timedelta(days=7)
-            }
+            week = {1: this_week, 2: this_week + timedelta(days=7)}
         else:
-            week = {
-                1: this_week - timedelta(days=7),
-                2: this_week
-            }
+            week = {1: this_week - timedelta(days=7), 2: this_week}
 
-        refuse_dates: list[str] = get_dates_every_x_days(
-            week[refuse_week], 14, 28)
+        refuse_dates: list[str] = get_dates_every_x_days(week[refuse_week], 14, 28)
         recycling_dates: list[str] = get_dates_every_x_days(
-            week[recycling_week], 14, 28)
-        garden_dates: list[str] = get_dates_every_x_days(
-            week[garden_week], 14, 28)
+            week[recycling_week], 14, 28
+        )
+        garden_dates: list[str] = get_dates_every_x_days(week[garden_week], 14, 28)
 
         for refuse_date in refuse_dates:
             collection_date = (
-                datetime.strptime(refuse_date, "%d/%m/%Y") +
-                timedelta(days=refuse_day_offset)
+                datetime.strptime(refuse_date, "%d/%m/%Y")
+                + timedelta(days=refuse_day_offset)
             ).strftime("%d/%m/%Y")
 
             dict_data = {
@@ -218,8 +247,8 @@ class CouncilClass(AbstractGetBinDataClass):
         for recycling_date in recycling_dates:
 
             collection_date = (
-                datetime.strptime(recycling_date, "%d/%m/%Y") +
-                timedelta(days=recycling_day_offset)
+                datetime.strptime(recycling_date, "%d/%m/%Y")
+                + timedelta(days=recycling_day_offset)
             ).strftime("%d/%m/%Y")
 
             dict_data = {
@@ -231,8 +260,8 @@ class CouncilClass(AbstractGetBinDataClass):
         for garden_date in garden_dates:
 
             collection_date = (
-                datetime.strptime(garden_date, "%d/%m/%Y") +
-                timedelta(days=garden_day_offset)
+                datetime.strptime(garden_date, "%d/%m/%Y")
+                + timedelta(days=garden_day_offset)
             ).strftime("%d/%m/%Y")
 
             dict_data = {
@@ -241,15 +270,18 @@ class CouncilClass(AbstractGetBinDataClass):
             }
             bindata["bins"].append(dict_data)
 
-        if ((food_waste_week := str(result_dict.get("FOOD_WASTE_WEEK_EXTERNAL", "")).upper())
-                == "weekly".upper()):
+        if (
+            food_waste_week := str(
+                result_dict.get("FOOD_WASTE_WEEK_EXTERNAL", "")
+            ).upper()
+        ) == "weekly".upper():
             food_dates: list[str] = get_dates_every_x_days(week[1], 7, 56)
 
             for food_date in food_dates:
 
                 collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y") +
-                    timedelta(days=food_day_offset)
+                    datetime.strptime(food_date, "%d/%m/%Y")
+                    + timedelta(days=food_day_offset)
                 ).strftime("%d/%m/%Y")
 
                 dict_data = {
@@ -266,21 +298,24 @@ class CouncilClass(AbstractGetBinDataClass):
             first_week = int(first_week.strip())
 
             second_week_day, _, second_week_number = second_week_detail.partition(
-                "WEEK")
+                "WEEK"
+            )
             second_week_number = int(second_week_number.strip())
             second_week_day: str = second_week_day.strip()[:3]
 
             food_dates_first: list[str] = get_dates_every_x_days(
-                week[first_week], 14, 28)
+                week[first_week], 14, 28
+            )
             food_dates_second: list[str] = get_dates_every_x_days(
-                week[second_week_number], 14, 28)
+                week[second_week_number], 14, 28
+            )
             second_week_offset = days_of_week.index(second_week_day)
 
             for food_date in food_dates_first:
 
                 collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y") +
-                    timedelta(days=food_day_offset)
+                    datetime.strptime(food_date, "%d/%m/%Y")
+                    + timedelta(days=food_day_offset)
                 ).strftime("%d/%m/%Y")
 
                 dict_data = {
@@ -291,8 +326,8 @@ class CouncilClass(AbstractGetBinDataClass):
             for food_date in food_dates_second:
 
                 collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y") +
-                    timedelta(days=second_week_offset)
+                    datetime.strptime(food_date, "%d/%m/%Y")
+                    + timedelta(days=second_week_offset)
                 ).strftime("%d/%m/%Y")
 
                 dict_data = {
@@ -302,7 +337,6 @@ class CouncilClass(AbstractGetBinDataClass):
                 bindata["bins"].append(dict_data)
 
         bindata["bins"].sort(
-            key=lambda x: datetime.strptime(
-                x.get("collectionDate", ""), "%d/%m/%Y")
+            key=lambda x: datetime.strptime(x.get("collectionDate", ""), "%d/%m/%Y")
         )
         return bindata

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py

@@ -6,6 +6,7 @@ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataC
 This module provides bin collection data for Cheshire East Council.
 """
 
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     A class to fetch and parse bin collection data for Cheshire East Council.

{uk_bin_collection-0.138.0 → uk_bin_collection-0.139.0}/uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py

@@ -20,7 +20,10 @@ class CouncilClass(AbstractGetBinDataClass):
         curr_date = datetime.today()
 
         soup = BeautifulSoup(page.content, features="html.parser")
-        button = soup.find("a", text="Find out which bin will be collected when and sign up for a free email reminder.")
+        button = soup.find(
+            "a",
+            text="Find out which bin will be collected when and sign up for a free email reminder.",
+        )
 
         if button["href"]:
             URI = button["href"]