|
10 | 10 | from numpy.testing import assert_allclose, assert_array_equal
|
11 | 11 | from pytest import approx
|
12 | 12 |
|
13 |
| -from pymatgen.core import Element |
| 13 | +from pymatgen.core import Element, Structure |
14 | 14 | from pymatgen.io.phonopy import (
|
15 | 15 | CompletePhononDos,
|
16 | 16 | PhononBandStructure,
|
17 | 17 | PhononBandStructureSymmLine,
|
18 |
| - Structure, |
19 | 18 | get_complete_ph_dos,
|
20 | 19 | get_displaced_structures,
|
21 | 20 | get_gruneisen_ph_bs_symm_line,
|
@@ -125,6 +124,10 @@ def test_structure_conversion(self):
|
125 | 124 | assert struct_pmg_round_trip.site_properties["magmom"] == struct_pmg.site_properties["magmom"]
|
126 | 125 |
|
127 | 126 |
|
| 127 | +@pytest.mark.skipif( |
| 128 | + platform.system() == "Windows" and int(np.__version__[0]) >= 2, |
| 129 | + reason="cannot run NP2 on windows, see PR 4224", |
| 130 | +) |
128 | 131 | @pytest.mark.skipif(Phonopy is None, reason="Phonopy not present")
|
129 | 132 | class TestGetDisplacedStructures(PymatgenTest):
|
130 | 133 | def test_get_displaced_structures(self):
|
@@ -157,11 +160,11 @@ def test_get_displaced_structures(self):
|
157 | 160 | assert os.path.isfile("test.yaml")
|
158 | 161 |
|
159 | 162 |
|
160 |
| -@pytest.mark.skipif(Phonopy is None, reason="Phonopy not present") |
161 | 163 | @pytest.mark.skipif(
|
162 | 164 | platform.system() == "Windows" and int(np.__version__[0]) >= 2,
|
163 |
| - reason="See https://github.com/conda-forge/phonopy-feedstock/pull/158#issuecomment-2227506701", |
| 165 | + reason="cannot run NP2 on windows, see PR 4224", |
164 | 166 | )
|
| 167 | +@pytest.mark.skipif(Phonopy is None, reason="Phonopy not present") |
165 | 168 | class TestPhonopyFromForceConstants(TestCase):
|
166 | 169 | def setUp(self) -> None:
|
167 | 170 | test_path = Path(TEST_DIR)
|
|
0 commit comments