Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: merge main to release #8332

Merged
merged 9 commits into from
Dec 12, 2024
Merged

ci: merge main to release #8332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
167752b
feat: log ASN (#8309)
jennifer-richards Dec 6, 2024
3055d17
fix: remove unreliable statistics (#8307)
rjsparks Dec 9, 2024
2ec7a71
chore: remove unused setting from various settings_local templates (#…
rjsparks Dec 9, 2024
6f1c308
chore: drop unused cf-connecting-ipv6 header (#8319)
jennifer-richards Dec 9, 2024
8e32582
chore: pin django-oidc-provider until we can adapt to changes in 0.8.…
rjsparks Dec 10, 2024
6b77807
ci: update base image target version to 20241210T1557
rjsparks Dec 10, 2024
9b372a3
chore: update import for python-json-logger (#8330)
jennifer-richards Dec 12, 2024
a2f27d3
ci: update base image target version to 20241212T1741
rjsparks Dec 12, 2024
ec67f34
ci: merge release to main (#8331)
rjsparks Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: update import for python-json-logger (#8330) 
The "jsonlogger" module became "json" in 3.1.0
  • Loading branch information
@jennifer-richards
jennifer-richards authored Dec 12, 2024
commit 9b372a31b4c70a031bb20a1cb2ee8189551d01ce
4 changes: 2 additions & 2 deletions ietf/utils/jsonlogger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright The IETF Trust 2024, All Rights Reserved
from pythonjsonlogger import jsonlogger
from pythonjsonlogger.json import JsonFormatter
import time


class DatatrackerJsonFormatter(jsonlogger.JsonFormatter):
class DatatrackerJsonFormatter(JsonFormatter):
converter = time.gmtime # use UTC
default_msec_format = "%s.%03d" # '.' instead of ','

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pyopenssl>=22.0.0 # Used by urllib3.contrib, which is used by PyQuery but not
pyquery>=1.4.3
python-dateutil>=2.8.2
types-python-dateutil>=2.8.2
python-json-logger>=2.0.7
python-json-logger>=3.1.0
python-magic==0.4.18 # Versions beyond the yanked .19 and .20 introduce form failures
pymemcache>=4.0.0 # for django.core.cache.backends.memcached.PyMemcacheCache
python-mimeparse>=1.6 # from TastyPie
Expand Down
Loading