Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions bot/code_review_bot/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import atexit
import collections
import fnmatch
import importlib.metadata
import os
import shutil
import tempfile
from pathlib import Path

import pkg_resources
import structlog

REPO_MOZILLA_CENTRAL = "https://hg.mozilla.org/mozilla-central"
Expand Down Expand Up @@ -70,7 +70,7 @@ def __init__(self):
# Always cleanup at the end of the execution
atexit.register(self.cleanup)
# caching the versions of the app
self.version = pkg_resources.require("code-review-bot")[0].version
self.version = importlib.metadata.version("code-review-bot")

def setup(
self,
Expand Down
4 changes: 2 additions & 2 deletions bot/code_review_bot/tools/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import importlib.metadata
import logging
import logging.handlers
import os
import re

import pkg_resources
import sentry_sdk
import structlog
from sentry_sdk.integrations.logging import LoggingIntegration
Expand Down Expand Up @@ -116,7 +116,7 @@ def setup_sentry(name, channel, dsn):
integrations=[sentry_logging],
server_name=name,
environment=channel,
release=pkg_resources.get_distribution(f"code-review-{name}").version,
release=importlib.metadata.version(f"code-review-{name}"),
before_send=remove_color_codes,
)
sentry_sdk.set_tag("site", site)
Expand Down
4 changes: 2 additions & 2 deletions tools/code_review_tools/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import importlib.metadata
import logging
import logging.handlers
import os
import re

import pkg_resources
import sentry_sdk
import structlog
from sentry_sdk.integrations.logging import LoggingIntegration
Expand Down Expand Up @@ -116,7 +116,7 @@ def setup_sentry(name, channel, dsn):
integrations=[sentry_logging],
server_name=name,
environment=channel,
release=pkg_resources.get_distribution(f"code-review-{name}").version,
release=importlib.metadata.version(f"code-review-{name}"),
before_send=remove_color_codes,
)
sentry_sdk.set_tag("site", site)
Expand Down