Merge branch 'master' into dev

AppDaemon · Feb 7, 2025 · 4abfad2 · 4abfad2
2 parents 7cc2af9 + e29e3f0
commit 4abfad2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ coverage.xml
 
 # Sphinx documentation
 docs/_build/
+.docs_build
 
 # PyBuilder
 target/

diff --git a/appdaemon/adapi.py b/appdaemon/adapi.py
@@ -2211,7 +2211,7 @@ async def get_now(self) -> dt.datetime:
         return now.astimezone(self.AD.tz)
 
     @utils.sync_wrapper
-    async def get_now_ts(self) -> int:
+    async def get_now_ts(self) -> float:
         """Returns the current Local Timestamp.
 
         Examples: