diff --git a/requirements.txt b/requirements.txt index 11583fea4..53f9522cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ pyyaml fire terminaltables requests -click==8.0.4 +click diff --git a/sahi/scripts/coco_error_analysis.py b/sahi/scripts/coco_error_analysis.py index d71668c3a..ecaad70f6 100644 --- a/sahi/scripts/coco_error_analysis.py +++ b/sahi/scripts/coco_error_analysis.py @@ -248,8 +248,8 @@ def _analyze_individual_category(k, cocoDt, cocoGt, catId, iou_type, areas=None, cocoEval.params.useCats = 1 if areas: cocoEval.params.areaRng = [ - [0 ** 2, areas[2]], - [0 ** 2, areas[0]], + [0**2, areas[2]], + [0**2, areas[0]], [areas[0], areas[1]], [areas[1], areas[2]], ] @@ -271,8 +271,8 @@ def _analyze_individual_category(k, cocoDt, cocoGt, catId, iou_type, areas=None, cocoEval.params.useCats = 1 if areas: cocoEval.params.areaRng = [ - [0 ** 2, areas[2]], - [0 ** 2, areas[0]], + [0**2, areas[2]], + [0**2, areas[0]], [areas[0], areas[1]], [areas[1], areas[2]], ] @@ -328,8 +328,8 @@ def _analyse_results( cocoEval.params.maxDets = [max_detections] if areas is not None: cocoEval.params.areaRng = [ - [0 ** 2, areas[2]], - [0 ** 2, areas[0]], + [0**2, areas[2]], + [0**2, areas[0]], [areas[0], areas[1]], [areas[1], areas[2]], ] diff --git a/sahi/scripts/coco_evaluation.py b/sahi/scripts/coco_evaluation.py index c6b31e6dc..9cc308c3e 100644 --- a/sahi/scripts/coco_evaluation.py +++ b/sahi/scripts/coco_evaluation.py @@ -133,8 +133,8 @@ def evaluate_core( cocoEval = COCOeval(cocoGt, cocoDt, iou_type) if areas is not None: cocoEval.params.areaRng = [ - [0 ** 2, areas[2]], - [0 ** 2, areas[0]], + [0**2, areas[2]], + [0**2, areas[0]], [areas[0], areas[1]], [areas[1], areas[2]], ] diff --git a/setup.py b/setup.py index 7930ed089..bcde9dc13 100644 --- a/setup.py +++ b/setup.py @@ -36,9 +36,9 @@ def get_version(): python_requires=">=3.6", install_requires=get_requirements(), extras_require={ - "tests": ["mmdet==2.25.1", "pycocotools==2.0.5"], + "tests": ["mmdet==2.28.1", "pycocotools==2.0.6"], "dev": [ - "black==21.7b0", + "black==22.3.0", "flake8==3.9.2", "importlib-metadata>=1.1.0,<4.3;python_version<'3.8'", "isort==5.9.2", @@ -51,7 +51,6 @@ def get_version(): "Intended Audience :: Developers", "Intended Audience :: Science/Research", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9",