Merge branch 'master' into support-python313

tests/io/test_phonopy.py

@@ -10,12 +10,11 @@
 from numpy.testing import assert_allclose, assert_array_equal
 from pytest import approx
 
-from pymatgen.core import Element
+from pymatgen.core import Element, Structure
 from pymatgen.io.phonopy import (
     CompletePhononDos,
     PhononBandStructure,
     PhononBandStructureSymmLine,
-    Structure,
     get_complete_ph_dos,
     get_displaced_structures,
     get_gruneisen_ph_bs_symm_line,
@@ -125,6 +124,10 @@ def test_structure_conversion(self):
         assert struct_pmg_round_trip.site_properties["magmom"] == struct_pmg.site_properties["magmom"]
 
 
+@pytest.mark.skipif(
+    platform.system() == "Windows" and int(np.__version__[0]) >= 2,
+    reason="cannot run NP2 on windows, see PR 4224",
+)
 @pytest.mark.skipif(Phonopy is None, reason="Phonopy not present")
 class TestGetDisplacedStructures(PymatgenTest):
     def test_get_displaced_structures(self):
@@ -157,11 +160,11 @@ def test_get_displaced_structures(self):
         assert os.path.isfile("test.yaml")
 
 
-@pytest.mark.skipif(Phonopy is None, reason="Phonopy not present")
 @pytest.mark.skipif(
     platform.system() == "Windows" and int(np.__version__[0]) >= 2,
-    reason="See https://github.com/conda-forge/phonopy-feedstock/pull/158#issuecomment-2227506701",
+    reason="cannot run NP2 on windows, see PR 4224",
 )
+@pytest.mark.skipif(Phonopy is None, reason="Phonopy not present")
 class TestPhonopyFromForceConstants(TestCase):
     def setUp(self) -> None:
         test_path = Path(TEST_DIR)