ositah 25.9.dev1__tar.gz → 25.9.dev2__tar.gz

{ositah-25.9.dev1 → ositah-25.9.dev2}/.gitlab-ci.yml

@@ -9,7 +9,6 @@ build:
         - python -m venv .venv
         - . .venv/bin/activate
         - python -m ensurepip
-        - pip install nox pyproject-parser consolekit
+        - pip install nox validate-pyproject consolekit
         - nox -s lint
-        - pyproject-parser check
-        - pyproject-parser reformat
+        - validate-pyproject pyproject.toml

{ositah-25.9.dev1/ositah.egg-info → ositah-25.9.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ositah
-Version: 25.9.dev1
+Version: 25.9.dev2
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License-Expression: BSD-3-Clause

{ositah-25.9.dev1 → ositah-25.9.dev2}/ositah/apps/export.py

@@ -1096,7 +1096,8 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                         (
                             f"Declaration {http_status} for user {row.email_auth} (NSIP ID:"
                             f" {row.email_reseda}), {'project' if project_type else 'reference'}"
-                            f" ID {int(activity_id)} {action} NSIP"
+                            f" ID={int(activity_id)}, master={row.nsip_master}, name="
+                            f"{row.nsip_project} {action} NSIP"
                         ),
                         flush=True,
                     )
@@ -1111,8 +1112,9 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                         (
                             f"ERROR: update of declaration failed for user {row.email_auth}"
                             f" (NSIP ID: {row.email_reseda}),"
-                            f" {'project' if project_type else 'reference'} ID"
-                            f" {int(activity_id)}{http_error}"
+                            f" {'project' if project_type else 'reference'} ID="
+                            f"{int(activity_id)}, master={row.nsip_master}, name="
+                            f"{row.nsip_project}{http_error}"
                         ),
                         flush=True,
                     )
@@ -1121,8 +1123,7 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                     # message
                     if failed_exports < EXPORT_MAX_FAILDED_UPDATES:
                         failed_updates.append(
-                            f"{row.email_auth}/{'projet' if project_type else 'reference'}"
-                            f"/{int(activity_id)}"
+                            f"{row.email_auth}:{row.nsip_master}/{row.nsip_project}"
                         )
                     elif failed_exports == EXPORT_MAX_FAILDED_UPDATES:
                         failed_updates.append("...")

{ositah-25.9.dev1 → ositah-25.9.dev2}/ositah/utils/projects.py

@@ -745,6 +745,7 @@ def get_nsip_declarations(period_date: str, team: str):
             declarations["project.id"] = declarations["project.id"].astype(int)
         else:
             declarations["project.id"] = 0
+            declarations["project.name"] = np.NaN
         if "reference.id" in declarations.columns:
             declarations.loc[declarations["reference.id"].isna(), "reference.id"] = 0
             declarations["reference.id"] = declarations["reference.id"].astype(int)

{ositah-25.9.dev1 → ositah-25.9.dev2/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ositah
-Version: 25.9.dev1
+Version: 25.9.dev2
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License-Expression: BSD-3-Clause

{ositah-25.9.dev1 → ositah-25.9.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "25.9.dev1"
+version = "25.9.dev2"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.9"