Skip to content

Commit b1a93bc

Browse files
committed
Merge branch 'main' of github.com:materialsproject/atomate2 into abinit_workflows_dfpt_shg_new_review-PR
pull trunk main
2 parents 1d2e8fd + e210b58 commit b1a93bc

File tree

114 files changed

+80601
-226
lines changed

Some content is hidden

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

114 files changed

+80601
-226
lines changed

Diff for: .github/workflows/testing.yml

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ jobs:
7171
if: github.event_name == 'repository_dispatch' && github.event.action == 'pymatgen-ci-trigger'
7272
run: pip install --upgrade 'git+https://github.com/materialsproject/pymatgen@${{ github.event.client_payload.pymatgen_ref }}'
7373

74+
- name: Test Notebooks
75+
run: pytest --nbmake ./tutorials
76+
7477
- name: Test
7578
env:
7679
MP_API_KEY: ${{ secrets.MP_API_KEY }}

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ docs/reference/atomate2.*
6666

6767
# see https://github.com/materialsproject/atomate2/issues/345
6868
*.doctrees*
69+
70+
.ipynb_checkpoints

Diff for: .pre-commit-config.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default_language_version:
33
exclude: ^(.github/|tests/test_data/abinit/)
44
repos:
55
- repo: https://github.com/charliermarsh/ruff-pre-commit
6-
rev: v0.4.10
6+
rev: v0.5.2
77
hooks:
88
- id: ruff
99
args: [--fix]
@@ -17,7 +17,7 @@ repos:
1717
- id: end-of-file-fixer
1818
- id: trailing-whitespace
1919
- repo: https://github.com/asottile/blacken-docs
20-
rev: 1.16.0
20+
rev: 1.18.0
2121
hooks:
2222
- id: blacken-docs
2323
additional_dependencies: [black]
@@ -30,7 +30,7 @@ repos:
3030
- id: rst-directive-colons
3131
- id: rst-inline-touching-normal
3232
- repo: https://github.com/pre-commit/mirrors-mypy
33-
rev: v1.10.0
33+
rev: v1.10.1
3434
hooks:
3535
- id: mypy
3636
files: ^src/
@@ -44,3 +44,12 @@ repos:
4444
stages: [commit, commit-msg]
4545
args: [--ignore-words-list, 'titel,statics,ba,nd,te,atomate']
4646
types_or: [python, rst, markdown]
47+
- repo: https://github.com/kynan/nbstripout
48+
rev: 0.7.1
49+
hooks:
50+
- id: nbstripout
51+
args: [
52+
--drop-empty-cells,
53+
--strip-init-cells,
54+
--extra-keys=metadata.kernelspec,
55+
]

Diff for: docs/_static/docs_store_Si_relax.json

+1
Large diffs are not rendered by default.

Diff for: docs/_static/example_flow.png

361 KB
Loading

Diff for: docs/about/license.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
License
2-
=======
1+
# License
32

43
`atomate2` is developed under a modified BSD license, reproduced below:
54

Diff for: docs/conf.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
napoleon_use_ivar = True
7373

7474
# The suffix(es) of source filenames.
75-
source_suffix = [".rst", ".md"]
75+
source_suffix = {".rst": "restructuredtext", ".md": "restructuredtext"}
7676

7777
mathjax3_config = {
7878
"tex": {
@@ -92,10 +92,10 @@
9292
"""
9393
}
9494
language = "en"
95-
html_extra_path = ["images/badge.svg"]
95+
# html_extra_path = ["images/badge.svg"]
9696
html_static_path = ["_static"]
9797
html_css_files = ["custom.css", "github.css"]
98-
suppress_warnings = "etoc.toctree"
98+
suppress_warnings = ["etoc.toctree"]
9999

100100
# autodoc options
101101
autosummary_imported_members = False
@@ -172,6 +172,5 @@
172172
"python": ("https://docs.python.org/3.8", None),
173173
"matplotlib": ("https://matplotlib.org/stable/", None),
174174
"networkx": ("https://networkx.org/documentation/stable/", None),
175-
"monty": ("https://materialsvirtuallab.github.io/monty/", None),
176175
"jobflow": ("https://materialsproject.github.io/jobflow", None),
177176
}

Diff for: docs/index.md

+3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
user/index
55
user/install
66
user/running-workflows
7+
user/docs-schemas-emmet
78
user/fireworks
9+
user/atomate-1-vs-2
810
user/codes/index
911
```
1012

@@ -20,6 +22,7 @@ reference/index
2022
dev/dev_install
2123
dev/workflow_tutorial
2224
dev/vasp_tests
25+
dev/abinit_tests
2326
```
2427

2528
```{toctree}

Diff for: docs/reference/index.rst

+6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ This section gives an overview of the API for atomate2.
1212
:toctree:
1313
:nosignatures:
1414

15+
abinit
16+
aims
1517
amset
18+
cli
1619
common
20+
cp2k
21+
forcefields
1722
lobster
23+
qchem
1824
settings
1925
utils
2026
vasp

0 commit comments

Comments
 (0)