Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install requirements
run: |
python -m pip install --upgrade pip
pip install --upgrade setuptools wheel setuptools-scm[toml] importlib-metadata
pip install --upgrade setuptools wheel setuptools-scm[toml]
pip install flake8 pytest pytest-cov pytz
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install .
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@ Security
^^^^^^^^


[Unreleased]
------------


Added
^^^^^

- Test with Python 3.14 in CI workflow


Removed
^^^^^^^

- Dropped support for Python 3.7 and 3.8 in CI workflow. ``importlib.metadata``
(used for storage broker entry-point discovery) is only available in the
standard library from Python 3.8 onwards, and ``actions/setup-python`` no
longer provides 3.7/3.8 builds on ``ubuntu-latest``


[3.19.0] - 2024-12-16
---------------------

Expand Down
5 changes: 3 additions & 2 deletions dtoolcore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"""

import os
import sys

import datetime
import logging
Expand Down Expand Up @@ -62,9 +61,11 @@ def _generate_storage_broker_lookup():

from importlib.metadata import entry_points
eps = entry_points()
if sys.version_info >= (3, 10):
if hasattr(eps, 'select'):
# Python 3.10+ / importlib_metadata >= 3.6
entrypoints = eps.select(group="dtool.storage_brokers")
else:
# Python 3.9 and earlier - eps is a dict
entrypoints = eps.get("dtool.storage_brokers", [])

for entrypoint in entrypoints:
Expand Down
Loading