Skip to content

Commit b213b39

Browse files
authored
Remove 'tools' subdirectory, merge into 'bot' (#2975)
1 parent ba721cf commit b213b39

File tree

11 files changed

+28
-81
lines changed

11 files changed

+28
-81
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,3 @@ updates:
1414
open-pull-requests-limit: 99
1515
labels:
1616
- bot
17-
- package-ecosystem: pip
18-
directory: "/tools"
19-
schedule:
20-
interval: weekly
21-
open-pull-requests-limit: 99
22-
labels:
23-
- tools

.taskcluster.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ tasks:
9494
- -lxce
9595
- "git clone --quiet ${repository} /src && cd /src && git checkout ${head_rev} -b checks &&
9696
/src/bot/ci/bootstrap.sh &&
97-
cd /src/tools && pip3 install --disable-pip-version-check --no-cache-dir --quiet . &&
9897
cd /src/bot && pip3 install --disable-pip-version-check --no-cache-dir --quiet . && pip3 install --disable-pip-version-check --no-cache-dir --quiet -r requirements-dev.txt &&
9998
pytest -v"
10099
metadata:

bot/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
FROM python:3.14.3-slim
22

3-
ADD tools /src/tools
43
ADD bot /src/bot
54

65
RUN /src/bot/ci/bootstrap.sh
76

8-
RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet .
97
RUN cd /src/bot && pip install --disable-pip-version-check --no-cache-dir --quiet .
108

119
CMD ["code-coverage-bot"]

bot/code_coverage_bot/__init__.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,27 @@
22
# This Source Code Form is subject to the terms of the Mozilla Public
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
5+
6+
COVERAGE_EXTENSIONS = [
7+
# C
8+
"c",
9+
"h",
10+
# C++
11+
"cpp",
12+
"cc",
13+
"cxx",
14+
"hh",
15+
"hpp",
16+
"hxx",
17+
# JavaScript
18+
"js",
19+
"jsm",
20+
"mjs",
21+
"jsx",
22+
"xul",
23+
"xml",
24+
"html",
25+
"xhtml",
26+
# Rust
27+
"rs",
28+
]

bot/code_coverage_bot/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from code_coverage_bot.secrets import secrets
1212
from code_coverage_bot.taskcluster import taskcluster_config
1313
from code_coverage_bot.libmozdata import setup as setup_libmozdata
14-
from code_coverage_tools.log import init_logger
14+
from code_coverage_bot.log import init_logger
1515

1616

1717
def setup_cli(parameters=True):

bot/code_coverage_bot/phabricator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from libmozdata.phabricator import PhabricatorRevisionNotFoundException
1717

1818
from code_coverage_bot.secrets import secrets
19-
from code_coverage_tools import COVERAGE_EXTENSIONS
19+
from code_coverage_bot import COVERAGE_EXTENSIONS
2020

2121
logger = structlog.get_logger(__name__)
2222

bot/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
-e ../tools #egg=code-coverage-tools
21
google-cloud-storage==3.9.0
32
libmozdata==0.2.12
43
pytz==2026.1.post1
54
pyyaml==6.0.3
5+
sentry-sdk==2.54.0
6+
structlog==25.5.0
67
taskcluster==97.0.1
78
tenacity==9.1.4
89
tqdm==4.67.3

tools/code_coverage_tools/__init__.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

tools/requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)