Merge pull request #1883 from robbrad/march-2026-release

March 2026 Release

Author: robbrad

.github/workflows/ha_compatibility_test.yml

@@ -181,7 +181,7 @@ jobs:
 
       - name: Upload HA log (always)
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ha-log-${{ matrix.ha_version }}
           path: home-assistant.log

.github/workflows/release.yml

@@ -90,13 +90,13 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_API_KEY }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./uk_bin_collection_api_server
           push: true

poetry.lock

@@ -24,7 +24,7 @@ issues = "https://github.com/robbrad/UKBinCollectionData/issues"
 requires = ["poetry-core>=1.2.0"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 black = "*"
 coverage = "*"
 flake8 = "*"

pyproject.toml

@@ -1344,14 +1344,11 @@
         "LAD24CD": "E07000121"
     },
     "LeedsCityCouncil": {
-        "house_number": "1",
-        "postcode": "LS6 2SE",
         "skip_get_url": true,
         "uprn": "72506983",
         "url": "https://www.leeds.gov.uk/residents/bins-and-recycling/check-your-bin-day",
-        "web_driver": "http://selenium:4444",
         "wiki_name": "Leeds",
-        "wiki_note": "Pass the house number, postcode, and UPRN. This parser requires a Selenium webdriver.",
+        "wiki_note": "Pass the UPRN.",
         "LAD24CD": "E08000035"
     },
     "LeicesterCityCouncil": {
@@ -1420,6 +1417,14 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E09000009"
     },
+    "LondonBoroughHammersmithandFulham": {
+        "postcode": "W12 0BQ",
+        "url": "https://www.lbhf.gov.uk/",
+        "wiki_command_url_override": "https://www.lbhf.gov.uk/",
+        "wiki_name": "Hammersmith & Fulham",
+        "wiki_note": "Pass only the property postcode",
+        "LAD24CD": "E09000013"
+    },
     "LondonBoroughHarrow": {
         "uprn": "100021298754",
         "url": "https://www.harrow.gov.uk",
@@ -1843,6 +1848,15 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E06000057"
     },
+    "NorthWarwickshireBoroughCouncil": {
+        "uprn": "10001179576",
+        "skip_get_url": true,
+        "url": "https://www.northwarks.gov.uk",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "North Warwickshire",
+        "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
+        "LAD24CD": "E07000220"
+    },
     "NorwichCityCouncil": {
         "house_number": "2",
         "postcode": "NR2 3TT",

uk_bin_collection/tests/input.json

@@ -47,23 +47,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
             # Close popup if it exists
             driver.switch_to.active_element.send_keys(Keys.ESCAPE)
 
-            # Handle cookie banner if present
-            wait = WebDriverWait(driver, 60)
-            try:
-                cookie_button = wait.until(
-                    EC.element_to_be_clickable(
-                        (
-                            By.CSS_SELECTOR,
-                            ".agree-button.eu-cookie-compliance-secondary-button.button.button--small",
-                        )
-                    ),
-                    message="Cookie banner not found",
-                )
-                cookie_button.click()
-                print("Cookie banner clicked.")
-                time.sleep(1)  # Brief pause to let banner disappear
-            except (TimeoutException, NoSuchElementException):
-                print("No cookie banner appeared or selector failed.")
+            wait = WebDriverWait(driver, 10)
 
             # Enter postcode
             print("Looking for postcode input...")
@@ -84,7 +68,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
                 EC.element_to_be_clickable((By.ID, "address")),
                 message="Address dropdown not found",
             )
-            
+
             dropdown = Select(address_select)
 
             found = False

uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py

@@ -71,7 +71,7 @@ def parse_data(self, page: str, **kwargs: Any) -> Dict[str, Any]:
             "sec-fetch-site": "same-origin",
             "sec-fetch-user": "?1",
             "upgrade-insecure-requests": "1",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.5993.118 Safari/537.36",
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
         }
         form_data = {
             "personInfo.person1.HouseNumberOrName": "",

uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py

@@ -36,7 +36,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
             "Sec-Fetch-Mode": "navigate",
             "Sec-Fetch-Site": "cross-site",
             "Sec-Fetch-User": "?1",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.188 Safari/537.36",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
         }
 
         response = requests.get(

uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py

@@ -1,10 +1,12 @@
 import json
+import ssl
+
 import requests
+import urllib3
 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 ssl
-import urllib3
 
 
 class CustomHttpAdapter(requests.adapters.HTTPAdapter):
@@ -45,7 +47,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
             "Sec-Fetch-Dest": "empty",
             "Sec-Fetch-Mode": "cors",
             "Sec-Fetch-Site": "same-origin",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.188 Safari/537.36",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
             "X-Requested-With": "XMLHttpRequest",
         }
 
@@ -56,7 +58,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
 
         requests.packages.urllib3.disable_warnings()
         response = session.get(
-            f"https://www.bathnes.gov.uk/webapi/api/BinsAPI/v2/getbartecroute/{user_uprn}/true",
+            f"https://api.bathnes.gov.uk/webapi/api/BinsAPI/v2/BartecFeaturesandSchedules/CollectionSummary/{user_uprn}",
             headers=headers,
         )
         if response.text == "":
@@ -68,30 +70,14 @@ def parse_data(self, page: str, **kwargs) -> dict:
 
         data = {"bins": []}
 
-        if len(json_data["residualNextDate"]) > 0:
-            dict_data = {
-                "type": "Black Rubbish Bin",
-                "collectionDate": datetime.strptime(
-                    json_data["residualNextDate"], "%Y-%m-%dT%H:%M:%S"
-                ).strftime(date_format),
-            }
-            data["bins"].append(dict_data)
-        if len(json_data["recyclingNextDate"]) > 0:
-            dict_data = {
-                "type": "Recycling Containers",
-                "collectionDate": datetime.strptime(
-                    json_data["recyclingNextDate"], "%Y-%m-%dT%H:%M:%S"
-                ).strftime(date_format),
-            }
-            data["bins"].append(dict_data)
-        if len(json_data["organicNextDate"]) > 0:
-            dict_data = {
-                "type": "Garden Waste",
-                "collectionDate": datetime.strptime(
-                    json_data["organicNextDate"], "%Y-%m-%dT%H:%M:%S"
-                ).strftime(date_format),
-            }
-            data["bins"].append(dict_data)
+        for collection in json_data:
+            collection_date = datetime.fromisoformat(collection["nextCollectionDate"])
+            for feature in collection["features"]:
+                dict_data = {
+                    "type": feature["featureDisplayName"],
+                    "collectionDate": collection_date.strftime(date_format),
+                }
+                data["bins"].append(dict_data)
 
         data["bins"].sort(
             key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)

uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py

@@ -29,7 +29,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
             "Origin": "https://www.centralbedfordshire.gov.uk",
             "Referer": "https://www.centralbedfordshire.gov.uk/info/163/bins_and_waste_collections_-_check_bin_collection_day",
 
-            "User-Agent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.7968.1811 Mobile Safari/537.36",
+            "User-Agent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Mobile Safari/537.36",
         }
 
         files = {