From ad855b87b2498cecef419db1573045461f81a14a Mon Sep 17 00:00:00 2001 From: Christian Monch Date: Tue, 24 Oct 2023 15:36:01 +0200 Subject: [PATCH] fix the version comparison for importlib usage This commit uses the python version 3.8 as last version to use `importlib_metadata`. The previous code tried to use `importlib_metadata` on python 3.9, which fails. The commit also adapts the `entry_points()` calls in `get_extractor_class` to python 3.9, where `entry_points` does not support keyword-arguments --- datalad_metalad/extractors/tests/test_base.py | 2 +- datalad_metalad/filter.py | 2 +- datalad_metalad/utils.py | 2 +- requirements-devel.txt | 1 + requirements.txt | 8 +++++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/datalad_metalad/extractors/tests/test_base.py b/datalad_metalad/extractors/tests/test_base.py index 451f91bf..a2174b92 100644 --- a/datalad_metalad/extractors/tests/test_base.py +++ b/datalad_metalad/extractors/tests/test_base.py @@ -11,7 +11,7 @@ import sys import pytest -if sys.version_info < (3, 10): +if sys.version_info < (3, 9): from importlib_metadata import entry_points else: from importlib.metadata import entry_points diff --git a/datalad_metalad/filter.py b/datalad_metalad/filter.py index a6ddc35c..6494f84b 100644 --- a/datalad_metalad/filter.py +++ b/datalad_metalad/filter.py @@ -286,7 +286,7 @@ def run_filter(filter_name: str, def get_filter_class(filter_name: str) -> Type[MetadataFilterBase]: """ Get a filter class from its name""" - if sys.version_info < (3, 10): + if sys.version_info < (3, 9): from importlib_metadata import entry_points else: from importlib.metadata import entry_points diff --git a/datalad_metalad/utils.py b/datalad_metalad/utils.py index 9a9b6e36..cc2f9e9d 100644 --- a/datalad_metalad/utils.py +++ b/datalad_metalad/utils.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import Dict, List, Union -if sys.version_info < (3, 10): +if sys.version_info < (3, 9): from importlib_resources import files else: from importlib.resources import files diff --git a/requirements-devel.txt b/requirements-devel.txt index c1d043df..f83d2e96 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -2,6 +2,7 @@ coverage datalad>=0.18 datalad-metadata-model>=0.3.10 importlib-resources +importlib-metadata sphinx>=1.7.8 sphinx-rtd-theme pre-commit diff --git a/requirements.txt b/requirements.txt index 01bcfbb7..250b2c34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,8 @@ datalad>=0.18 -sphinx>=1.7.8 -sphinx-rtd-theme +datalad-metadata-model>=0.3.10 +importlib-resources +importlib-metadata pytest pyyaml -datalad-metadata-model>=0.3.10 +sphinx>=1.7.8 +sphinx-rtd-theme