Merge branch 'main' of github.com:sibson/redbeat

Author: sibson

.github/workflows/pythonapp.yml

@@ -14,7 +14,7 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest ] #, windows-latest] tests fail on windows
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -44,7 +44,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           cache: 'pip'
 
       - name: Install dependencies

redbeat/schedulers.py

@@ -453,14 +453,17 @@ def update_from_dict(self, dict_):
             redis_key = self.Entry.generate_key(self.app, name)
 
             try:
-                entry = self.Entry.from_key(redis_key, app=self.app)
+                redis_entry = self.Entry.from_key(redis_key, app=self.app)
+                entry = self._maybe_entry(name, entry)
+                entry.last_run_at = (
+                    redis_entry.last_run_at
+                )  # update definition while preserving last_run_at
             except KeyError:
                 try:
                     entry = self._maybe_entry(name, entry)
                 except Exception as exc:
                     logger.error(ADD_ENTRY_ERROR, name, exc, entry)
                     continue
-
             entry.save()  # store into redis
             logger.debug("beat: Stored entry: %s", entry)
 

setup.cfg

@@ -20,6 +20,7 @@ classifiers=
         Programming Language :: Python :: 3.9
         Programming Language :: Python :: 3.10
         Programming Language :: Python :: 3.11
+        Programming Language :: Python :: 3.12
         Programming Language :: Python :: Implementation :: CPython
         Operating System :: OS Independent
 

tests/test_scheduler.py

@@ -190,16 +190,20 @@ def test_lock_acquisition_failed_during_startup(self):
 
 class TestRedBeatSchedulerUpdateFromDict(RedBeatSchedulerTestBase):
     @patch.object(RedBeatSchedulerEntry, "from_key")
-    def test_update_from_dict_fetch_redis_entry(self, mock_from_key: MagicMock) -> None:
+    @patch.object(RedBeatSchedulerEntry, "save")
+    def test_update_from_dict_fetch_redis_entry(
+        self, mock_entry_save: MagicMock, mock_from_key: MagicMock
+    ) -> None:
         mock_entry_from_redis_key = mock_from_key.return_value
+        mock_entry_from_redis_key.last_run_at = datetime.now()
 
         self.s.update_from_dict(
             dict_={'task_name': {'task': 'tasks.task_name', 'schedule': timedelta(seconds=30)}}
         )
 
         mock_from_key.assert_called_once_with("rb-tests:task_name", app=self.app)
 
-        mock_entry_from_redis_key.save.assert_called_once()
+        mock_entry_save.assert_called_once()
 
     @patch.object(RedBeatSchedulerEntry, "from_key")
     @patch.object(RedBeatSchedulerEntry, "save")