Fix 138

.github/workflows/build_windows.yaml

@@ -10,9 +10,9 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: robinraju/release-downloader@v1.8
+      - uses: robinraju/release-downloader@v1.10
         with: 
           repository: "MerginMaps/geodiff"    
           latest: true
@@ -26,7 +26,7 @@ jobs:
           cd scripts/windows_binaries
           del geodiff_*.zip
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
             python-version: '3.10' 
 
@@ -43,7 +43,7 @@ jobs:
         run: copy config.yaml.default scripts/dist/config.yaml
 
       - name: Upload Zip file as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dbsync_standalone_win
           path: scripts/dist 

.github/workflows/tests_mergin_db_sync.yaml

@@ -53,7 +53,7 @@ jobs:
           python3 -m pip install mergin-client pytest pytest-cov dynaconf psycopg2
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Run tests
         run: |

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.2
+
+- Fix datetime.timedelta comparison to seconds  
+
 ## 2.1.1
 
 - Fix failure to start when notifications were not enabled

dbsync_daemon.py

@@ -191,7 +191,10 @@ def main():
                     else:
                         min_time_delta_hr = 4
 
-                    if last_email_sent is None or (datetime.datetime.now() - last_email_sent) > min_time_delta_hr * 3600:
+                    if (
+                        last_email_sent is None
+                        or (datetime.datetime.now() - last_email_sent).total_seconds() > min_time_delta_hr * 3600
+                    ):
                         send_email(str(e), config)
                         last_email_sent = datetime.datetime.now()
 

test/test_config.py

@@ -5,10 +5,10 @@
 
 License: MIT
 """
+
 import pytest
 
 from config import ConfigError, config, get_ignored_tables, validate_config
-from smtp_functions import can_send_email
 
 from .conftest import _reset_config
 
@@ -255,9 +255,7 @@ def test_get_ignored_tables():
 def test_config_notification_setup():
     _reset_config()
 
-    # no NOTIFICATIONS set should pass but cannot send email
     validate_config(config)
-    assert can_send_email(config) is False
 
     # incomplete setting
     config.update(
@@ -326,7 +324,7 @@ def test_config_notification_setup():
         }
     )
 
-    with pytest.raises(ConfigError, match="Config error: `smtp_port` must be set an integer"):
+    with pytest.raises(ConfigError, match="Config error: `smtp_port` must be set to an integer"):
         validate_config(config)
     # complete setting but does not work
     config.update(
@@ -347,6 +345,3 @@ def test_config_notification_setup():
 
     with pytest.raises(ConfigError, match="Config SMTP Error"):
         validate_config(config)
-
-    # notifications are set, emails can be send - but this config was not validated, as it would be in real run
-    assert can_send_email(config)

version.py

@@ -1 +1 @@
-__version__ = "2.1.1"
+__version__ = "2.1.2"