rtmilk 3.0.0__tar.gz → 3.0.2__tar.gz

{rtmilk-3.0.0 → rtmilk-3.0.2}/.github/workflows/ci.yml

@@ -19,12 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
     - name: Install uv
-      uses: yezz123/setup-uv@v4
+      uses: astral-sh/setup-uv@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      run: uv python install ${{ matrix.python-version }}
     - name: Dependencies
       run: |
         uv sync --no-cache

{rtmilk-3.0.0 → rtmilk-3.0.2}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.3
 Name: rtmilk
-Version: 3.0.0
+Version: 3.0.2
 Summary: Remember The Milk API wrapper
 Project-URL: Homepage, https://github.com/rkhwaja/rtmilk
 Maintainer-email: Rehan Khwaja <rehan@khwaja.name>
-License-File: LICENSE
 Keywords: Milk,Remember,RememberTheMilk
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -17,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Requires-Dist: aiohttp>=3.9
 Requires-Dist: listdiff>=1.0.2
-Requires-Dist: pydantic>=2.4.2
+Requires-Dist: pydantic>=2.8
 Requires-Dist: requests>=2.23.0
 Requires-Dist: urllib3>=1.26; python_version >= '3.10'
 Description-Content-Type: text/markdown

{rtmilk-3.0.0 → rtmilk-3.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rtmilk"
-version = "3.0.0"
+version = "3.0.2"
 description = "Remember The Milk API wrapper"
 maintainers = [
 	{ name = "Rehan Khwaja", email = "rehan@khwaja.name" }
@@ -21,7 +21,7 @@ requires-python = ">=3.9"
 dependencies = [
     "requests>=2.23.0",
     "urllib3>=1.26; python_version>='3.10'",
-    "pydantic>=2.4.2",
+    "pydantic>=2.8",
     "aiohttp>=3.9",
     "listdiff>=1.0.2",
 ]

{rtmilk-3.0.0 → rtmilk-3.0.2}/src/rtmilk/_sansio.py

@@ -303,7 +303,9 @@ class TasksSetDueDate(AuthorizedCall):
 		if 'has_due_time' in kwargs:
 			kwargs['has_due_time'] = '1' if kwargs['has_due_time'] else '0'
 		if 'due' in kwargs:
-			if isinstance(kwargs['due'], (date, datetime)):
+			if isinstance(kwargs['due'], datetime):
+				kwargs['due'] = _RtmDatetime(kwargs['due'])
+			elif isinstance(kwargs['due'], date):
 				kwargs['due'] = _RtmDate(kwargs['due'])
 			else:
 				assert isinstance(kwargs['due'], str)
@@ -340,7 +342,9 @@ class TasksSetStartDate(AuthorizedCall):
 		if 'has_start_time' in kwargs:
 			kwargs['has_start_time'] = '1' if kwargs['has_start_time'] else '0'
 		if 'start' in kwargs:
-			if isinstance(kwargs['start'], (date, datetime)):
+			if isinstance(kwargs['start'], datetime):
+				kwargs['start'] = _RtmDatetime(kwargs['start'])
+			elif isinstance(kwargs['start'], date):
 				kwargs['start'] = _RtmDate(kwargs['start'])
 			else:
 				assert isinstance(kwargs['start'], str)

{rtmilk-3.0.0 → rtmilk-3.0.2}/src/rtmilk/_utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Annotated, TypeVar
 
 from pydantic import BeforeValidator
-from pydantic.networks import Url, UrlConstraints
+from pydantic.networks import HttpUrl, UrlConstraints
 
 def EmptyStringToNone(value):
 	if value == '':
@@ -18,5 +18,5 @@ EmptyStrToNone = Annotated[
 ]
 
 HttpsUrl = Annotated[
-    Url, UrlConstraints(allowed_schemes=['https'])
+    HttpUrl, UrlConstraints(allowed_schemes=['https'])
 ]

{rtmilk-3.0.0 → rtmilk-3.0.2}/src/rtmilk/client.py

@@ -53,6 +53,13 @@ class Task:
 def FilterDate(date_):
 	return datetime.strftime(date_, '%m/%d/%Y')
 
+def _LoadDate(rtmDate, hasTime):
+	if rtmDate is None:
+		return None
+	if hasTime:
+		return rtmDate
+	return rtmDate.date()
+
 def _CreateFromTaskSeries(client, listId, taskSeries):
 	_log.info(f'{taskSeries=}')
 	task0 = taskSeries.task[0]
@@ -60,8 +67,8 @@ def _CreateFromTaskSeries(client, listId, taskSeries):
 
 	result.name._LoadValue(taskSeries.name)
 	result.tags._LoadValue(set(taskSeries.tags.tag) if hasattr(taskSeries.tags, 'tag') else set(taskSeries.tags))
-	result.startDate._LoadValue(task0.start.date() if task0.start is not None else None) # None means no change
-	result.dueDate._LoadValue(task0.due.date() if task0.due is not None else None) # None means no change
+	result.startDate._LoadValue(_LoadDate(task0.start, task0.has_start_time))
+	result.dueDate._LoadValue(_LoadDate(task0.due, task0.has_due_time))
 	result.complete._LoadValue(task0.completed is not None)
 	result.notes._LoadValue([] if isinstance(taskSeries.notes, list) else taskSeries.notes.note)
 	result.createTime = taskSeries.created

{rtmilk-3.0.0 → rtmilk-3.0.2}/tests/test_client.py

@@ -1,4 +1,4 @@
-from datetime import date, timedelta
+from datetime import date, datetime, time, timedelta, timezone
 from uuid import uuid4
 
 from pydantic import ValidationError
@@ -58,6 +58,18 @@ def testClientSync(client):
 	assert newTaskToo.startDate.value == dueDate, 'Start date should have been updated'
 	assert newTaskToo.dueDate.value is None, 'Due date should have been updated'
 
+	# Update dates to datetimes
+	startDateTime = datetime.combine(dueDate, time(12, 42, 0), timezone.utc) # RTM discards the seconds
+	newTask.startDate.Set(startDateTime)
+	dueDateTime = datetime.combine(dueDate, time(13, 43, 0), timezone.utc) # RTM discards the seconds
+	newTask.dueDate.Set(dueDateTime)
+
+	tasksWithTitle = client.Get(f'name:"{name}"')
+	newTaskToo = tasksWithTitle[0]
+	assert len(tasksWithTitle) == 1, f'Should be only 1 task with name: "{name}"\n{tasksWithTitle}'
+	assert newTaskToo.startDate.value == startDateTime, 'Start date should have been updated with the time'
+	assert newTaskToo.dueDate.value == dueDateTime, 'Due date should have been updated with the time'
+
 	newTaskToo.Delete()
 
 @mark.asyncio