Skip to content

Migrate to importlib #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pblowey merged 6 commits into from
Mar 4, 2026
Merged

Migrate to importlib #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cd87b7
migrate to importlib
pblowey Feb 27, 2026
82a9cb9
Update history
pblowey Mar 4, 2026
759b75b
Fix bumpversion config
pblowey Mar 4, 2026
f79db5b
Remove bump2version changes
pblowey Mar 4, 2026
52d69d3
Merge branch 'migrate-to-importlib' of https://github.com/DiamondLigh…
pblowey Mar 4, 2026
9c8c118
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 4, 2026
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
4 changes: 2 additions & 2 deletions .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ serialize =
{major}.{minor}

[bumpversion:file:pyproject.toml]
search = version="{current_version}"
replace = version="{new_version}"
search = version = "{current_version}"
replace = version = "{new_version}"

[bumpversion:file:fast_dp/__init__.py]
search = __version__ = "{current_version}"
Expand Down
3 changes: 2 additions & 1 deletion HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
History
=======

2.0.0 (xxxx-xx-xx)
2.0.0 (2026-03-04)
------------------
* fast_dp no longer supports Python 2.7 or 3.5
* change default plugin for Eiger data to durin-plugin.so
* migrate from pkg_resources to importlib.resources

1.6.2 (2020-03-14)
------------------
Expand Down
9 changes: 4 additions & 5 deletions fast_dp/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import json
import os

import pkg_resources
from importlib.resources import files


def write_json(
Expand Down Expand Up @@ -34,9 +33,9 @@ def write_json(

def get_ispyb_template():
"""Read the ispyb.xml template from the package resources."""
xml_template = pkg_resources.resource_string(
"fast_dp", "templates/ispyb.xml"
).decode("utf-8")
template_path = files("fast_dp") / "templates" / "ispyb.xml"
xml_template = template_path.read_text(encoding="utf-8")

assert xml_template, "Error retrieving XML template"
return xml_template

Expand Down
Loading