Merge branch 'master' into da/slice-support

Author: ardila

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 jobs:
   build_test:
     docker:
-      - image: python:3.9-slim-buster
+      - image: python:3.6-slim-buster
     resource_class: small
     steps:
       - checkout # checkout source code to working directory

nucleus/annotation.py

@@ -113,7 +113,7 @@ class AnnotationTypes(Enum):
     POLYGON = POLYGON_TYPE
 
 
-@dataclass
+@dataclass  # pylint: disable=R0902
 class BoxAnnotation(Annotation):  # pylint: disable=R0902
     label: str
     x: Union[float, int]

nucleus/prediction.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Dict, Optional, List, Any
 from .annotation import (
     BoxAnnotation,
@@ -30,7 +28,7 @@ class SegmentationPrediction(SegmentationAnnotation):
     # No need to define init or to_payload methods because
     # we default to functions defined in the parent class
     @classmethod
-    def from_json(cls, payload: dict) -> SegmentationPrediction:
+    def from_json(cls, payload: dict):
         return cls(
             mask_url=payload[MASK_URL_KEY],
             annotations=[
@@ -78,7 +76,7 @@ def to_payload(self) -> dict:
         return payload
 
     @classmethod
-    def from_json(cls, payload: dict) -> BoxPrediction:
+    def from_json(cls, payload: dict):
         geometry = payload.get(GEOMETRY_KEY, {})
         return cls(
             label=payload.get(LABEL_KEY, 0),
@@ -123,7 +121,7 @@ def to_payload(self) -> dict:
         return payload
 
     @classmethod
-    def from_json(cls, payload: dict) -> PolygonPrediction:
+    def from_json(cls, payload: dict):
         geometry = payload.get(GEOMETRY_KEY, {})
         return cls(
             label=payload.get(LABEL_KEY, 0),

pyproject.toml

@@ -36,6 +36,10 @@ python = "^3.6"
 grequests = "^0.6.0"
 requests = "^2.25.1"
 tqdm = "^4.60.0"
+boto3 = "^1.17.53"
+mypy = "^0.812"
+coverage = "^5.5"
+dataclasses = { version = "^0.7", python = "^3.6.1, <3.7" }
 
 [tool.poetry.dev-dependencies]
 poetry = "^1.1.5"