Revert pythonjsonlogger import change

This was added in #200 but appears to be from a version of python-json-logger we aren't using yet - so was premature.
communitiesuk · Dec 23, 2024 · f9e0f6a · f9e0f6a
1 parent 753dc9f
commit f9e0f6a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 6.0.1
+
+* Revert: "Fix a DeprecationWarning from pythonjsonlogger" which actually broke things
+
 ### 6.0.0
 
 * Removes `locale_selector` module, which has now been lifted directly into `pre-award-frontend` (and modified to support `host_matching` mode).

diff --git a/fsd_utils/logging/logging.py b/fsd_utils/logging/logging.py
@@ -10,7 +10,11 @@
 
 from flask import Flask, current_app, request
 from flask.ctx import has_request_context
-from pythonjsonlogger.json import JsonFormatter as BaseJSONFormatter
+
+try:
+    from pythonjsonlogger.json import JsonFormatter as BaseJSONFormatter
+except ImportError:
+    from pythonjsonlogger.jsonlogger import JsonFormatter as BaseJSONFormatter
 
 # Log formats can use any attributes available in
 # https://docs.python.org/3/library/logging.html#logrecord-attributes

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "funding-service-design-utils"
 
-version = "6.0.0"
+version = "6.0.1"
 
 authors = [
   { name="MHCLG", email="FundingService@communities.gov.uk" },

diff --git a/uv.lock b/uv.lock