moved testing_subpackage to vendor.testing

Author: tclose

extras/fileformats/extras/image/tests/test_image_converters.py

@@ -1,17 +1,16 @@
-# import sys
 import pytest
-from imageio.core.fetching import get_remote_file
 from fileformats.image import Bitmap, Gif, Jpeg, Png, Tiff
+from imageio.core.fetching import get_remote_file
 
 
 @pytest.fixture(scope="session")
 def jpg() -> Jpeg:
-    # imageio.imread("imageio:bricks.jpg")
     return Jpeg(get_remote_file("images/bricks.jpg"))
 
 
 @pytest.fixture(scope="session")
 def png() -> Png:
+
     return Png(get_remote_file("images/chelsea.png"))
 
 

fileformats/core/identification.py

@@ -21,11 +21,15 @@
     "multipart",
     "text",
     "video",
+    "vendor.ms_excel",
+    "vendor.ms_powerpoint",
+    "vendor.ms_word",
+    "vendor.openxmlformats_officedocument",
 ]
 ALL_STANDARD_TYPE_REGISTRIES = IANA_MIME_TYPE_REGISTRIES + [
     "field",
     "testing",
-    "testing_subpackage",
+    "vendor.testing",
 ]
 
 

fileformats/core/tests/test_mime.py

@@ -2,7 +2,7 @@
 from fileformats.core.identification import from_mime
 from fileformats.generic import DirectoryOf, FileSet
 from fileformats.testing import Classified, U, V
-from fileformats.testing_subpackage import Psi, SubpackageClassified, Theta, Zeta
+from fileformats.vendor.testing.testing import Psi, VendorClassified, Theta, Zeta
 from fileformats.vendor.openxmlformats_officedocument.application import (
     Wordprocessingml_Document,
 )
@@ -24,40 +24,43 @@ def test_mimelike_roundtrip() -> None:
         assert reloaded is klass
 
 
-def test_subpackage_to_mime_roundtrip() -> None:
-    assert Psi.mime_like == "testing-subpackage/psi"
-    assert from_mime("testing-subpackage/psi") is Psi
+def test_vendor_to_mime_roundtrip() -> None:
+    assert Psi.mime_like == "testing/vnd.testing.psi"
+    assert from_mime("testing/vnd.testing.psi") is Psi
 
 
-def test_subpackage_to_mime_classified_rountrip() -> None:
+def test_vendor_to_mime_classified_rountrip() -> None:
     assert (
-        SubpackageClassified[Zeta, Theta].mime_like
-        == "testing-subpackage/theta..zeta+subpackage-classified"
+        VendorClassified[Zeta, Theta].mime_like
+        == "testing/[vnd.testing.theta..vnd.testing.zeta]+vnd.testing.vendor-classified"
     )
     assert (
-        from_mime("testing-subpackage/theta..zeta+subpackage-classified")
-        is SubpackageClassified[Zeta, Theta]
+        from_mime(
+            "testing/[vnd.testing.theta..vnd.testing.zeta]+vnd.testing.vendor-classified"
+        )
+        is VendorClassified[Zeta, Theta]
     )
 
 
-def test_subpackage_to_mime_parent_classified_rountrip() -> None:
+def test_vendor_to_mime_parent_classified_rountrip() -> None:
     assert (
-        Classified[Zeta, Theta].mime_like == "testing-subpackage/theta..zeta+classified"
+        Classified[Zeta, Theta].mime_like
+        == "testing/[vnd.testing.theta..vnd.testing.zeta]+classified"
     )
     assert (
-        from_mime("testing-subpackage/theta..zeta+classified")
+        from_mime("testing/[vnd.testing.theta..vnd.testing.zeta]+classified")
         is Classified[Zeta, Theta]
     )
 
 
-def test_subpackage_to_mime_parent_classifiers_rountrip() -> None:
+def test_vendor_to_mime_parent_classifiers_rountrip() -> None:
     assert (
-        SubpackageClassified[U, V].mime_like
-        == "testing-subpackage/u..v+subpackage-classified"
+        VendorClassified[U, V].mime_like
+        == "testing/[u..v]+vnd.testing.vendor-classified"
     )
     assert (
-        from_mime("testing-subpackage/u..v+subpackage-classified")
-        is SubpackageClassified[U, V]
+        from_mime("testing/[u..v]+vnd.testing.vendor-classified")
+        is VendorClassified[U, V]
     )
 
 

fileformats/core/utils.py

@@ -1,5 +1,6 @@
 import importlib
 import inspect
+import itertools
 import logging
 import os
 import pkgutil
@@ -11,6 +12,7 @@
 from types import ModuleType
 
 import fileformats.core
+import fileformats.vendor
 from fileformats.core.exceptions import FormatDefinitionError
 
 from .typing import FspathsInputType
@@ -22,7 +24,7 @@
     [
         "core",
         "testing",
-        "testing_subpackage",
+        "vendor.testing",
         "serialization",
         "archive",
         "document",
@@ -65,10 +67,19 @@ def subpackages(
     module
         all modules within the package
     """
-    for mod_info in pkgutil.iter_modules(
-        fileformats.__path__, prefix=fileformats.__package__ + "."
+    for mod_info in itertools.chain(
+        pkgutil.iter_modules(
+            fileformats.__path__, prefix=fileformats.__package__ + "."
+        ),
+        pkgutil.iter_modules(
+            fileformats.vendor.__path__,
+            prefix=fileformats.vendor.__package__ + ".",
+        ),
     ):
-        if mod_info.name.split(".")[-1] in exclude:
+        parts = mod_info.name.split(".")
+        if parts[-1] in exclude or (
+            parts[1] == "vendor" and ".".join(parts[:2]) in exclude
+        ):
             continue
         yield importlib.import_module(mod_info.name)
 

fileformats/testing_subpackage/py.typed fileformats/vendor/testing/py.typedfileformats/testing_subpackage/py.typed renamed to fileformats/vendor/testing/py.typed

@@ -2,7 +2,7 @@
 from fileformats.core.mixin import WithClassifiers
 
 
-class SubpackageClassified(WithClassifiers, DataType):
+class VendorClassified(WithClassifiers, DataType):
     classifiers_attr_name = "classifiers"
     classifiers = ()
     allowed_classifiers = (Classifier,)
@@ -21,4 +21,4 @@ class Theta(Classifier):
     pass
 
 
-__all__ = ["SubpackageClassified", "Psi", "Zeta", "Theta", "__version__"]
+__all__ = ["VendorClassified", "Psi", "Zeta", "Theta", "__version__"]