Skip to content

Commit dd5926a

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
check black version; lint codebase (fix #322, fix #323)
Summary: Pull Request resolved: fairinternal/detectron2#330 Differential Revision: D18525378 Pulled By: ppwwyyxx fbshipit-source-id: 5b25d0a214cf41bac63157104d5dae5e7923b81d
1 parent 2ba15a1 commit dd5926a

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

detectron2/data/catalog.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ def register(name, func):
3535
func (callable): a callable which takes no arguments and returns a list of dicts.
3636
"""
3737
assert callable(func), "You must register a function with `DatasetCatalog.register`!"
38-
assert name not in DatasetCatalog._REGISTERED, "Dataset '{}' is already registered!".format(name)
38+
assert name not in DatasetCatalog._REGISTERED, "Dataset '{}' is already registered!".format(
39+
name
40+
)
3941
DatasetCatalog._REGISTERED[name] = func
4042

4143
@staticmethod

detectron2/engine/defaults.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,10 @@ def test(cls, cfg, model, evaluators=None):
456456
try:
457457
evaluator = cls.build_evaluator(cfg, dataset_name)
458458
except NotImplementedError:
459-
logger.warn("No evaluator found. Use `DefaultTrainer.test(evaluators=)`, "
460-
"or implement its `build_evaluator` method.")
459+
logger.warn(
460+
"No evaluator found. Use `DefaultTrainer.test(evaluators=)`, "
461+
"or implement its `build_evaluator` method."
462+
)
461463
results[dataset_name] = {}
462464
continue
463465
results_i = inference_on_dataset(model, data_loader, evaluator)

dev/linter.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
#!/bin/bash -ev
1+
#!/bin/bash -e
22
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
33

44
# Run this script at project root by "./dev/linter.sh" before you commit
55

6+
{
7+
black --version | grep "19.3b0" > /dev/null
8+
} || {
9+
echo "Linter requires black==19.3b0 !"
10+
exit 1
11+
}
12+
13+
set -v
14+
615
echo "Running isort ..."
716
isort -y --multi-line 3 --trailing-comma -sp . --skip datasets --skip docs --skip-glob '*/__init__.py' --atomic
817

0 commit comments

Comments
 (0)