datamaestro 1.5.2__tar.gz → 1.6.1__tar.gz

datamaestro-1.6.1/.flake8

@@ -0,0 +1,7 @@
+[flake8]
+extend-ignore = E203, E266, E501, W503, E704
+# line length is intentionally set to 80 here because black uses Bugbear
+# See https://github.com/psf/black/blob/master/docs/the_black_code_style.md#line-length for more details
+max-line-length = 80
+max-complexity = 18
+select = B,C,E,F,W,T4,B9

{datamaestro-1.5.2 → datamaestro-1.6.1}/.github/workflows/pytest.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v2

datamaestro-1.6.1/.github/workflows/python-publish.yml

@@ -0,0 +1,45 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write  # Required to update release notes
+      id-token: write  # Required for PyPI trusted publishing
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Generate changelog for this release
+        uses: orhun/git-cliff-action@v4
+        with:
+          config: cliff.toml
+          args: --latest --strip header
+        env:
+          OUTPUT: release-notes.md
+
+      - name: Update release notes
+        uses: softprops/action-gh-release@v2
+        with:
+          body_path: release-notes.md
+
+      - name: Install dependencies
+        run: python -m pip install --upgrade uv
+
+      - name: Build
+        run: uv build
+
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

{datamaestro-1.5.2 → datamaestro-1.6.1}/.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 25.12.0
     hooks:
     -   id: black
 -   repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 7.3.0
     hooks:
     -   id: flake8
         additional_dependencies:

{datamaestro-1.5.2 → datamaestro-1.6.1}/PKG-INFO

@@ -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.6.1/cliff.toml

@@ -0,0 +1,65 @@
+# git-cliff configuration file
+# See https://git-cliff.org/docs/configuration
+
+[changelog]
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
+"""
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [Unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | striptags | trim | upper_first }}
+    {% for commit in commits
+        | filter(attribute="scope")
+        | sort(attribute="scope") %}
+        - **{{ commit.scope }}**: {{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/experimaestro/experimaestro-python/commit/{{ commit.id }}))
+    {%- endfor -%}
+    {% for commit in commits %}
+        {%- if not commit.scope -%}
+        - {{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/experimaestro/experimaestro-python/commit/{{ commit.id }}))
+        {% endif -%}
+    {%- endfor -%}
+{% endfor %}
+"""
+trim = true
+footer = ""
+
+[git]
+conventional_commits = true
+filter_unconventional = false
+split_commits = false
+commit_preprocessors = []
+commit_parsers = [
+    { message = "^feat", group = "Features" },
+    { message = "^fix", group = "Bug Fixes" },
+    { message = "^doc", group = "Documentation" },
+    { message = "^perf", group = "Performance" },
+    { message = "^refactor", group = "Refactor" },
+    { message = "^style", group = "Styling" },
+    { message = "^test", group = "Testing" },
+    { message = "^bump: version", skip = true },
+    { message = "^chore\\(release\\): prepare for", skip = true },
+    { message = "^chore\\(deps.*\\)", skip = true },
+    { message = "^chore\\(pr\\)", skip = true },
+    { message = "^chore\\(pull\\)", skip = true },
+    { message = "^build\\(deps", skip = true },
+    { message = "^chore", group = "Miscellaneous Tasks" },
+    { message = "^ci", group = "CI" },
+    { message = "^build", group = "Build" },
+    { message = "^revert", group = "Revert" },
+    { body = ".*security", group = "Security" },
+]
+protect_breaking_commits = false
+filter_commits = false
+tag_pattern = "v[0-9].*"
+skip_tags = ""
+ignore_tags = ""
+topo_order = false
+sort_commits = "oldest"
+# Skip versions with no commits (after filtering)
+skip_empty = true

datamaestro-1.6.1/release-notes.md

@@ -0,0 +1,5 @@
+## [1.6.1] - 2025-12-24
+
+### CI
+- Upgrade gh plugin versions ([2738e42](https://github.com/experimaestro/experimaestro-python/commit/2738e42760d8531573844ec6cfedfebd4565ed97))
+

{datamaestro-1.5.2 → datamaestro-1.6.1}/src/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-1.5.2 → datamaestro-1.6.1}/src/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-1.5.2 → datamaestro-1.6.1}/src/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-1.5.2 → datamaestro-1.6.1}/src/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-1.5.2 → datamaestro-1.6.1}/src/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/.github/workflows/python-publish.yml

@@ -1,29 +0,0 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
-name: Upload Python Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.x"
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade setuptools twine uv
-      - name: Build and publish
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: |
-          uv build
-          twine upload dist/*