ositah 24.8.dev1__tar.gz → 24.9.dev1__tar.gz

{ositah-24.8.dev1/ositah.egg-info → ositah-24.9.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.8.dev1
+Version: 24.9.dev1
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License
@@ -13,15 +13,16 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: blinker
-Requires-Dist: dash
+Requires-Dist: dash>=2.17
 Requires-Dist: dash-bootstrap-components
-Requires-Dist: flask~=2.2
+Requires-Dist: flask
 Requires-Dist: flask-multipass
 Requires-Dist: flask-sqlalchemy~=3.0
 Requires-Dist: flask-wtf
-Requires-Dist: hito-tools>=23.2
-Requires-Dist: pandas==2.*
+Requires-Dist: hito-tools>=24.8
+Requires-Dist: pandas>=2.2
 Requires-Dist: pymysql
+Requires-Dist: python>=3.9
 Requires-Dist: python-ldap
 Requires-Dist: pyyaml
 Requires-Dist: simplejson

{ositah-24.8.dev1 → ositah-24.9.dev1}/ositah/apps/analysis.py

@@ -596,7 +596,7 @@ def ijclab_export_to_csv(_, team, team_selection_date, source, period_date):
             columns["hours"],
         ]
     ]
-    exported_data[columns["hours"]] = np.round(exported_data[columns["hours"]]).astype("int")
+    exported_data.loc[:, columns["hours"]] = np.round(exported_data[columns["hours"]]).astype("int")
     column_renames = {}
     for c in exported_data.columns.tolist():
         if c in EXPORT_COLUMN_NAMES:

{ositah-24.8.dev1 → ositah-24.9.dev1}/ositah/apps/validation/tables.py

@@ -176,6 +176,7 @@ def build_validation_table(team, team_selection_date, declaration_set: int, peri
         selected_declarations = declaration_list[~declaration_list["validated"]]
     else:
         return general_error_jumbotron(f"Invalid declaration set ID ({declaration_set})")
+    selected_declarations.sort_values(by=["fullname"], ignore_index=True, inplace=True)
 
     columns = [*data_columns]
     columns.insert(0, column_names["fullname"])

{ositah-24.8.dev1 → ositah-24.9.dev1}/ositah/apps/validation/tools.py

@@ -5,7 +5,6 @@ Various functions used by Validation sub-application
 from datetime import datetime
 
 import dash_bootstrap_components as dbc
-import numpy as np
 import pandas as pd
 from dash import html
 
@@ -341,9 +340,10 @@ def category_declarations(
             ]
         category_declarations.drop(columns=columns["hours"], inplace=True)
         category_declarations.fillna(0, inplace=True)
+        category_declarations = category_declarations.infer_objects(copy=False)
 
-        agg_functions = {c: np.sum for c in categories}
-        agg_functions["suspect"] = np.any
+        agg_functions = {c: "sum" for c in categories}
+        agg_functions["suspect"] = "any"
         category_declarations_pt = pd.pivot_table(
             category_declarations,
             index=[

{ositah-24.8.dev1 → ositah-24.9.dev1}/ositah/utils/agents.py

@@ -64,8 +64,9 @@ def get_agents(period_date: str, team: str = None) -> pd.DataFrame:
         # agent_list = agent_list.loc[(agent_list.archive == 0) |
         #                          (agent_list.date_fin >= start_date.date().isoformat())]
         if team and team != TEAM_LIST_ALL_AGENTS:
-            #agent_list = agent_list[agent_list["team"].str.match(team, case=False, na=False)]
-            agent_list = agent_list[agent_list.team.notna() & agent_list[columns["team"]].str.match(team)]
+            agent_list = agent_list[
+                agent_list.team.notna() & agent_list[columns["team"]].str.match(team)
+            ]
         else:
             # If the agent doesn't belong to a team, set team to an empty string rather than None
             agent_list.loc[agent_list.team.isna(), "team"] = ""

{ositah-24.8.dev1 → ositah-24.9.dev1}/ositah/utils/projects.py

@@ -367,7 +367,7 @@ def get_team_projects(
                 columns["email"],
             ],
             values=[columns["hours"], columns["quotite"]],
-            aggfunc={columns["hours"]: np.sum, columns["quotite"]: np.mean},
+            aggfunc={columns["hours"]: "sum", columns["quotite"]: "mean"},
         )
         declarations = pd.DataFrame(global_declarations_pt.to_records())
         declarations[[columns["masterproject"], columns["project"]]] = declarations[
@@ -519,7 +519,7 @@ def build_projects_data(team, team_selection_date, period_date: str, source):
                 columns["category"],
             ],
             values=[columns["hours"]],
-            aggfunc={columns["hours"]: np.sum},
+            aggfunc={columns["hours"]: "sum"},
         )
         projects_data = pd.DataFrame(projects_data_pt.to_records())
         projects_data[columns["hours"]] = np.round(projects_data[columns["hours"]]).astype("int")

{ositah-24.8.dev1 → ositah-24.9.dev1/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.8.dev1
+Version: 24.9.dev1
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License
@@ -13,15 +13,16 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: blinker
-Requires-Dist: dash
+Requires-Dist: dash>=2.17
 Requires-Dist: dash-bootstrap-components
-Requires-Dist: flask~=2.2
+Requires-Dist: flask
 Requires-Dist: flask-multipass
 Requires-Dist: flask-sqlalchemy~=3.0
 Requires-Dist: flask-wtf
-Requires-Dist: hito-tools>=23.2
-Requires-Dist: pandas==2.*
+Requires-Dist: hito-tools>=24.8
+Requires-Dist: pandas>=2.2
 Requires-Dist: pymysql
+Requires-Dist: python>=3.9
 Requires-Dist: python-ldap
 Requires-Dist: pyyaml
 Requires-Dist: simplejson

{ositah-24.8.dev1 → ositah-24.9.dev1}/ositah.egg-info/requires.txt

@@ -1,13 +1,14 @@
 blinker
-dash
+dash>=2.17
 dash-bootstrap-components
-flask~=2.2
+flask
 flask-multipass
 flask-sqlalchemy~=3.0
 flask-wtf
-hito-tools>=23.2
-pandas==2.*
+hito-tools>=24.8
+pandas>=2.2
 pymysql
+python>=3.9
 python-ldap
 pyyaml
 simplejson

{ositah-24.8.dev1 → ositah-24.9.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.8.dev1"
+version = "24.9.dev1"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -15,15 +15,16 @@ classifiers = [
 ]
 dependencies = [
     "blinker",
-    "dash",
+    "dash>=2.17",
     "dash-bootstrap-components",
-    "flask~=2.2",
+    "flask",
     "flask-multipass",
     "flask-sqlalchemy~=3.0",
     "flask-wtf",
-    "hito-tools>=23.2",
-    "pandas==2.*",
+    "hito-tools>=24.8",
+    "pandas>=2.2",
     "pymysql",
+    "python>=3.9",
     "python-ldap",
     "pyyaml",
     "simplejson",