Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ebi-search-dump-migration
Browse files Browse the repository at this point in the history
# Conflicts:
#	emgcli/__init__.py
#	pyproject.toml
  • Loading branch information
SandyRogers committed Jan 3, 2024
2 parents 6b40098 + ea05f7b commit 480d951
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion emgcli/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__: str = "2.4.39"
__version__: str = "2.4.40"
8 changes: 6 additions & 2 deletions emgcli/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@
'()': 'django.utils.log.CallbackFilter',
'callback': lambda record: "v1/utils/myaccounts" not in record.getMessage(),
},
'exclude_token_verification': {
'()': 'django.utils.log.CallbackFilter',
'callback': lambda record: "v1/utils/token/verify" not in record.getMessage(),
},
},
'formatters': {
'default': {
Expand Down Expand Up @@ -136,13 +140,13 @@
'handlers': ['default'],
'level': 'INFO',
'propagate': False,
'filters': ['exclude_myaccounts'],
'filters': ['exclude_myaccounts', 'exclude_token_verification'],
},
'django.server': {
'handlers': ['default'],
'level': 'INFO',
'propagate': False,
'filters': ['exclude_myaccounts'],
'filters': ['exclude_myaccounts', 'exclude_token_verification'],
},
'django': {
'handlers': ['null'],
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ max-line-length = 119
"""

[tool.bumpversion]
current_version = "2.4.39"
current_version = "2.4.40"

[[tool.bumpversion.files]]
filename = "emgcli/__init__.py"

0 comments on commit 480d951

Please sign in to comment.