Merge branch 'master' into asset_library

setup.cfg

@@ -43,9 +43,9 @@ install_requires =
     flask-fs2[swift, s3]==0.7.27
     flask-jwt-extended==4.6.0
     flask-migrate==4.0.7
-    flask-socketio==5.3.6
+    flask-socketio==5.3.7
     flask==3.0.3
-    gazu==0.10.14
+    gazu==0.10.15
     gevent-websocket==0.10.1
     gevent==24.2.1
     gunicorn==23.0.0
@@ -56,7 +56,7 @@ install_requires =
     matterhook==0.2
     meilisearch==0.31.5
     numpy==2.0.1; python_version == '3.9'
-    numpy==2.1.0; python_version >= '3.10'
+    numpy==2.1.1; python_version >= '3.10'
     opencv-python==4.10.0.84
     OpenTimelineIO==0.17.0
     OpenTimelineIO-Plugins==0.17.0
@@ -68,14 +68,14 @@ install_requires =
     pysaml2==7.5.0
     python-nomad==2.0.1
     python-slugify==8.0.4
-    python-socketio==5.11.3
+    python-socketio==5.11.4
     pytz==2024.1
     redis==5.0.8
     requests==2.32.3
     rq==1.16.2
     slackclient==2.9.4
     sqlalchemy_utils==0.41.2
-    sqlalchemy==2.0.32
+    sqlalchemy==2.0.34
     ua-parser==0.18.0
     werkzeug==3.0.4
 

zou/app/services/tasks_service.py

@@ -1082,7 +1082,7 @@ def get_person_tasks_to_check(project_ids=None, department_ids=None):
     else:
         query = query.filter(user_service.build_open_project_filter())
 
-    if department_ids is not None:
+    if department_ids:
         query = query.filter(TaskType.department_id.in_(department_ids))
     tasks = []
     for (

zou/app/services/time_spents_service.py

@@ -158,7 +158,7 @@ def get_time_spents_for_year(
         else:
             query = query.filter(Task.project_id == project_id)
 
-    if department_ids is not None:
+    if department_ids:
         query = query.join(TaskType).filter(
             TaskType.department_id.in_(department_ids)
         )
@@ -200,7 +200,7 @@ def get_time_spents_for_month(
         else:
             query = query.filter(Task.project_id == project_id)
 
-    if department_ids is not None:
+    if department_ids:
         query = query.join(TaskType).filter(
             TaskType.department_id.in_(department_ids)
         )
@@ -255,7 +255,7 @@ def get_time_spents(
         if project_ids is not None:
             query = query.filter(Task.project_id.in_(project_ids))
 
-        if department_ids is not None:
+        if department_ids:
             query = query.join(TaskType)
             query = query.filter(TaskType.department_id.in_(department_ids))
     except DataError:
@@ -430,7 +430,7 @@ def get_person_time_spent_entries(
         else:
             query = query.filter(Task.project_id == project_id)
 
-    if department_ids is not None:
+    if department_ids:
         query = query.join(TaskType, TaskType.id == Task.task_type_id).filter(
             TaskType.department_id.in_(department_ids)
         )