Skip to content

Commit 4acfbcb

Browse files
author
Shyue Ping Ong
committed
Merge branch 'master' of github.com:materialsproject/pymatgen
2 parents 29b5b90 + e8d4917 commit 4acfbcb

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pymatgen/core/structure.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,6 +2672,7 @@ def to(self, filename: str = "", fmt: str = "", **kwargs) -> str | None:
26722672
sio = StringIO()
26732673
yaml.dump(self.as_dict(), sio)
26742674
return sio.getvalue()
2675+
# fleur support implemented in external namespace pkg https://github.com/JuDFTteam/pymatgen-io-fleur
26752676
elif fmt == "fleur-inpgen" or fnmatch(filename, "*.in*"):
26762677
from pymatgen.io.fleur import FleurInput
26772678

@@ -2754,6 +2755,7 @@ def from_str(
27542755
from pymatgen.io.atat import Mcsqs
27552756

27562757
struct = Mcsqs.structure_from_str(input_string, **kwargs)
2758+
# fleur support implemented in external namespace pkg https://github.com/JuDFTteam/pymatgen-io-fleur
27572759
elif fmt == "fleur-inpgen":
27582760
from pymatgen.io.fleur import FleurInput
27592761

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
requires = [
3+
"Cython>=0.29.23,<3",
34
# pin NumPy version used in the build
4-
"Cython>=0.29.23",
55
"oldest-supported-numpy",
66
"setuptools>=65.0.0",
77
]
@@ -70,8 +70,8 @@ ignore = [
7070
"PLR", # pylint refactor
7171
"PLW2901", # Outer for loop variable overwritten by inner assignment target
7272
"PT013", # pytest-incorrect-pytest-import
73-
"SIM105", # Use contextlib.suppress(OSError) instead of try-except-pass
7473
"RUF012", # Disable checks for mutable class args. This is a non-problem.
74+
"SIM105", # Use contextlib.suppress(OSError) instead of try-except-pass
7575
]
7676
pydocstyle.convention = "google"
7777
isort.required-imports = ["from __future__ import annotations"]

0 commit comments

Comments
 (0)