removed py36 compat stuff

neuro-ml · Jun 27, 2023 · 5bff8d5 · 5bff8d5
1 parent 9713985
commit 5bff8d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/connectome/interface/compat.py b/connectome/interface/compat.py
diff --git a/connectome/interface/metaclasses.py b/connectome/interface/metaclasses.py
@@ -3,14 +3,13 @@
 
 from ..layers import CallableLayer, Layer
 from ..utils import MultiDict
-from .compat import SafeMeta
 from .factory import GraphFactory, SourceFactory, TransformFactory, add_from_mixins, add_quals, items_to_container
 
 logger = logging.getLogger(__name__)
 BASES: Dict[Type[Layer], GraphFactory] = {}
 
 
-class APIMeta(SafeMeta):
+class APIMeta(type):
     @classmethod
     def __prepare__(mcs, *args, **kwargs):
         return MultiDict()

diff --git a/connectome/layers/base.py b/connectome/layers/base.py
@@ -82,7 +82,7 @@ def _decorate(self, inputs: StringsLike, outputs: StringsLike = None, final: Str
         def decorator(func: Callable) -> Callable:
             loopback = self._container.loopback(func, inputs, outputs).compile()
             logger.info('Loopback compiled: %s', loopback.fields())
-            return loopback[final]
+            return loopback.compile(final)
 
         return decorator
 

diff --git a/tests/test_interface/test_interface.py b/tests/test_interface/test_interface.py
@@ -139,7 +139,8 @@ def test_optional(block_maker):
     assert optional.first_optional(10) == 11
     assert optional.second_optional(10) == '10'
 
-    func = optional._container.loopback(lambda x: x, 'first_optional', 'first_optional').compile()['first_optional']
+    func = optional._container.loopback(
+        lambda x: x, 'first_optional', 'first_optional').compile().compile('first_optional')
     assert func(100500) == 100500