From 15ebb1b3d8cf097fd066fe0b6e63988189ac07b6 Mon Sep 17 00:00:00 2001 From: Seher Karakuzu Date: Mon, 15 Apr 2024 16:49:09 -0400 Subject: [PATCH] some more fix --- .mypy.ini | 2 +- tiled/_tests/test_protocols.py | 2 +- tiled/adapters/protocols.py | 6 ++++-- tiled/adapters/type_alliases.py | 5 ++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mypy.ini b/.mypy.ini index 74e018262..fd2f013a1 100644 --- a/.mypy.ini +++ b/.mypy.ini @@ -16,7 +16,7 @@ disallow_incomplete_defs = True disallow_untyped_calls = True disallow_untyped_decorators = True -[mypy-tiled._tests.test_protocols.py] +[mypy-tiled._tests.test_protocols] ignore_errors = False ignore_missing_imports = False check_untyped_defs = True diff --git a/tiled/_tests/test_protocols.py b/tiled/_tests/test_protocols.py index aaeb10815..bcccf54b8 100644 --- a/tiled/_tests/test_protocols.py +++ b/tiled/_tests/test_protocols.py @@ -11,7 +11,7 @@ class MyArrayAdapter: - structure_family = Literal[StructureFamily.array] + structure_family: Literal[StructureFamily.array] = StructureFamily.array def __init__( self, diff --git a/tiled/adapters/protocols.py b/tiled/adapters/protocols.py index c2f35d5c1..a844c8536 100644 --- a/tiled/adapters/protocols.py +++ b/tiled/adapters/protocols.py @@ -1,6 +1,6 @@ import collections.abc from abc import abstractmethod -from typing import Any, Dict, List, Optional, Protocol, Tuple, Union +from typing import Any, Dict, List, Literal, Optional, Protocol, Tuple, Union import pandas import sparse @@ -9,7 +9,7 @@ from ..server.schemas import Principal from ..structures.array import ArrayStructure from ..structures.awkward import AwkwardStructure -from ..structures.core import Spec +from ..structures.core import Spec, StructureFamily from ..structures.sparse import SparseStructure from ..structures.table import TableStructure from .type_alliases import JSON, Filters, NDSlice, Scopes @@ -32,6 +32,8 @@ def structure(self) -> None: class ArrayAdapter(BaseAdapter, Protocol): + structure_family: Literal[StructureFamily.array] + @abstractmethod def structure(self) -> ArrayStructure: pass diff --git a/tiled/adapters/type_alliases.py b/tiled/adapters/type_alliases.py index 43680dae9..2a6eeeada 100644 --- a/tiled/adapters/type_alliases.py +++ b/tiled/adapters/type_alliases.py @@ -3,11 +3,10 @@ if sys.version_info < (3, 10): from enum import Enum - class EllipsisType(Enum): + class ellipsis(Enum): Ellipsis = "..." - Ellipsis = ellipsis.Ellipsis - EllipsisType = type(Ellipsis) + EllipsisType = ellipsis.Ellipsis else: from types import EllipsisType