Merge branch 'master' into 032024-fixes

robbrad · Mar 24, 2024 · 1e2ff3a · 1e2ff3a
2 parents acde5c7 + 54bdb99
commit 1e2ff3a
Show file tree

Hide file tree

Showing 19 changed files with 1,756 additions and 1,032 deletions.
diff --git a/custom_components/uk_bin_collection/config_flow.py b/custom_components/uk_bin_collection/config_flow.py
@@ -18,7 +18,7 @@ def __init__(self):
     async def get_councils_json(self) -> object:
         """Returns an object of supported council's and their required fields."""
         # Fetch the JSON data from the provided URL
-        url = "https://raw.githubusercontent.com/robbrad/UKBinCollectionData/0.62.0/uk_bin_collection/tests/input.json"
+        url = "https://raw.githubusercontent.com/robbrad/UKBinCollectionData/0.64.1/uk_bin_collection/tests/input.json"
         async with aiohttp.ClientSession() as session:
             async with session.get(url) as response:
                 data_text = await response.text()

diff --git a/custom_components/uk_bin_collection/manifest.json b/custom_components/uk_bin_collection/manifest.json
@@ -9,7 +9,7 @@
     "integration_type": "service",
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/robbrad/UKBinCollectionData/issues",
-    "requirements": ["uk-bin-collection>=0.62.0"],
-    "version": "0.62.0",
+    "requirements": ["uk-bin-collection>=0.64.1"],
+    "version": "0.64.1",
     "zeroconf": []
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.62.0"
+version = "0.64.1"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <[email protected]>"]

diff --git a/uk_bin_collection/tests/features/validate_council_outputs.feature b/uk_bin_collection/tests/features/validate_council_outputs.feature
@@ -6,6 +6,10 @@ Feature: Test each council output matches expected results
         Then the result is valid json
         And the output should validate against the schema
 
+		@AdurAndWorthingCouncils
+		Examples: AdurAndWorthingCouncils
+		| council | selenium_url | selenium_mode |
+		| AdurAndWorthingCouncils | None  | None  |
 
         @AylesburyValeCouncil
 		Examples: AylesburyValeCouncil
@@ -37,6 +41,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| BCPCouncil | None  | None  |
 
+		@BedfordBoroughCouncil
+		Examples: BedfordBoroughCouncil
+		| council | selenium_url | selenium_mode |
+		| BedfordBoroughCouncil | None  | None  |
+
         @BedfordshireCouncil
 		Examples: BedfordshireCouncil
 		| council | selenium_url | selenium_mode |
@@ -157,6 +166,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| DorsetCouncil | None  | None  |
 
+        @DoverDistrictCouncil
+		Examples: DoverDistrictCouncil
+		| council | selenium_url | selenium_mode |
+		| DoverDistrictCouncil | None  | None  |
+
         @DurhamCouncil
 		Examples: DurhamCouncil
 		| council | selenium_url | selenium_mode |
@@ -252,6 +266,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| HighPeakCouncil | http://selenium:4444  | local  |
 
+		@HullCityCouncil
+		Examples: HullCityCouncil
+		| council | selenium_url | selenium_mode |
+		| HullCityCouncil | None  | None  |
+
         @HuntingdonDistrictCouncil
 		Examples: HuntingdonDistrictCouncil
 		| council | selenium_url | selenium_mode |
@@ -262,6 +281,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| KingstonUponThamesCouncil | None  | None  |
 
+		@KirkleesCouncil
+		Examples: KirkleesCouncil
+		| council | selenium_url | selenium_mode |
+		| KirkleesCouncil | http://selenium:4444  | local  |
+
         @LancasterCityCouncil
 		Examples: LancasterCityCouncil
 		| council | selenium_url | selenium_mode |
@@ -307,6 +331,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| ManchesterCityCouncil | None  | None  |
 
+		@MansfieldDistrictCouncil
+		Examples: MansfieldDistrictCouncil
+		| council | selenium_url | selenium_mode |
+		| MansfieldDistrictCouncil | None  | None  |
+
         @MertonCouncil
 		Examples: MertonCouncil
 		| council | selenium_url | selenium_mode |
@@ -457,6 +486,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| RochdaleCouncil | None  | None  |
 
+		@RochfordCouncil
+		Examples: RochfordCouncil
+		| council | selenium_url | selenium_mode |
+		| RochfordCouncil | None  | None  |
+
         @RugbyBoroughCouncil
 		Examples: RugbyBoroughCouncil
 		| council | selenium_url | selenium_mode |
@@ -492,6 +526,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| ShropshireCouncil | None  | None  |
 
+		@SolihullCouncil
+		Examples: SolihullCouncil
+		| council | selenium_url | selenium_mode |
+		| SolihullCouncil | None  | None  |
+
         @SomersetCouncil
 		Examples: SomersetCouncil
 		| council | selenium_url | selenium_mode |
@@ -572,6 +611,16 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| TamesideMBCouncil | None  | None  |
 
+		@TandridgeDistrictCouncil
+		Examples: TandridgeDistrictCouncil
+		| council | selenium_url | selenium_mode |
+		| TandridgeDistrictCouncil | None  | None  |
+
+		@TelfordAndWrekinCouncil
+		Examples: TelfordAndWrekinCouncil
+		| council | selenium_url | selenium_mode |
+		| TelfordAndWrekinCouncil | None  | None  |
+
         @TestValleyBoroughCouncil
 		Examples: TestValleyBoroughCouncil
 		| council | selenium_url | selenium_mode |
@@ -637,6 +686,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| WestLothianCouncil | http://selenium:4444  | local  |
 
+		@WestNorthamptonshireCouncil
+		Examples: WestNorthamptonshireCouncil
+		| council | selenium_url | selenium_mode |
+		| WestNorthamptonshireCouncil | None  | None  |
+
         @WestSuffolkCouncil
 		Examples: WestSuffolkCouncil
 		| council | selenium_url | selenium_mode |
@@ -662,6 +716,11 @@ Feature: Test each council output matches expected results
 		| council | selenium_url | selenium_mode |
 		| WokingBoroughCouncil | None  | None  |
 
+		@WyreCouncil
+		Examples: WyreCouncil
+		| council | selenium_url | selenium_mode |
+		| WyreCouncil | None  | None  |
+
         @YorkCouncil
 		Examples: YorkCouncil
 		| council | selenium_url | selenium_mode |