datamaestro 1.5.2__py3-none-any.whl → 1.6.1__py3-none-any.whl

datamaestro/__init__.py

@@ -7,7 +7,6 @@ from .context import (
     prepare_dataset,
 )
 
-from pkg_resources import get_distribution, DistributionNotFound
 from .definitions import dataset, metadata
 from .data import Base
 from .version import __version__

datamaestro/__main__.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # flake8: noqa: T201
 
+from importlib.metadata import entry_points
 import sys
 import logging
 from functools import update_wrapper
@@ -38,7 +39,7 @@ def pass_cfg(f):
 # Get all the available repositories
 
 REPOSITORIES = {}
-for entry_point in pkg_resources.iter_entry_points("datamaestro.repositories"):
+for entry_point in entry_points(group="datamaestro.repositories"):
     REPOSITORIES[entry_point.name] = entry_point
 
 

datamaestro/context.py

@@ -8,8 +8,7 @@ import inspect
 import json
 from abc import ABC, abstractmethod
 from experimaestro import Config
-import pkg_resources
-from experimaestro.compat import cached_property
+from functools import cached_property
 from experimaestro.mkdocs.metaloader import Module
 from .utils import CachedFile, downloadURL
 from .settings import UserSettings, Settings
@@ -18,6 +17,22 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from datamaestro.definitions import AbstractDataset, DatasetWrapper
 
+from importlib.metadata import (
+    entry_points as _entry_points,
+    version as _version,
+    PackageNotFoundError as _PackageNotFoundError,
+)
+
+
+def iter_entry_points(group, name=None):
+    """Yield entry points for a given group (and optional name) using importlib.metadata."""
+    eps = _entry_points()
+    selected = eps.select(group=group)
+    if name:
+        selected = [ep for ep in selected if ep.name == name]
+    for ep in selected:
+        yield ep
+
 
 class Compression:
     @staticmethod
@@ -106,7 +121,7 @@ class Context:
 
     def repositories(self) -> Iterable["Repository"]:
         """Returns an iterator over repositories"""
-        for entry_point in pkg_resources.iter_entry_points("datamaestro.repositories"):
+        for entry_point in iter_entry_points("datamaestro.repositories"):
             yield entry_point.load().instance()
 
     def repository(self, repositoryid):
@@ -114,10 +129,7 @@ class Context:
             return None
 
         entry_points = [
-            x
-            for x in pkg_resources.iter_entry_points(
-                "datamaestro.repositories", repositoryid
-            )
+            x for x in iter_entry_points("datamaestro.repositories", repositoryid)
         ]
         if not entry_points:
             raise Exception("No datasets repository named %s", repositoryid)
@@ -299,8 +311,7 @@ class BaseRepository(ABC):
         self.basedir = Path(p).parent
 
     @abstractmethod
-    def __iter__(self) -> Iterator["AbstractDataset"]:
-        ...
+    def __iter__(self) -> Iterator["AbstractDataset"]: ...
 
     def search(self, name: str):
         """Search for a dataset in the definitions"""
@@ -353,11 +364,9 @@ class Repository(BaseRepository):
 
     @classmethod
     def version(cls):
-        from pkg_resources import get_distribution, DistributionNotFound
-
         try:
-            return get_distribution(cls.__module__).version
-        except DistributionNotFound:
+            return _version(cls.__module__)
+        except _PackageNotFoundError:
             return None
 
     def __repr__(self):

datamaestro/definitions.py

@@ -21,8 +21,6 @@ from typing import (
     _GenericAlias,
 )
 from experimaestro import (  # noqa: F401 (re-exports)
-    argument,
-    constant,
     Param,
     Option,
     Config,
@@ -183,8 +181,7 @@ class AbstractDataset(AbstractData):
         self.hooks[hookname].append(hook)
 
     @abstractmethod
-    def _prepare(self) -> "Base":
-        ...
+    def _prepare(self) -> "Base": ...
 
     def format(self, encoder: str) -> str:
         s = self.prepare()

datamaestro/version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '1.5.2'
+__version__ = VERSION = '1.6.1'

{datamaestro-1.5.2.dist-info → datamaestro-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamaestro
-Version: 1.5.2
+Version: 1.6.1
 Summary: Add your description here
 Author-email: Benjamin Piwowarski <benjamin@piwowarski.fr>
 License-File: LICENSE

{datamaestro-1.5.2.dist-info → datamaestro-1.6.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-datamaestro/__init__.py,sha256=WA9Jrikg-1GcQ6TRezV0qBAv7wQfsfRLdtBwzEWQE6Q,311
-datamaestro/__main__.py,sha256=2p36ZcJcZAL9NZBUkMaYRUhKyqhheVPXMGw6K1KNwhk,9196
-datamaestro/context.py,sha256=kVbChQy2Nr7Z0Jz9Qbz8AC-XCAIes50SIpROwez910k,13712
-datamaestro/definitions.py,sha256=-9rKgFxqn103HslqWLovq4EdoSkJmx9FNTKneLGBfTo,19812
+datamaestro/__init__.py,sha256=oh9M4VODuvTc9EFHKirtDxpCJkLUANzpzBOIwzHc_mw,246
+datamaestro/__main__.py,sha256=esbe4LcRA9SrRdBzMnJ02R7LvY3KeK_UqlkXbboHhxc,9227
+datamaestro/context.py,sha256=AL2BTi6dLA8rDGBE0PFyfV9ua29JHvBgx6_w6hDj9Dg,13977
+datamaestro/definitions.py,sha256=byJyuh1AJ03zcaeEYOcbJQwjVI8cYJK2rrA_vAE8O1s,19776
 datamaestro/record.py,sha256=IxxcrSIf99iluohtpnuMBTFkqeHRe5S-T_hWEqBgeME,5812
 datamaestro/registry.py,sha256=M7QJkcWJP_cxAoqIioLQ01ou2Zg9RqGQvW0XGVspYFE,1421
 datamaestro/search.py,sha256=bRT-91-2VJJ2JSfNaS1mzaVfqq_HMVBVs-RBj0w-ypM,2906
 datamaestro/settings.py,sha256=HYSElTUYZ6DZocBb9o3ifm6WW9knRO64XJUwxGIpvwQ,1304
 datamaestro/sphinx.py,sha256=bp7x_2BFoTSwTqcVZDM8R8cWa7G2pz0Zb8GS054lLYM,6996
 datamaestro/utils.py,sha256=9m-AVVww6InAZfGFiGy6XJzfExpYNqH1fhWQEezjafA,6536
-datamaestro/version.py,sha256=nuWd41kVXDQdWyAwYcshPXgiAAgKAIVDM6QbgRkd4GE,171
+datamaestro/version.py,sha256=IxaSAOS_6Bwc-3kPmW6mbhmmX7qOVHpf69gI0hfrfQs,171
 datamaestro/annotations/__init__.py,sha256=jLprrxSBa5QIqc--vqycEcxU4CR9WjVNRaqR5lH0EuE,39
 datamaestro/annotations/agreement.py,sha256=xEH0ddZxdJ_oG_150PoOa-WjY_OaeQja3FzMzY5IB6k,955
 datamaestro/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,8 +40,8 @@ datamaestro/test/conftest.py,sha256=it4S5Qq1CA_U8qM0pr4m7v-1dhLj5Y49WjVg5Ee3mpM,
 datamaestro/test/test_annotations.py,sha256=XUjDWb3FJimSD91wcItJ0lLwTBmvN4wVu_EgTKSvV2c,278
 datamaestro/test/test_download_handlers.py,sha256=-Gofr89zqIyeI8C4rZqfYR3JfiZVImdcSz9s6q361zQ,641
 datamaestro/test/test_record.py,sha256=hNZ3uo2i5FZ0VsOHRwvLO1Z6Zce92PdipAF65UptPB8,1156
-datamaestro-1.5.2.dist-info/METADATA,sha256=hHB6tXBNZjirZXG7II5ff3bovHhoig1I51JGIImnHkw,7635
-datamaestro-1.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-datamaestro-1.5.2.dist-info/entry_points.txt,sha256=8qMhwSRvFG2iBqtJYVD22Zd4s4c3YkODtcp0Ajw1knw,133
-datamaestro-1.5.2.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-datamaestro-1.5.2.dist-info/RECORD,,
+datamaestro-1.6.1.dist-info/METADATA,sha256=T73NHl0zE2na-yxx4Bbtdn4Vm7kSx2yULu0TFG-mcAw,7635
+datamaestro-1.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+datamaestro-1.6.1.dist-info/entry_points.txt,sha256=8qMhwSRvFG2iBqtJYVD22Zd4s4c3YkODtcp0Ajw1knw,133
+datamaestro-1.6.1.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+datamaestro-1.6.1.dist-info/RECORD,,

{datamaestro-1.5.2.dist-info → datamaestro-1.6.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any