Merge pull request #54 from ArcanaFramework/forward-ref-to-mime

Adds FileSet.move method

Author: tclose

.github/workflows/ci-cd.yml

@@ -41,7 +41,11 @@ jobs:
     - name: Update build tools
       run: python3 -m pip install --upgrade pip
     - name: Install Package
-      run: python3 -m pip install -e .[test] -e ./extras[test]
+      run: python3 -m pip install -e .[test]
+    - name: Install Extras Package
+      run: python3 -m pip install -e ./extras[test]
+    - name: Change out of root directory
+      run: cd docs
     - name: Pytest
       run: pytest -vvs --cov fileformats --cov-config .coveragerc --cov-report xml .
     - name: Upload coverage to Codecov

extras/fileformats/extras/image/__init__.py

@@ -1,3 +1,3 @@
-from ..core import __version__
+from fileformats.core import __version__
 from .converters import *
 from .readwrite import *

fileformats/application/serialization.py

@@ -2,11 +2,11 @@
 import typing as ty
 from random import Random
 from pathlib import Path
-from ..core import hook, DataType, FileSet
-from ..core.mixin import WithClassifiers
+from fileformats.core import hook, DataType, FileSet
+from fileformats.core.mixin import WithClassifiers
 from ..generic import File
-from ..core.exceptions import FormatMismatchError
-from ..core.utils import gen_filename
+from fileformats.core.exceptions import FormatMismatchError
+from fileformats.core.utils import gen_filename
 
 
 class Schema(DataType):

fileformats/core/converter.py

@@ -1,12 +1,15 @@
 from abc import ABCMeta
 import typing as ty
+import logging
 import attrs
-from .utils import describe_task
+from .utils import describe_task, matching_source
 from .exceptions import FileFormatsError
 
 if ty.TYPE_CHECKING:
     from .datatype import DataType
 
+logger = logging.getLogger("fileformats")
+
 
 @attrs.define
 class ConverterWrapper:
@@ -106,11 +109,10 @@ def register_converter(
         ----------
         source_format : type
             the source format to register a converter from
-        task_spec : ty.Callable
-            a callable that resolves to a Pydra task
-        converter_kwargs : dict
-            additional keyword arguments to be passed to the task spec at initialisation
-            time
+        converter_tuple
+            a tuple consisting of a `task_spec` callable that resolves to a Pydra task
+            and a dictionary of keyword arguments to be passed to the task spec at
+            initialisation time
 
         Raises
         ------
@@ -134,12 +136,19 @@ def register_converter(
         ]
         assert len(prev_registered) <= 1
         if prev_registered:
-            prev = prev_registered[0]
-            prev_task = cls.converters[prev][0]
+            prev_tuple = cls.converters[prev_registered[0]]
+            task, task_kwargs = converter_tuple
+            prev_task, prev_kwargs = prev_tuple
+            if matching_source(task, prev_task) and task_kwargs == prev_kwargs:
+                logger.warning(
+                    "Ignoring duplicate registrations of the same converter %s",
+                    describe_task(task),
+                )
+                return  # actually the same task but just imported twice for some reason
             raise FileFormatsError(
-                f"There is already a converter registered from {prev} "
-                f"to the generic type '{tuple(prev.wildcard_classifiers())[0]}':"
-                f"{describe_task(prev_task)}"
+                f"Cannot register converter from {source_format} to the generic type "
+                f"'{tuple(prev_task.wildcard_classifiers())[0]}', {describe_task(task)} "
+                f"because there is already one registered, {describe_task(prev_task)}"
             )
 
         cls.converters[source_format] = converter_tuple