taskcheck 1.6.0__tar.gz → 1.6.1__tar.gz

{taskcheck-1.6.0/taskcheck.egg-info → taskcheck-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskcheck
-Version: 1.6.0
+Version: 1.6.1
 Summary: Automatic scheduler for taskwarrior
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -60,6 +60,11 @@ It updates Taskwarrior with:
 - `completion_date` → when work is expected to finish
 - a warning when a task will miss its due date
 
+Taskcheck does not allocate work before a task's `wait` date.
+It can allocate work on that date because it plans whole days, not exact start times.
+Reports and timelines ignore saved work dates before `wait`, even when you change `wait` after scheduling.
+If no work fits within the planning period, the next scheduling run clears the task's old schedule fields.
+
 ## Quick start
 
 1. `pipx install taskcheck`

{taskcheck-1.6.0 → taskcheck-1.6.1}/README.md

@@ -45,6 +45,11 @@ It updates Taskwarrior with:
 - `completion_date` → when work is expected to finish
 - a warning when a task will miss its due date
 
+Taskcheck does not allocate work before a task's `wait` date.
+It can allocate work on that date because it plans whole days, not exact start times.
+Reports and timelines ignore saved work dates before `wait`, even when you change `wait` after scheduling.
+If no work fits within the planning period, the next scheduling run clears the task's old schedule fields.
+
 ## Quick start
 
 1. `pipx install taskcheck`

{taskcheck-1.6.0 → taskcheck-1.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskcheck"
-version = "1.6.0"
+version = "1.6.1"
 description = "Automatic scheduler for taskwarrior"
 readme = "README.md"
 requires-python = ">=3.11"

{taskcheck-1.6.0 → taskcheck-1.6.1}/taskcheck/agent_blocks.py

@@ -39,7 +39,7 @@ def _eligible(info, pending, date):
     if any(dep in pending for dep in info["task"].get("depends", [])):
         return False
     wait = info["task"].get("wait")
-    if wait and date <= datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
+    if wait and date < datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
         return False
     return True
 

{taskcheck-1.6.0 → taskcheck-1.6.1}/taskcheck/parallel.py

@@ -416,7 +416,7 @@ def allocate_time_for_day(
                 continue
 
             wait = info["task"].get("wait")
-            if wait and date <= datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
+            if wait and date < datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
                 if verbose:
                     print(f"Skipping task {info['task']['id']} due to wait date {wait}")
                 continue
@@ -647,6 +647,16 @@ def update_tasks_with_scheduling_info(task_info, verbose, taskrc):
         scheduling_note = ""
         scheduled_dates = sorted(info["scheduling"].keys())
         if not scheduled_dates:
+            if any(task.get(field) for field in ("scheduled", "completion_date", "scheduling")):
+                subprocess.run(
+                    [
+                        "task", str(task["id"]), "modify",
+                        "scheduled:", "completion_date:", "scheduling:",
+                    ],
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL,
+                    env=get_task_env(taskrc),
+                )
             continue
         start_date = scheduled_dates[0]
         end_date = scheduled_dates[-1]

{taskcheck-1.6.0 → taskcheck-1.6.1}/taskcheck/report.py

@@ -184,6 +184,11 @@ def get_tasks(config, tasks, year, month, day):
     regex = re.compile(rf"{year:04d}-{month:02d}-{day:02d} - ([PDTHM0-9]+)")
     valid_tasks = []
     for task in tasks:
+        wait = task.get("wait")
+        if wait and datetime(year, month, day).date() < datetime.strptime(
+            wait, "%Y%m%dT%H%M%SZ"
+        ).date():
+            continue
         for line in task.get("scheduling", "").split("\n"):
             m = regex.match(line)
             if m:

{taskcheck-1.6.0 → taskcheck-1.6.1}/taskcheck/timeline.py

@@ -37,10 +37,14 @@ def project_color(project, theme):
 
 def parse_scheduling_dates(task):
     dates = []
+    wait = task.get("wait")
+    wait_date = datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date() if wait else None
     for line in task.get("scheduling", "").splitlines():
         match = SCHEDULING_DATE.match(line)
         if match:
-            dates.append(date.fromisoformat(match.group(1)))
+            scheduled_date = date.fromisoformat(match.group(1))
+            if wait_date is None or scheduled_date >= wait_date:
+                dates.append(scheduled_date)
     return sorted(set(dates))
 
 

{taskcheck-1.6.0 → taskcheck-1.6.1/taskcheck.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskcheck
-Version: 1.6.0
+Version: 1.6.1
 Summary: Automatic scheduler for taskwarrior
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -60,6 +60,11 @@ It updates Taskwarrior with:
 - `completion_date` → when work is expected to finish
 - a warning when a task will miss its due date
 
+Taskcheck does not allocate work before a task's `wait` date.
+It can allocate work on that date because it plans whole days, not exact start times.
+Reports and timelines ignore saved work dates before `wait`, even when you change `wait` after scheduling.
+If no work fits within the planning period, the next scheduling run clears the task's old schedule fields.
+
 ## Quick start
 
 1. `pipx install taskcheck`

{taskcheck-1.6.0 → taskcheck-1.6.1}/tests/test_parallel.py

@@ -105,6 +105,26 @@ class TestTaskInitialization:
 
 
 class TestTimeAllocation:
+    @pytest.mark.parametrize("agent", [False, True])
+    def test_task_starts_on_wait_date(self, agent):
+        from freezegun import freeze_time
+
+        task = {
+            "id": 1, "uuid": "waiting", "estimated": "PT2H", "time_map": "work",
+            "wait": "20231206T000000Z", "urgency": 10.0,
+        }
+        if agent:
+            task.update(tags=["agent"], agent_weight=25)
+        coeffs = UrgencyCoefficients({"PT2H": 0}, False, 0, 365, 12, 2)
+        with freeze_time("2023-12-05"):
+            with patch("taskcheck.parallel.get_long_range_time_map", return_value=([8.0] * 3, 0.0)):
+                info = initialize_task_info([task], {}, 3, coeffs, [])
+            allocate_time_for_day(info, 0, coeffs, False, 1.0)
+            assert info["waiting"]["scheduling"] == {}
+            allocate_time_for_day(info, 1, coeffs, False, 1.0)
+        assert info["waiting"]["scheduling"] == {"2023-12-06": 2.0}
+        assert info["waiting"]["remaining_hours"] == 0
+
     def test_allocate_time_for_day_single_task(self, sample_config):
         task_info = {
             "task-1": {

{taskcheck-1.6.0 → taskcheck-1.6.1}/tests/test_report.py

@@ -67,6 +67,15 @@ class TestDateUtilities:
 
 
 class TestTaskFiltering:
+    @pytest.mark.parametrize("day, expected", [(5, []), (6, [1]), (7, [1])])
+    def test_wait_date_overrides_saved_schedule(self, day, expected):
+        task = {
+            "id": 1, "description": "Waiting task", "urgency": 10.0,
+            "wait": "20231206T000000Z",
+            "scheduling": "\n".join(f"2023-12-{d:02d} - PT2H" for d in (5, 6, 7)),
+        }
+        assert [row["id"] for row in get_tasks({}, [task], 2023, 12, day)] == expected
+
     def test_get_tasks_with_scheduling(self, sample_config):
         tasks_with_scheduling = [
             {

{taskcheck-1.6.0 → taskcheck-1.6.1}/tests/test_timeline.py

@@ -23,6 +23,14 @@ def test_parse_scheduling_dates_ignores_invalid_lines():
     assert parse_scheduling_dates(task) == [date(2024, 1, 2), date(2024, 1, 3)]
 
 
+def test_wait_date_overrides_saved_schedule():
+    task = {
+        "wait": "20240103T000000Z",
+        "scheduling": "2024-01-02 - PT2H\n2024-01-03 - PT2H\n2024-01-04 - PT2H",
+    }
+    assert parse_scheduling_dates(task) == [date(2024, 1, 3), date(2024, 1, 4)]
+
+
 def test_day_timeline_groups_projects_and_marks_events():
     tasks = [
         {