uk_bin_collection 0.98.3__py3-none-any.whl → 0.98.5__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -132,7 +132,7 @@
     "BradfordMDC": {
         "custom_component_show_url_field": false,
         "skip_get_url": true,
-        "uprn": "100052235823",
+        "uprn": "100051146921",
         "url": "https://onlineforms.bradford.gov.uk/ufs/collectiondates.eb",
         "wiki_name": "Bradford MDC",
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search). Post code isn't parsed by this script, but you can pass it in double quotes."
@@ -680,7 +680,7 @@
     },
     "ManchesterCityCouncil": {
         "skip_get_url": true,
-        "uprn": "000077048077",
+        "uprn": "77127089",
         "url": "https://www.manchester.gov.uk/bincollections",
         "wiki_name": "Manchester City Council"
     },
@@ -691,7 +691,7 @@
         "wiki_name": "Mansfield District Council"
     },
     "MertonCouncil": {
-        "url": "https://myneighbourhood.merton.gov.uk/Wasteservices/WasteServices.aspx?ID=28298025",
+        "url": "https://myneighbourhood.merton.gov.uk/wasteservices/WasteServices.aspx?ID=25851371",
         "wiki_command_url_override": "https://myneighbourhood.merton.gov.uk/Wasteservices/WasteServices.aspx?ID=XXXXXXXX",
         "wiki_name": "Merton Council",
         "wiki_note": "Follow the instructions [here](https://myneighbourhood.merton.gov.uk/Wasteservices/WasteServicesSearch.aspx) until you get the \"Your recycling and rubbish collection days\" page then copy the URL and replace the URL in the command (the Address parameter is optional)."
@@ -1128,7 +1128,8 @@
     "SwaleBoroughCouncil": {
         "postcode": "ME12 2NQ",
         "skip_get_url": true,
-        "uprn": "100061081168",
+        "house_number": "81",
+        "web_driver": "http://selenium:4444",
         "url": "https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days",
         "wiki_name": "Swale Borough Council"
     },

uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py

@@ -74,13 +74,30 @@ class CouncilClass(AbstractGetBinDataClass):
 
             driver.get(page)
 
+            wait = WebDriverWait(driver, 10)
+            accept_cookies_button = wait.until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        "//button[contains(text(), 'Accept additional cookies')]",
+                    )
+                )
+            )
+            accept_cookies_button.click()
+
             # Wait for the element to be clickable
-            find_your_collection_button = WebDriverWait(driver, 10).until(
+            wait = WebDriverWait(driver, 10)
+            find_your_collection_button = wait.until(
                 EC.element_to_be_clickable(
-                    (By.XPATH, '//a[contains(text(), "Find your household collection day")]')
+                    (By.LINK_TEXT, "Find your household collection day")
                 )
             )
 
+            # Scroll to the element (in case something is blocking it)
+            driver.execute_script(
+                "arguments[0].scrollIntoView();", find_your_collection_button
+            )
+
             # Click the element
             find_your_collection_button.click()
 
@@ -107,12 +124,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
             postcode_input.send_keys(user_postcode)
 
-            find_address_button = WebDriverWait(driver, 10).until(
-                EC.presence_of_element_located(
-                    (By.CSS_SELECTOR, '[value="Find address"]')
-                )
+            find_address_button = WebDriverWait(driver, 30).until(
+                EC.element_to_be_clickable((By.CSS_SELECTOR, '[value="Find address"]'))
             )
-            find_address_button.click()
+            driver.execute_script("arguments[0].scrollIntoView();", find_address_button)
+            driver.execute_script("arguments[0].click();", find_address_button)
+            # find_address_button.click()
 
             time.sleep(15)
             # Wait for address box to be visible

uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py

@@ -1,5 +1,6 @@
 import requests
 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
 
@@ -92,7 +93,6 @@ class CouncilClass(AbstractGetBinDataClass):
         dict_data = {
             "type": bin_type,
             "collectionDate": bin_date,
-            "colour": bin_colour,
         }
         data["bins"].append(dict_data)
 

uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py

@@ -1,4 +1,5 @@
 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
 
@@ -18,36 +19,34 @@ class CouncilClass(AbstractGetBinDataClass):
         # Declare an empty dict for data, and pair icon source URLs with their respective bin type
         data = {"bins": []}
         bin_types = {
-            "../images/bins/cal_blue.png": "Mixed recycling",
-            "../images/bins/cal_green.png": "General waste",
-            "../images/bins/cal_grey.png": "Food waste",
-            "../images/bins/cal_brown.png": "Organic waste",
-            "../images/bins/cal_purple.png": "Glass",
-            "../images/bins/cal_ash.png": "Ash bin",
+            "../Images/Bins/blueBin.gif": "Mixed recycling",
+            "../Images/Bins/greenBin.gif": "General waste",
+            "../Images/Bins/greyBin.gif": "Food waste",
+            "../Images/Bins/brownBin.gif": "Organic waste",
+            "../Images/Bins/purpleBin.gif": "Glass",
+            "../Images/Bins/ashBin.gif": "Ash bin",
         }
 
         # Find the page body with all the calendars
-        body = soup.find("div", {"id": "printArticle"})
-        cal_year = datetime.strptime(soup.select("#Year")[0].text.strip(), "%Y").year
+        body = soup.find("div", {"id": "Application_ctl00"})
         calendars = body.find_all_next("table", {"title": "Calendar"})
-
         # For each calendar grid, get the month and all icons within it. We only take icons with alt text, as this
         # includes the bin type while excluding spacers
         for item in calendars:
-            cal_month = datetime.strptime(item.find_next("td").text.strip(), "%B").month
-            icons = item.find_all("img", alt=True)
-
+            icons = item.find_all("img")
             # For each icon, get the day box, so we can parse the correct day number and make a datetime
             for icon in icons:
-                cal_item = icon.find_parent().find_parent().find_parent().contents
-                cal_day = datetime.strptime(cal_item[1].text.strip(), "%d").day
-                bin_date = datetime(cal_year, cal_month, cal_day)
+                cal_item = icon.find_parent().find_parent()
+                bin_date = datetime.strptime(
+                    cal_item["title"],
+                    "%A, %d %B %Y",
+                )
 
                 # If the collection date is in the future, we want the date. Select the correct type, add the new
                 # datetime, then add to the list
                 if datetime.now() <= bin_date:
                     dict_data = {
-                        "type": bin_types.get(icon["src"].lower()),
+                        "type": bin_types.get(icon["src"]),
                         "collectionDate": bin_date.strftime(date_format),
                     }
                     data["bins"].append(dict_data)

uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py

@@ -80,6 +80,10 @@ class CouncilClass(AbstractGetBinDataClass):
                 )
             )
             search_btn.send_keys(Keys.ENTER)
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "collectionTabs"))
+            )
+
             soup = BeautifulSoup(driver.page_source, features="html.parser")
 
             # Find all tab panels within the collectionTabs

uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py

@@ -18,90 +18,73 @@ class CouncilClass(AbstractGetBinDataClass):
         # Get and check UPRN
         user_uprn = kwargs.get("uprn")
         check_uprn(user_uprn)
+        bindata = {"bins": []}
 
-        # Start a new session to walk through the form
-        requests.packages.urllib3.disable_warnings()
-        s = requests.Session()
-
-        # There's a cookie that makes the whole thing valid when you search for a postcode,
-        # but postcode and UPRN is a hassle imo, so this makes a request for the session to get a cookie
-        # using a Manchester City Council postcode I hardcoded in the data payload
-        postcode_request_header = {
-            "authority": "www.manchester.gov.uk",
-            "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,"
-            "image/webp,image/apng,*/*;q=0.8",
-            "accept-language": "en-GB,en;q=0.6",
-            "cache-control": "max-age=0",
-            # Requests sorts cookies= alphabetically
-            "origin": "https://www.manchester.gov.uk",
-            "referer": "https://www.manchester.gov.uk/bincollections",
-            "sec-fetch-dest": "document",
-            "sec-fetch-mode": "navigate",
-            "sec-fetch-site": "same-origin",
-            "sec-fetch-user": "?1",
-            "sec-gpc": "1",
-            "upgrade-insecure-requests": "1",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, "
-            "like Gecko) Chrome/104.0.5112.102 Safari/537.36",
+        COLLECTION_MAP = {
+            "ahtm_dates_black_bin": "Black bin",
+            "ahtm_dates_brown_commingled_bin": "Brown bin",
+            "ahtm_dates_blue_pulpable_bin": "Blue bin",
+            "ahtm_dates_green_organic_bin": "Green Bin",
         }
-        postcode_request_data = {
-            "mcc_bin_dates_search_term": "M2 5DB",
-            "mcc_bin_dates_submit": "Go",
-        }
-        response = s.post(
-            "https://www.manchester.gov.uk/bincollections",
-            headers=postcode_request_header,
-            data=postcode_request_data,
-        )
 
-        # Make a POST with the same cookie-fied session using the user's UPRN data
-        uprn_request_headers = {
-            "authority": "www.manchester.gov.uk",
-            "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
-            "accept-language": "en-GB,en;q=0.6",
-            "cache-control": "max-age=0",
-            # Requests sorts cookies= alphabetically
-            # 'cookie': 'TestCookie=Test; CookieConsent={stamp:%27D8rypjMDBJhpfMWybSMdGXP1hCZWGJYtGETiMTu1UuXTdRIKl8SU5g==%27%2Cnecessary:true%2Cpreferences:true%2Cstatistics:true%2Cmarketing:true%2Cver:6%2Cutc:1661783732090%2Cregion:%27gb%27}; PHPSESSID=kElJxYAt%2Cf-4ZWoskt0s5tn32BUQRXDYUVp3G-NsqOAOaeIcKlm2T4r7ATSgqfz6',
-            "origin": "https://www.manchester.gov.uk",
-            "referer": "https://www.manchester.gov.uk/bincollections",
-            "sec-fetch-dest": "document",
-            "sec-fetch-mode": "navigate",
-            "sec-fetch-site": "same-origin",
-            "sec-fetch-user": "?1",
-            "sec-gpc": "1",
-            "upgrade-insecure-requests": "1",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36",
+        API_URL = "https://manchester.form.uk.empro.verintcloudservices.com/api/custom?action=bin_checker-get_bin_col_info&actionedby=_KDF_custom&loadform=true&access=citizen&locale=en"
+        AUTH_URL = "https://manchester.form.uk.empro.verintcloudservices.com/api/citizen?archived=Y&preview=false&locale=en"
+        AUTH_KEY = "Authorization"
+
+        r = requests.get(AUTH_URL)
+        r.raise_for_status()
+        auth_token = r.headers[AUTH_KEY]
+
+        post_data = {
+            "name": "sr_bin_coll_day_checker",
+            "data": {
+                "uprn": user_uprn,
+                "nextCollectionFromDate": (datetime.now() - timedelta(days=1)).strftime(
+                    "%Y-%m-%d"
+                ),
+                "nextCollectionToDate": (datetime.now() + timedelta(days=30)).strftime(
+                    "%Y-%m-%d"
+                ),
+            },
+            "email": "",
+            "caseid": "",
+            "xref": "",
+            "xref1": "",
+            "xref2": "",
         }
-        uprn_request_data = {
-            "mcc_bin_dates_uprn": user_uprn,
-            "mcc_bin_dates_submit": "Go",
+
+        headers = {
+            "referer": "https://manchester.portal.uk.empro.verintcloudservices.com/",
+            "accept": "application/json",
+            "content-type": "application/json",
+            AUTH_KEY: auth_token,
         }
-        response = s.post(
-            "https://www.manchester.gov.uk/bincollections",
-            headers=uprn_request_headers,
-            data=uprn_request_data,
-        )
 
-        # Make that BS4 object and use it to prettify the response
-        soup = BeautifulSoup(response.content, features="html.parser")
-        soup.prettify()
-
-        # Get the collection items on the page and strip the bits of text that we don't care for
-        collections = []
-        for bin in soup.find_all("div", {"class": "collection"}):
-            bin_type = bin.find_next("h3").text.replace("  DUE TODAY", "").strip()
-            next_collection = bin.find_next("p").text.replace("Next collection ", "")
-            next_collection = datetime.strptime(next_collection, "%A %d %b %Y")
-            collections.append((bin_type, next_collection))
-
-        # Sort the collections by date order rather than bin type, then return as a dictionary (with str date)
-        ordered_data = sorted(collections, key=lambda x: x[1])
-        data = {"bins": []}
-        for item in ordered_data:
-            dict_data = {
-                "type": item[0],
-                "collectionDate": item[1].strftime(date_format),
-            }
-            data["bins"].append(dict_data)
-
-        return data
+        r = requests.post(API_URL, data=json.dumps(post_data), headers=headers)
+        r.raise_for_status()
+
+        result = r.json()
+        print(result["data"])
+
+        for key, value in result["data"].items():
+            if key.startswith("ahtm_dates_"):
+                print(key)
+                print(value)
+
+                dates_list = [
+                    datetime.strptime(date.strip(), "%d/%m/%Y %H:%M:%S").date()
+                    for date in value.split(";")
+                    if date.strip()
+                ]
+
+                for current_date in dates_list:
+                    dict_data = {
+                        "type": COLLECTION_MAP.get(key),
+                        "collectionDate": current_date.strftime(date_format),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+        return bindata

uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py

@@ -106,6 +106,7 @@ class CouncilClass(AbstractGetBinDataClass):
                     bin_date = datetime.strptime(
                         date.get_text(strip=True)
                         .removesuffix("(Today)")
+                        .removesuffix("(Tomorrow)")
                         .replace("&nbsp", " ")
                         + " "
                         + datetime.now().strftime("%Y"),

uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py

@@ -1,9 +1,11 @@
-import requests
 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
 
 
@@ -17,36 +19,72 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         # Get postcode and UPRN from kwargs
         user_postcode = kwargs.get("postcode")
-        user_uprn = kwargs.get("uprn")
+        user_paon = kwargs.get("paon")
+        web_driver = kwargs.get("web_driver")
+        headless = kwargs.get("headless")
         check_postcode(user_postcode)
-        check_uprn(user_uprn)
+        check_paon(user_paon)
 
         # Build URL to parse
-        council_url = f"https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days?postcode={user_postcode.replace(' ', '+')}&addresses={user_uprn}&address-submit="
+        council_url = "https://swale.gov.uk/bins-littering-and-the-environment/bins/my-collection-day"
+
+        # Create Selenium webdriver
+        driver = create_webdriver(web_driver, headless, None, __name__)
+        driver.get(council_url)
+
+        # Wait for the postcode field to appear then populate it
+        try:
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "q462406_q1"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+        except Exception:
+            print("Page failed to load. Probably due to Cloudflare robot check!")
+
+        # Click search button
+        findAddress = WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
+        )
+        driver.execute_script("arguments[0].click();", findAddress)
+
+        # 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='SBCYBDAddressList']//option[contains(., '"
+                    + user_paon
+                    + "')]",
+                )
+            )
+        ).click()
+
+        # Click search button
+        getBins = WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
+        )
+        driver.execute_script("arguments[0].click();", getBins)
+
+        BinTable = WebDriverWait(driver, 30).until(
+            EC.presence_of_element_located((By.ID, "SBC-YBD-Main"))
+        )
 
-        # Parse URL and read if connection successful
-        requests.packages.urllib3.disable_warnings()
-        response = requests.get(council_url, verify=False)
-        if response.status_code == 200:
-            soup = BeautifulSoup(response.text, features="html.parser")
-            soup.prettify()
-        else:
-            raise ConnectionAbortedError("Could not parse council website.")
+        soup = BeautifulSoup(driver.page_source, features="html.parser")
+        soup.prettify()
 
         data = {"bins": []}
 
         # Get the collection bullet points on the page and parse them
-        form_area = soup.find("form", {"class": "integration bin-lookup"})
-        collections = [
-            item.text.strip().split(",") for item in form_area.find_all("li")
-        ]
-        for c in collections:
-            bin_type = c[0].strip()
-            # temp_date = c[2].strip() + " " + str(datetime.now().year)
-            bin_date = datetime.strptime(
-                c[2].strip() + " " + str(datetime.now().year), "%d %B %Y"
-            ).strftime(date_format)
-            dict_data = {"type": bin_type, "collectionDate": bin_date}
-            data["bins"].append(dict_data)
+        nextCollections = soup.find("div", {"id": "nextCollections"})
+        for c in nextCollections:
+            collection = c.find_all("strong")
+            for bin in collection:
+                split = (bin.text).split(" on ")
+                bin_type = split[0]
+                bin_date = datetime.strptime(split[1], "%A %d %b %Y").strftime(
+                    "%d/%m/%Y"
+                )
+                dict_data = {"type": bin_type, "collectionDate": bin_date}
+                data["bins"].append(dict_data)
 
         return data

uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py

@@ -10,7 +10,6 @@ from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
-from uk_bin_collection.uk_bin_collection.common import *
 
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
@@ -91,9 +90,10 @@ class CouncilClass(AbstractGetBinDataClass):
                 if len(cols) == 2:
                     bin_types = [img["alt"] for img in cols[0].find_all("img")]
                     collection_date_str = cols[1].text
-                    collection_date = datetime.strptime(
-                        collection_date_str, "%A %dth %B"
+                    collection_date_str = remove_ordinal_indicator_from_date_string(
+                        collection_date_str
                     )
+                    collection_date = datetime.strptime(collection_date_str, "%A %d %B")
                     collection_date = collection_date.replace(
                         year=2024
                     )  # Assuming the year is 2024

uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py

@@ -1,5 +1,6 @@
 import requests
 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
 
@@ -89,11 +90,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 raise ValueError(f"Error parsing bin data: {ex}")
 
             # Build data dict for each entry
-            dict_data = {
-                "type": bin_type,
-                "collectionDate": bin_date,
-                "colour": bin_colour,
-            }
+            dict_data = {"type": bin_type, "collectionDate": bin_date}
             data["bins"].append(dict_data)
 
         data["bins"].sort(

uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py

@@ -74,30 +74,51 @@ class CouncilClass(AbstractGetBinDataClass):
             soup = BeautifulSoup(driver.page_source, features="html.parser")
             soup.prettify()
 
-            rubbish_date = datetime.strptime(
-                " ".join(
-                    soup.find("div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"})
-                    .get_text(strip=True)
-                    .split()[6:8]
-                ),
-                "%d %B",
-            ).replace(year=datetime.now().year)
-            recycling_date = datetime.strptime(
-                " ".join(
-                    soup.find("div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"})
-                    .get_text(strip=True)
-                    .split()[6:8]
-                ),
-                "%d %B",
-            ).replace(year=datetime.now().year)
-            food_date = datetime.strptime(
-                " ".join(
-                    soup.find("div", {"id": "FINDYOURBINDAYS_FOODWASTEDATE_OUTERDIV"})
-                    .get_text(strip=True)
-                    .split()[8:10]
-                ),
-                "%d %B",
-            ).replace(year=datetime.now().year)
+            rubbish_div = soup.find(
+                "div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"}
+            )
+            try:
+                rubbish_date = rubbish_div.find_all("div")[2]
+                rubbish_date = datetime.strptime(
+                    rubbish_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            except:
+                rubbish_date = rubbish_div.find_all("div")[3]
+                rubbish_date = datetime.strptime(
+                    rubbish_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            recycling_div = soup.find(
+                "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
+            )
+            try:
+                recycling_date = recycling_div.find_all("div")[2]
+                recycling_date = datetime.strptime(
+                    recycling_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            except:
+                rubbish_date = recycling_div.find_all("div")[3]
+                rubbish_date = datetime.strptime(
+                    rubbish_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            food_div = soup.find(
+                "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
+            )
+            try:
+                food_date = food_div.find_all("div")[2]
+                food_date = datetime.strptime(
+                    food_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            except:
+                food_date = food_div.find_all("div")[3]
+                food_date = datetime.strptime(
+                    food_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
 
             if datetime.now().month == 12 and rubbish_date.month == 1:
                 rubbish_date = rubbish_date + relativedelta(years=1)

uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py

@@ -65,7 +65,6 @@ class CouncilClass(AbstractGetBinDataClass):
 
                     dict_data = {
                         "type": bin_name_clean,
-                        "colour": bin_colour,
                         "collectionDate": next_collection.strftime(date_format),
                     }
 

{uk_bin_collection-0.98.3.dist-info → uk_bin_collection-0.98.5.dist-info}/METADATA

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

{uk_bin_collection-0.98.3.dist-info → uk_bin_collection-0.98.5.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=Lb2LZ6Q1LvG-yaG4KCjPIiKdLyK9IE6N_4vb7wwdExw,68074
+uk_bin_collection/tests/input.json,sha256=gkqIfeMzQQC76jc6J4DPRn1ZCp6AVdPU_7ra3gb7pyc,68114
 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
@@ -17,7 +17,7 @@ uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py,
 uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py,sha256=yfhthv9nuogP19VOZ3TYQrq51qqjiCZcSel4sXhiKjs,4012
 uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=LouqjspEMt1TkOGqWHs2zkxwOETIy3n7p64uKIlAgUg,2401
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
-uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=NccMd0830aiNRQ8SH6mc4r5Hlugfey5-PyUd24QLo4s,8478
+uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=Sd4-pbv0QZsR7soxvXYqsfdOUIqZqS6notyoZthG77s,9182
 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
@@ -30,7 +30,7 @@ uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py,sha256=now
 uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py,sha256=jHbCK8sL09vdmdP7Xnh8lIrU5AHTnJLEZfOLephPvWg,4090
 uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=r7wjrRPT2EinRMnYjGxmsCD6aMFhEOyRNd8_3R9PdQU,4117
 uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=Llo1rULaAZ8rChVYZqXFFLo7CN6vbT0ULUJD6ActouY,9015
-uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=9EDTdhbGb8BQ5PLEw9eiWZ3BrS0TtoFpYOHQU44wc2k,4308
+uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=VFrdcqKpHPw8v77Ll9QzBz_4carUfC1XYnxqUvDihkA,4275
 uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha256=k6qt4cds-Ejd97Z-__pw2BYvGVbFdc9SUfF73PPrTNA,5823
 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
@@ -78,10 +78,10 @@ uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py,sha256=sF
 uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py,sha256=xO5gqgsN9K-cQsuDoQF7ycZkjNdCPAQwIYOCFWxFJ_Y,4504
 uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=SRCgYhYs6rv_8C1UEDVORHZgXxcJkoZBjzdYS4Lu-ew,4531
 uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=IssL5CJSdcGPkJCB0q2kieUSEjfoS6nDKfeT7-9eKsQ,2183
-uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=IOgM8Wl-LpO1T-F9uU1FlVfPaEObpvsdP7S2h03Mycc,2528
+uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=i7BympEhCm7D9yR0p5_QQICtWvNcDYNJIWB19SA0g2k,2303
 uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=8Wjvmdvg5blHVrREaEnhhWZaWhYVP4v_KdDVPLIUxaU,4889
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
-uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=r8cmtWhMJg-XG63ZHxidKKW7i4yQNrZSSMSCkBwrqjI,5837
+uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_CPqi6qM2oNiHhKKF1lZC86fyKL4lPhh_DN9pJZ04,5971
 uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4wrv8Q0WlDhWh_82I0djl5tk531Pzs-SjWzg,2647
 uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py,sha256=_g3fP5Nq-OUjgNrfRf4UEyFKzq0x8QK-4enh5RP1efA,2050
 uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=oqF8M0lcT3KsrG6W6I6JJX07E6Sc_-_sr7MybfIMab8,4626
@@ -105,14 +105,14 @@ uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py,sha256=r9D5
 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
-uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py,sha256=RFXC4bRDYZgeFIzfsOWZXoBEWV7mNiM0HejhcPsP3a0,4920
+uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py,sha256=RY301_82z3-xInGai5ocT7rzoV75ATbf0N7uxn8Z9LE,3110
 uk_bin_collection/uk_bin_collection/councils/MansfieldDistrictCouncil.py,sha256=F5AiTxImrnjE1k3ry96bfstOf5XSNBJS_4qqmymmh3w,1386
 uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py,sha256=3Y2Un4xXo1sCcMsudynODSzocV_mMofWkX2JqONDb5o,1997
 uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,sha256=oOWwU5FSgGej2Mv7FQ66N-EzS5nZgmGsd0WnfLWUc1I,5238
 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=bvCrC4Qcg0Uzp9zZGcC7-7-oJcMh2cb1VaXfdkB11oc,5257
-uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=V9URKAv3dA_deYmStL2Nmn4GbVCM-tU2qnKobivmGew,5583
+uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=ychYR2nsyk2UIb8tjWaKrLUT4hxSsHN558l3RqZ0mjw,5635
 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
@@ -170,7 +170,7 @@ uk_bin_collection/uk_bin_collection/councils/StokeOnTrentCityCouncil.py,sha256=K
 uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py,sha256=DMTAcXT_lay8Cl1hBbzf_LN7-GwTDGxT3Ug9QJkaF9Y,3936
 uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py,sha256=9bYWppi7ViLGHL4VEg--nFn28MLYJYbiEntull1uZxU,3561
 uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py,sha256=4DnKyyu56_AwuchD6_oL1dvpDStMvkkxQtYN79rUKOs,3825
-uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=CCAjclhkCxwf_MkdrIif7MZpLfV5SPy7hyM7BE0TRPc,2048
+uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=ak0zqBJ6UAS8_t5zKGwigMxPMdlQuYXRsGCQJCNERJs,3415
 uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py,sha256=nmVPoPhnFgVi--vczX2i4Sf3bqM5RWJuwfhioRUr5XE,2303
 uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py,sha256=k2TAAZG7n2S1BWVyxbE_-4-lZuzhOimCNz4yimUCOGk,1995
 uk_bin_collection/uk_bin_collection/councils/TandridgeDistrictCouncil.py,sha256=KLVvM2NNq_DQylVe5dwO2l7qPahLHg08jJGLCv1MBQ4,2324
@@ -181,9 +181,9 @@ uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/TonbridgeAndMallingBC.py,sha256=UlgnHDoi8ecav2H5-HqKNDpqW1J3RN-c___5c08_Q7I,4859
 uk_bin_collection/uk_bin_collection/councils/TorbayCouncil.py,sha256=JW_BS7wkfxFsmx6taQtPAQWdBp1AfLrxs0XRQ2XZcSw,2029
 uk_bin_collection/uk_bin_collection/councils/TorridgeDistrictCouncil.py,sha256=6gOO02pYU0cbj3LAHiBVNG4zkFMyIGbkE2jAye3KcGM,6386
-uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=8CvO-WgdKdvyaOf3TYc4XwME8ogAXojgB40oyGRL8Dw,4129
+uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=GSELWbSn5jtznv6FSLIMxK6CyQ27MW9FoY_m5jhTEBA,4175
 uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=Phgb_ECiUOOkqOx6OsfsTHMCW5VQfRmOC2zgYIQhuZA,5044
-uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=5nZLbU5YVKNsJ2X_wuybrNLFAzjVAxkazu-bYP4IGXw,4292
+uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=KBKGHcWAdPC_8-CfKnLOdP7Ww6RIvlxLIJGqBsq_77g,4208
 uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=-xqJOzHTrT4jOB3rHPXFYeqLaHyK9XmCPi92whaYBhw,4671
 uk_bin_collection/uk_bin_collection/councils/WalsallCouncil.py,sha256=_anovUnXMr40lZLHyX3opIP73BwauCllKy-Z2SBrzPw,2076
 uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=P7MMw0EhpRmDbbnHb25tY5_yvYuZUFwJ1br4TOv24sY,4997
@@ -191,12 +191,12 @@ uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=3W
 uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py,sha256=tp9l7vdgSGRzNNG0pDfnNuFj4D2bpRJUJmAiTJ6bM0g,4662
 uk_bin_collection/uk_bin_collection/councils/WealdenDistrictCouncil.py,sha256=SvSSaLkx7iJjzypAwKkaJwegXkSsIQtUOS2V605kz1A,3368
 uk_bin_collection/uk_bin_collection/councils/WelhatCouncil.py,sha256=ikUft37dYNJghfe-_6Fskiq1JihqpLmLNj38QkKSUUA,2316
-uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py,sha256=r90AIUdPgo85VuuvN_NeCDUy3NEJXdO4Ntt93yKo6qI,5110
+uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py,sha256=XhTimZAPNgcuFgNp5mQjkR8mC4LRqUEUCy6e6plHspM,6004
 uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py,sha256=JFWUy4w0CKulGq16PfbRDKAdQEbokVEuabwlZYigdEU,4606
 uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py,sha256=dq0jimtARvRkZiGbVFrXXZgY-BODtz3uYZ5UKn0bf64,4114
 uk_bin_collection/uk_bin_collection/councils/WestMorlandAndFurness.py,sha256=jbqV3460rn9D0yTBGWjpSe1IvWWcdGur5pzgj-hJcQ4,2513
 uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha256=F1GeJUGND4DN_HuM6N0Elpeb0DAMm9_KeqG6qtIgZf4,1079
-uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=HMFWxM7VMhBuC7iubNGbZYEoCVWi--gRHDJMVdPPFOM,2633
+uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=9i8AQHh-qIRPZ_5Ad97_h04-qgyLQDPV064obBzab1Y,2587
 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
@@ -210,8 +210,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 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.98.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.98.3.dist-info/METADATA,sha256=tXTM95e75ygcLe_-4x6iPeWvmm7maK9V6VxrXjov5J0,16843
-uk_bin_collection-0.98.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.98.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.98.3.dist-info/RECORD,,
+uk_bin_collection-0.98.5.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.98.5.dist-info/METADATA,sha256=hbuONB_eNHQmV4S23Zggy6yYeSXl5wI-YQrWkYlld58,16843
+uk_bin_collection-0.98.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.98.5.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.98.5.dist-info/RECORD,,