Merge branch 'main' into drop-py38

CHANGELOG.rst

@@ -1,3 +1,12 @@
+DIALS 3.15.1 (2023-06-29)
+=========================
+
+Bugfixes
+--------
+
+- ``dxtbx.dlsnxs2cbf``: Fix import overwritten by local variable. (`#641 <https://github.com/cctbx/dxtbx/issues/641>`_)
+
+
 dxtbx 3.15.0 (2023-06-13)
 =========================
 

libtbx_refresh.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import contextlib
+import importlib
 import inspect
 import io
 import os
@@ -17,11 +18,6 @@
 except ModuleNotFoundError:
     pass
 
-try:
-    import pkg_resources
-except ModuleNotFoundError:
-    pkg_resources = None
-
 
 def _install_setup_readonly_fallback(package_name: str):
     """
@@ -67,9 +63,8 @@ def _install_setup_readonly_fallback(package_name: str):
     if import_path not in sys.path:
         sys.path.insert(0, import_path)
 
-    # ...and add to the existing pkg_resources working_set
-    if pkg_resources:
-        pkg_resources.working_set.add_entry(import_path)
+    # ...and make sure it is picked up by the import system
+    importlib.invalidate_caches()
 
     # This is already generated by this point, but will get picked up
     # on the second libtbx.refresh.

newsfragments/643.misc

@@ -0,0 +1 @@
+Move from deprecated pkg_resources to importlib.

pytest.ini

@@ -5,6 +5,7 @@ filterwarnings =
     ignore:numpy.dtype size changed:RuntimeWarning
     ignore:Datablocks are deprecated:UserWarning
     ignore:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning
+    ignore:`product` is deprecated as of NumPy:DeprecationWarning:h5py|numpy
 junit_family = legacy
 markers =
     regression: dxtbx regression test

src/dxtbx/format/Registry.py

@@ -5,12 +5,11 @@
 """
 from __future__ import annotations
 
+import importlib.metadata
 import os
 import typing
 from typing import Callable
 
-import pkg_resources
-
 from dxtbx.util import get_url_scheme
 
 if typing.TYPE_CHECKING:
@@ -35,7 +34,7 @@ def get_format_class_index() -> dict[str, tuple[Callable[[], type[Format]], list
     """
     if not hasattr(get_format_class_index, "cache"):
         class_index = {}
-        for e in pkg_resources.iter_entry_points("dxtbx.format"):
+        for e in importlib.metadata.entry_points()["dxtbx.format"]:
             if ":" in e.name:
                 format_name, base_classes_str = e.name.split(":", 1)
                 base_classes = tuple(base_classes_str.split(","))

src/dxtbx/model/experiment_list.py

@@ -3,6 +3,7 @@
 import collections
 import copy
 import errno
+import importlib.metadata
 import itertools
 import json
 import logging
@@ -11,8 +12,6 @@
 import pickle
 from typing import Any, Callable, Generator, Iterable
 
-import pkg_resources
-
 import dxtbx.datablock
 from dxtbx.datablock import (
     BeamComparison,
@@ -323,7 +322,6 @@ def decode(self):
         # a sensible experiment.
         el = ExperimentList()
         for eobj in self._obj["experiment"]:
-
             # Get the models
             identifier = eobj.get("identifier", "")
             beam = self._lookup_model("beam", eobj)
@@ -467,7 +465,7 @@ def _lookup_model(self, name, experiment_dict):
     @staticmethod
     def _scaling_model_from_dict(obj):
         """Get the scaling model from a dictionary."""
-        for entry_point in pkg_resources.iter_entry_points("dxtbx.scaling_model_ext"):
+        for entry_point in importlib.metadata.entry_points()["dxtbx.scaling_model_ext"]:
             if entry_point.name == obj["__id__"]:
                 return entry_point.load().from_dict(obj)
 

src/dxtbx/model/profile.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
+import importlib.metadata
 import logging
 
-import pkg_resources
-
 
 class ProfileModelFactory:
     """
@@ -17,7 +16,7 @@ def from_dict(obj):
         """
         if obj is None:
             return None
-        for entry_point in pkg_resources.iter_entry_points("dxtbx.profile_model"):
+        for entry_point in importlib.metadata.entry_points()["dxtbx.profile_model"]:
             if entry_point.name == obj["__id__"]:
                 return entry_point.load().from_dict(obj)
         logging.getLogger("dxtbx.model.profile").warn(