test: remove package-availability skips

pyobjcryst and diffpy.structure are declared test and runtime dependencies, so the tests should fail rather than silently skip when they are missing. Remove the pyobjcryst_available and diffpy_structure_available fixtures, their skip checks, and the cctbx import guard in the already-disabled xtestCreateSpaceGroup. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
sbillinge · Oct 16, 2026 · Oct 7, 2026 · Oct 7, 2026 · Oct 7, 2026 · Oct 7, 2026
commit 7b730f88b2c0dd7773db043ad754c7e4b8d978ce
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,13 +1,9 @@
 import importlib.resources
 import json
-import logging
-from functools import lru_cache
 from pathlib import Path
 
 import pytest
 
-logger = logging.getLogger(__name__)
-
 
 @pytest.fixture
 def user_filesystem(tmp_path):
@@ -24,44 +20,6 @@ def user_filesystem(tmp_path):
     yield tmp_path
 
 
-# diffpy.structure
-@lru_cache()
-def has_diffpy_structure():
-    try:
-        import diffpy.structure as m
-
-        del m
-        return True
-    except ImportError:
-        logger.warning(
-            "Cannot import diffpy.structure, Structure tests skipped."
-        )
-        return False
-
-
-# pyobjcryst
-@lru_cache()
-def has_pyobjcryst():
-    try:
-        import pyobjcryst as m
-
-        del m
-        return True
-    except ImportError:
-        logger.warning("Cannot import pyobjcryst, pyobjcryst tests skipped.")
-        return False
-
-
-@pytest.fixture(scope="session")
-def diffpy_structure_available():
-    return has_diffpy_structure()
-
-
-@pytest.fixture(scope="session")
-def pyobjcryst_available():
-    return has_pyobjcryst()
-
-
 @pytest.fixture(scope="session")
 def datafile():
     """Fixture to load a test data file from the testdata package

diff --git a/tests/test_objcrystparset.py b/tests/test_objcrystparset.py
@@ -113,11 +113,8 @@ def makeC60():
 
 class TestParameterAdapter:
     @pytest.fixture(autouse=True)
-    def setup(self, pyobjcryst_available):
+    def setup(self):
         # shared setup
-        if not pyobjcryst_available:
-            pytest.skip("pyobjcryst package not available")
-
         global ObjCrystCrystalParSet, Crystal, Atom, Molecule
         global ScatteringPowerAtom
         from pyobjcryst.atom import Atom
@@ -626,13 +623,8 @@ class TestCreateSpaceGroup:
     """
 
     @pytest.fixture(autouse=True)
-    def setup(self, diffpy_structure_available, pyobjcryst_available):
+    def setup(self):
         # shared setup
-        if not diffpy_structure_available:
-            pytest.skip("diffpy.structure package not available")
-        if not pyobjcryst_available:
-            pytest.skip("pyobjcryst package not available")
-
         global ObjCrystCrystalParSet, spacegroups
         from diffpy.cmistructure.objcrystparset import ObjCrystCrystalParSet
         from diffpy.structure import spacegroups
@@ -665,10 +657,7 @@ def sgsEquivalent(self, sg1, sg2):
     def xtestCreateSpaceGroup(self):
         """Check all sgtbx space groups for proper conversion to
         SpaceGroup."""
-        try:
-            from cctbx import sgtbx
-        except ImportError:
-            return
+        from cctbx import sgtbx
 
         for smbls in sgtbx.space_group_symbol_iterator():
             shn = smbls.hermann_mauguin()

diff --git a/tests/test_sgconstraints.py b/tests/test_sgconstraints.py
@@ -22,16 +22,13 @@
 # ----------------------------------------------------------------------------
 
 
-def test_ObjCryst_constrain_space_group(pyobjcryst_available):
+def test_ObjCryst_constrain_space_group():
     """Make sure that all Parameters are constrained properly.
 
     This tests constrainSpaceGroup from
     diffpy.cmistructure.sgconstraints, which is performed automatically
     when an ObjCrystCrystalParSet is created.
     """
-    if not pyobjcryst_available:
-        pytest.skip("pyobjcrysta package not available")
-
     from diffpy.cmistructure.objcrystparset import ObjCrystCrystalParSet
 
     pi = numpy.pi
@@ -105,11 +102,8 @@ def test_ObjCryst_constrain_space_group(pyobjcryst_available):
     return
 
 
-def test_DiffPy_constrain_as_space_group(datafile, pyobjcryst_available):
+def test_DiffPy_constrain_as_space_group(datafile):
     """Test the constrain_as_space_group function."""
-    if not pyobjcryst_available:
-        pytest.skip("pyobjcrysta package not available")
-
     from diffpy.cmistructure.diffpyparset import DiffpyStructureParSet
     from diffpy.cmistructure.sgconstraints import constrain_as_space_group
 
@@ -182,12 +176,9 @@ def _alltests(parameter):
     return
 
 
-def test_constrain_as_space_group_args(pyobjcryst_available, datafile):
+def test_constrain_as_space_group_args(datafile):
     """Test the arguments processing of constrain_as_space_group
     function."""
-    if not pyobjcryst_available:
-        pytest.skip("pyobjcrysta package not available")
-
     from diffpy.cmistructure.diffpyparset import DiffpyStructureParSet
     from diffpy.cmistructure.sgconstraints import constrain_as_space_group
     from diffpy.structure.spacegroups import GetSpaceGroup