Skip to content

Commit cd00cfd

Browse files
committed
Merge branch 'magnetism_aims' of github.com:tpurcell90/pymatgen into magnetism_aims
2 parents ebcedac + 7a7b8ca commit cd00cfd

File tree

117 files changed

+17003
-21822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+17003
-21822
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ci:
88

99
repos:
1010
- repo: https://github.com/astral-sh/ruff-pre-commit
11-
rev: v0.4.7
11+
rev: v0.4.8
1212
hooks:
1313
- id: ruff
1414
args: [--fix, --unsafe-fixes]
@@ -64,6 +64,6 @@ repos:
6464
args: [--drop-empty-cells, --keep-output]
6565

6666
- repo: https://github.com/RobertCraigie/pyright-python
67-
rev: v1.1.365
67+
rev: v1.1.366
6868
hooks:
6969
- id: pyright

dev_scripts/regen_libxcfunc.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
This script regenerates the enum values in pymatgen.core.libxc_func.py.
44
It requires in input the path of the `libxc_docs.txt` file contained in libxc/src
5-
The script parses this file, creates a new json file inside pymatgen.core
5+
The script parses this file, creates a new JSON file inside pymatgen.core
66
and update the enum values declared in LibxcFunc.
77
The script must be executed inside pymatgen/dev_scripts.
88
"""
@@ -16,10 +16,7 @@
1616

1717

1818
def parse_libxc_docs(path):
19-
"""
20-
Parse libxc_docs.txt file, return dictionary with mapping:
21-
libxc_id --> info_dict.
22-
"""
19+
"""Parse libxc_docs.txt file, return dictionary {libxc_id: info_dict}."""
2320

2421
def parse_section(section):
2522
dct = {}
@@ -46,7 +43,7 @@ def parse_section(section):
4643

4744

4845
def write_libxc_docs_json(xc_funcs, json_path):
49-
"""Write json file with libxc metadata to path jpath."""
46+
"""Write JSON file with libxc metadata to path jpath."""
5047
xc_funcs = deepcopy(xc_funcs)
5148

5249
# Remove XC_FAMILY from Family and XC_ from Kind to make strings more human-readable.
@@ -85,7 +82,7 @@ def main():
8582

8683
xc_funcs = parse_libxc_docs(path)
8784

88-
# Generate new json file in pycore
85+
# Generate new JSON file in pycore
8986
pmg_core = os.path.abspath("../pymatgen/core/")
9087
json_path = f"{pmg_core}/libxc_docs.json"
9188
write_libxc_docs_json(xc_funcs, json_path)

docs/CHANGES.md

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/apidoc/pymatgen.analysis.rst

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/apidoc/pymatgen.io.rst

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/modules.html

Lines changed: 170 additions & 114 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pymatgen.alchemy.html

Lines changed: 100 additions & 167 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pymatgen.analysis.chemenv.connectivity.html

Lines changed: 88 additions & 101 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pymatgen.analysis.chemenv.coordination_environments.coordination_geometries_files.html

Lines changed: 9 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)