uk_bin_collection 0.85.3__tar.gz → 0.85.5__tar.gz

{uk_bin_collection-0.85.3 → uk_bin_collection-0.85.5}/PKG-INFO

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

{uk_bin_collection-0.85.3 → uk_bin_collection-0.85.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.85.3"
+version = "0.85.5"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.85.3 → uk_bin_collection-0.85.5}/uk_bin_collection/tests/test_common_functions.py

@@ -409,17 +409,17 @@ def test_string_with_whitespace_and_numbers():
         (
             "2024-09-02",
             "Tuesday",
-            "03/09/2024",
+            "09/03/2024",
         ),  # Today is Monday, next Tuesday is tomorrow
         (
             "2024-09-02",
             "Sunday",
-            "08/09/2024",
+            "09/08/2024",
         ),  # Today is Monday, next Sunday is in 6 days
         (
             "2024-09-03",
             "Wednesday",
-            "04/09/2024",
+            "09/04/2024",
         ),  # Today is Tuesday, next Wednesday is tomorrow
         (
             "2024-09-03",
@@ -430,8 +430,8 @@ def test_string_with_whitespace_and_numbers():
 )
 def test_get_next_day_of_week(today_str, day_name, expected):
     mock_today = datetime.strptime(today_str, "%Y-%m-%d")
-    with patch("datetime.datetime") as mock_datetime:
+    with patch('uk_bin_collection.common.datetime') as mock_datetime:  # replace 'your_module' with the actual module name
         mock_datetime.now.return_value = mock_today
-        mock_datetime.strptime = datetime.strptime  # to handle strptime within patch
-        result = get_next_day_of_week(day_name)
-        assert result == expected
+        mock_datetime.side_effect = lambda *args, **kw: datetime(*args, **kw)
+        result = get_next_day_of_week(day_name, date_format="%m/%d/%Y")
+        assert result == expected

{uk_bin_collection-0.85.3 → uk_bin_collection-0.85.5}/uk_bin_collection/uk_bin_collection/common.py

@@ -252,7 +252,7 @@ def save_data(file_path, data):
         json.dump(data, file, sort_keys=True, indent=4)
 
 
-def get_next_day_of_week(day_name):
+def get_next_day_of_week(day_name, date_format="%d/%m/%Y"):
     days_of_week = [
         "Monday",
         "Tuesday",

{uk_bin_collection-0.85.3 → uk_bin_collection-0.85.5}/uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py

@@ -5,7 +5,7 @@ import requests
 import logging
 import re
 from datetime import datetime
-from uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.common import *
 from dateutil.parser import parse
 
 from uk_bin_collection.uk_bin_collection.common import check_uprn, check_postcode