PyPI - uk_bin_collection - Versions diffs - 0.148.0__py3-none-any.whl → 0.148.1__py3-none-any.whl - Mend

uk_bin_collection 0.148.0py3-none-any.whl → 0.148.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py CHANGED Viewed

@@ -1,6 +1,6 @@
-# import re
 import requests
+from bs4 import BeautifulSoup
+from dateutil.parser import parse
 from uk_bin_collection.uk_bin_collection.common import (
     check_postcode,
@@ -232,11 +232,46 @@ class CouncilClass(AbstractGetBinDataClass):
         )
         garden_dates: list[str] = get_dates_every_x_days(week[garden_week], 14, 28)
+        # Build a dictionary of bank holiday changes
+        bank_holiday_bins_url = "https://www.cheltenham.gov.uk/bank-holiday-collections"
+        response = requests.get(bank_holiday_bins_url)
+        soup = BeautifulSoup(response.content, "html.parser")
+        response.close()
+        tables = soup.find_all("table")
+        # Build a dictionary to modify any bank holiday collections
+        bh_dict = {}
+        for table in tables:
+            # extract table body
+            for row in table.find_all("tr")[1:]:
+                if row.find_all("td")[1].text.strip() == "Normal collection day":
+                    bh_dict[
+                        parse(
+                            row.find_all("td")[0].text.strip(),
+                            dayfirst=True,
+                            fuzzy=True,
+                        ).date()
+                    ] = parse(
+                        row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
+                    ).date()
+                else:
+                    bh_dict[
+                        parse(
+                            row.find_all("td")[0].text.strip(),
+                            dayfirst=True,
+                            fuzzy=True,
+                        ).date()
+                    ] = parse(
+                        row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
+                    ).date()
         for refuse_date in refuse_dates:
-            collection_date = (
-                datetime.strptime(refuse_date, "%d/%m/%Y")
-                + timedelta(days=refuse_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(
+                days=refuse_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
             dict_data = {
                 "type": "Refuse Bin",
@@ -246,10 +281,12 @@ class CouncilClass(AbstractGetBinDataClass):
         for recycling_date in recycling_dates:
-            collection_date = (
-                datetime.strptime(recycling_date, "%d/%m/%Y")
-                + timedelta(days=recycling_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(recycling_date, "%d/%m/%Y") + timedelta(
+                days=recycling_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
             dict_data = {
                 "type": "Recycling Bin",
@@ -259,10 +296,12 @@ class CouncilClass(AbstractGetBinDataClass):
         for garden_date in garden_dates:
-            collection_date = (
-                datetime.strptime(garden_date, "%d/%m/%Y")
-                + timedelta(days=garden_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(garden_date, "%d/%m/%Y") + timedelta(
+                days=garden_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
             dict_data = {
                 "type": "Garden Waste Bin",
@@ -279,10 +318,12 @@ class CouncilClass(AbstractGetBinDataClass):
             for food_date in food_dates:
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=food_day_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=food_day_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
                 dict_data = {
                     "type": "Food Waste Bin",
@@ -313,10 +354,12 @@ class CouncilClass(AbstractGetBinDataClass):
             for food_date in food_dates_first:
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=food_day_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=food_day_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
                 dict_data = {
                     "type": "Food Waste Bin",
@@ -325,10 +368,12 @@ class CouncilClass(AbstractGetBinDataClass):
                 bindata["bins"].append(dict_data)
             for food_date in food_dates_second:
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=second_week_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=second_week_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
                 dict_data = {
                     "type": "Food Waste Bin",

uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py CHANGED Viewed

@@ -33,7 +33,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Wait for the postcode field to appear then populate it
             inputElement_postcode = WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPPOSTCODE")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPPOSTCODE")
                 )
             )
             inputElement_postcode.send_keys(user_postcode)
@@ -41,7 +41,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Click search button
             findAddress = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPSEARCH")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPSEARCH")
                 )
             )
             findAddress.click()
@@ -51,7 +51,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 EC.element_to_be_clickable(
                     (
                         By.XPATH,
-                        "//select[@id='WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPADDRESS']//option[contains(., '"
+                        "//select[@id='WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPADDRESS']//option[contains(., '"
                         + user_paon
                         + "')]",
                     )
@@ -61,7 +61,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Wait for the submit button to appear, then click it to get the collection dates
             submit = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_FIELD2_NEXT")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_FIELD2_NEXT")
                 )
             )
             submit.click()

uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py CHANGED Viewed

@@ -37,7 +37,7 @@ class CouncilClass(AbstractGetBinDataClass):
         collections = []
         # Find section with bins in
-        table = soup.find_all("table", {"class": "hbcRounds"})[1]
+        table = soup.find_all("table", {"class": "hbcRounds"})[0]
         # For each bin section, get the text and the list elements
         for row in table.find_all("tr"):

{uk_bin_collection-0.148.0.dist-info → uk_bin_collection-0.148.1.dist-info}/METADATA RENAMED Viewed

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

{uk_bin_collection-0.148.0.dist-info → uk_bin_collection-0.148.1.dist-info}/RECORD RENAMED Viewed

@@ -73,7 +73,7 @@ uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/CeredigionCountyCouncil.py,sha256=np9iLnMVWpMYUiHZ4sJaSaU5pOWfmiCLQ8TIrOlY48o,5924
 uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=tXfzMetN6wxahuGGRp2mIyCCDSL4F2aG61HhUxw6COQ,2172
 uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=EB88D0MNJwuDZ2GX1ENc5maGYx17mnHTCtNl6s-v11E,5090
-uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=Su77RQoX4Hw6goAT0f-sfhOf3NFPn0MaPFrNdEEhsMM,14100
+uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=B7OgyFKlbvu8SowAALLI8j2EnKlmbXEj65XtB27rCWI,16357
 uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=VxTe9qk93MFgtELEgVrEz3W0vYaG_32EpPmky_b4j0k,2590
 uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=I7Dj8LzG-Q4yrJ99jLRIwKwW5WQ9he8UksvF_YPzTxI,1681
 uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
@@ -106,7 +106,7 @@ uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py,sha256=i3AcW
 uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256=aYUVE5QqTxdj8FHhCB4EiFVDJahWJD9Pq0d1upBEvXg,1501
 uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py,sha256=U0VwSNIldMv5nUoiXtFgjbE0m6Kb-8W2WZQGVCNF_WI,3261
 uk_bin_collection/uk_bin_collection/councils/EastHertsCouncil.py,sha256=FsHfejTGPjRUByDz157690LTD8JpqGplD_XVb7pTe3A,4862
-uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=RSOTD1MIXSW27eGf3TixCiJK4HtSJnpfME2CjalDeXs,4326
+uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=Laf-j0LLr7M4xmKhk8kjPNTtt66oXKYWm0ppxdUX3F0,4326
 uk_bin_collection/uk_bin_collection/councils/EastLothianCouncil.py,sha256=zTp-GDWYeUIlFaqfkqGvo7XMtxJd0VbxdGgqaAwRACk,2792
 uk_bin_collection/uk_bin_collection/councils/EastRenfrewshireCouncil.py,sha256=5giegMCKQ2JhVDR5M4mevVxIdhZtSW7kbuuoSkj3EGk,4361
 uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=oL-NqriLVy_NChGASNh8qTqeakLn4iP_XzoMC6VlPGM,5216
@@ -142,7 +142,7 @@ uk_bin_collection/uk_bin_collection/councils/HackneyCouncil.py,sha256=vO3ugk5fcd
 uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_CPqi6qM2oNiHhKKF1lZC86fyKL4lPhh_DN9pJZ04,5971
 uk_bin_collection/uk_bin_collection/councils/HarboroughDistrictCouncil.py,sha256=uAbCgfrqkIkEKUyLVE8l72s5tzbfMFsw775i0nVRAyc,1934
 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/HarrogateBoroughCouncil.py,sha256=6Sf4l07YvpCmhuOMgD0VWsjfdwHPnEbbsEAsWbl4A44,2050
 uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py,sha256=_llxT4JYYlwm20ZtS3fXwtDs6mwJyLTZBP2wBhvEpWk,2342
 uk_bin_collection/uk_bin_collection/councils/HartlepoolBoroughCouncil.py,sha256=MUT1A24iZShT2p55rXEvgYwGUuw3W05Z4ZQAveehv-s,2842
 uk_bin_collection/uk_bin_collection/councils/HastingsBoroughCouncil.py,sha256=9MCuit4awXSZTbZCXWBsQGX2tp2mHZ1eP1wENZdMvgA,1806
@@ -336,8 +336,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=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
 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.148.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.148.0.dist-info/METADATA,sha256=HNEeiCjaf-UcKWoNlDip-5fbZUAWcmwkjY_0jZqR-ME,20914
-uk_bin_collection-0.148.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.148.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.148.0.dist-info/RECORD,,
+uk_bin_collection-0.148.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.148.1.dist-info/METADATA,sha256=VttvCNYiRX4HrDRXZN4qtx7PnsSIRvM51WhxN0QPsDA,20914
+uk_bin_collection-0.148.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.148.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.148.1.dist-info/RECORD,,

{uk_bin_collection-0.148.0.dist-info → uk_bin_collection-0.148.1.dist-info}/LICENSE RENAMED Viewed

File without changes

{uk_bin_collection-0.148.0.dist-info → uk_bin_collection-0.148.1.dist-info}/WHEEL RENAMED Viewed

File without changes

{uk_bin_collection-0.148.0.dist-info → uk_bin_collection-0.148.1.dist-info}/entry_points.txt RENAMED Viewed

File without changes

uk_bin_collection 0.148.0__py3-none-any.whl → 0.148.1__py3-none-any.whl

uk_bin_collection 0.148.0py3-none-any.whl → 0.148.1py3-none-any.whl