uk_bin_collection 0.143.4__py3-none-any.whl → 0.143.6__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -866,7 +866,7 @@
         "wiki_note": "Pass the house number, postcode, and UPRN in their respective parameters. This parser requires a Selenium webdriver."
     },
     "GooglePublicCalendarCouncil": {
-        "url": "https://calendar.google.com/calendar/ical/c_bca6c975545213622b3958bddab567e1e7398709c63e377b6fe9a9140bd1caf8%40group.calendar.google.com/public/basic.ics",
+        "url": "https://calendar.google.com/calendar/ical/0d775884b4db6a7bae5204f06dae113c1a36e505b25991ebc27c6bd42edf5b5e%40group.calendar.google.com/public/basic.ics",
         "wiki_name": "Google Calendar (Public)",
         "wiki_note": "The URL should be the public ics file URL for the public Google calendar. See https://support.google.com/calendar/answer/37083?sjid=7202815583021446882-EU. Councils that currently need this are Trafford."
     },
@@ -1579,14 +1579,14 @@
         "wiki_note": "To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search). This parser requires a Selenium webdriver."
     },
     "RenfrewshireCouncil": {
-        "house_number": "1",
-        "paon": "1",
-        "postcode": "PA29ED",
-        "skip_get_url": false,
-        "url": "https://www.renfrewshire.gov.uk/article/2320/Check-your-bin-collection-day",
+        "house_number": "1, STATIONHOUSE DRIVE, JOHNSTONE, RENFREWSHIRE, PA6 7FJ",
+        "paon": "1, STATIONHOUSE DRIVE, JOHNSTONE, RENFREWSHIRE, PA6 7FJ",
+        "postcode": "PA6 7FJ",
+        "skip_get_url": true,
+        "url": "https://www.renfrewshire.gov.uk/bin-day",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Renfrewshire Council",
-        "wiki_note": "Pass the house name/number and postcode in their respective parameters. This parser requires a Selenium webdriver."
+        "wiki_note": "Pass the full address as it appears on the website. This parser requires a Selenium webdriver."
     },
     "RhonddaCynonTaffCouncil": {
         "skip_get_url": true,

uk_bin_collection/uk_bin_collection/councils/GooglePublicCalendarCouncil.py

@@ -1,7 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Any
 import requests
-from ics import Calendar
+from icalevents.icalevents import events
 
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 from uk_bin_collection.uk_bin_collection.common import date_format
@@ -12,26 +12,26 @@ class CouncilClass(AbstractGetBinDataClass):
         ics_url: str = kwargs.get("url")
 
         if not ics_url:
-            raise ValueError("Missing required argument: google_calendar_ics_url")
+            raise ValueError("Missing required argument: url")
 
-        response = requests.get(ics_url)
-        response.raise_for_status()
+        # Get events within the next 90 days
+        now = datetime.now()
+        future = now + timedelta(days=60)
 
-        calendar = Calendar(response.text)
-        bindata = {"bins": []}
+        try:
+            upcoming_events = events(ics_url, start=now, end=future)
+        except Exception as e:
+            raise ValueError(f"Error parsing ICS feed: {e}")
 
-        for event in calendar.events:
-            if not event.name or not event.begin:
-                continue
+        bindata = {"bins": []}
 
-            try:
-                # .begin is a datetime-like object (Arrow)
-                collection_date = event.begin.date().strftime(date_format)
-            except Exception:
+        for event in sorted(upcoming_events, key=lambda e: e.start):
+            if not event.summary or not event.start:
                 continue
 
-            bindata["bins"].append(
-                {"type": event.name, "collectionDate": collection_date}
-            )
+            bindata["bins"].append({
+                "type": event.summary,
+                "collectionDate": event.start.date().strftime(date_format)
+            })
 
         return bindata

uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py

@@ -19,6 +19,7 @@ class CouncilClass(AbstractGetBinDataClass):
         driver = None
         try:
             data = {"bins": []}
+            url = kwargs.get("url")
             user_paon = kwargs.get("paon")
             user_postcode = kwargs.get("postcode")
             web_driver = kwargs.get("web_driver")
@@ -28,9 +29,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
             # Create Selenium webdriver
             driver = create_webdriver(web_driver, headless, None, __name__)
-            driver.get(
-                "https://www.renfrewshire.gov.uk/article/2320/Check-your-bin-collection-day"
-            )
+            driver.get("https://www.renfrewshire.gov.uk/bin-day")
 
             accept_button = WebDriverWait(driver, timeout=30).until(
                 EC.element_to_be_clickable((By.ID, "ccc-notify-accept"))

{uk_bin_collection-0.143.4.dist-info → uk_bin_collection-0.143.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.143.4
+Version: 0.143.6
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: bs4
 Requires-Dist: holidays
-Requires-Dist: ics (>=0.7.2,<0.8.0)
+Requires-Dist: icalevents (>=0.2.1,<0.3.0)
 Requires-Dist: lxml
 Requires-Dist: pandas
 Requires-Dist: python-dateutil

{uk_bin_collection-0.143.4.dist-info → uk_bin_collection-0.143.6.dist-info}/RECORD

@@ -3,7 +3,7 @@ uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=Iecdja0I3XIiY
 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=v2gvh-6-29xX8xhZKXaTUpvpXCvNr0EWsBic1mJ9uGs,121442
+uk_bin_collection/tests/input.json,sha256=Jsgpmyg3oz-2v87n_SbJGHcPM4-yIkQFFAsLvJDDI2g,121493
 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=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -129,7 +129,7 @@ uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=SRCgYhYs
 uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=XzfFMCwclh9zAJgsbaj4jywjdiH0wPaFicaVsLrN3ms,2297
 uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=9Rk9KfcglJvRhh4373OfRX-fwywE2xgwx5KejqzV5fE,3399
 uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=67D8rbhn0t4rsCSJRTXZVtHmph2wT6rJiexNWKOnMok,4625
-uk_bin_collection/uk_bin_collection/councils/GooglePublicCalendarCouncil.py,sha256=oFAfvSA7dH7a9wgse5NAA45J8NJ_ltx4mGoKjDYc7pk,1124
+uk_bin_collection/uk_bin_collection/councils/GooglePublicCalendarCouncil.py,sha256=KiDfL9AVhUlRuY98sbNs_Fb-vUVeo5n1bBShTJHcO8w,1173
 uk_bin_collection/uk_bin_collection/councils/GraveshamBoroughCouncil.py,sha256=ueQ9xFiTxMUBTGV9VjtySHA1EFWliTM0AeNePBIG9ho,4568
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
 uk_bin_collection/uk_bin_collection/councils/GwyneddCouncil.py,sha256=eK2KkY1NbIxVtBruQYSNPA0J7fuzMik5it02dFbKYV0,1855
@@ -226,7 +226,7 @@ uk_bin_collection/uk_bin_collection/councils/ReadingBoroughCouncil.py,sha256=ZlQ
 uk_bin_collection/uk_bin_collection/councils/RedcarandClevelandCouncil.py,sha256=MV8CD1sj8fiy6PAVrIHO4TyTHodn45nDZp0rQfs7PiM,2829
 uk_bin_collection/uk_bin_collection/councils/RedditchBoroughCouncil.py,sha256=8QmcpStCT7c-CLhmiQ8ZeEyvtysU110VDiMQdfQTErk,2469
 uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py,sha256=HMLKdRUO5DdMJe1d1X5qtKtQsf6d5TAPViIZpMzAfes,3251
-uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py,sha256=VlWm-w4d-UchoENe_hCTCGlfSHiMlS4wNEeMvxuNR2U,5109
+uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py,sha256=VjjolGn0KemgIUnmF-JlB8gxNLyaQB5mP61NonxVJAo,5080
 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=rfhD66A9HfHL46ldF9sbxvV7fPaaoNxzIJbHjVT6A90,2621
@@ -328,8 +328,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=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 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.143.4.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.143.4.dist-info/METADATA,sha256=N3KVtQmKfefJPrf8OekpWrn5di14f8lew3NJCHcOoPs,19851
-uk_bin_collection-0.143.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.143.4.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.143.4.dist-info/RECORD,,
+uk_bin_collection-0.143.6.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.143.6.dist-info/METADATA,sha256=_nNZJggZZm7s_yy51Yse2Dn-n4DyRJfrSHzfy_nhxK0,19858
+uk_bin_collection-0.143.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.143.6.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.143.6.dist-info/RECORD,,