From c04008b8a4f0483386b10deda62c2db1918b9c12 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Wed, 7 May 2025 11:16:49 +0100
Subject: [PATCH] Use backports.zoneinfo in job_metrics package under Python
 <3.9

Fix import errors in test_galaxy_packages_for_pulsar tests.
---
 lib/galaxy/job_metrics/instrumenters/core.py | 7 ++++++-
 packages/job_metrics/setup.cfg               | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/galaxy/job_metrics/instrumenters/core.py b/lib/galaxy/job_metrics/instrumenters/core.py
index fb259035562..cd9e94f968d 100644
--- a/lib/galaxy/job_metrics/instrumenters/core.py
+++ b/lib/galaxy/job_metrics/instrumenters/core.py
@@ -3,7 +3,6 @@
 import datetime
 import json
 import logging
-import zoneinfo
 from typing import (
     Any,
     Dict,
@@ -19,6 +18,12 @@ from ..formatting import (
 )
 from ..safety import Safety
 
+try:
+    import zoneinfo
+except ImportError:
+    # Python < 3.9
+    from backports import zoneinfo  # type: ignore[no-redef]
+
 log = logging.getLogger(__name__)
 
 GALAXY_SLOTS_KEY = "galaxy_slots"
diff --git a/packages/job_metrics/setup.cfg b/packages/job_metrics/setup.cfg
index 42bf09b8b01..c45fa509db0 100644
--- a/packages/job_metrics/setup.cfg
+++ b/packages/job_metrics/setup.cfg
@@ -35,6 +35,7 @@ version = 25.0.dev0
 include_package_data = True
 install_requires =
     galaxy-util
+    backports.zoneinfo;python_version<'3.9'
 packages = find:
 python_requires = >=3.7