Skip to content

Commit 1c3737e

Browse files
committed
Merge remote-tracking branch 'mp/main' into patch_wavede
2 parents 21b236c + daf06b4 commit 1c3737e

7 files changed

Lines changed: 98 additions & 42 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
deploy-docs:
1111

1212
# only run if commit is a push to master and the testing finished
13-
# if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && ( github.event.workflow_run.head_branch == 'main' || startsWith(github.event.workflow_run.head_branch, 'v') )
1413
if: github.repository_owner == 'materialsproject' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && startsWith(github.event.workflow_run.head_branch, 'v0.')
1514
runs-on: ubuntu-latest
1615

@@ -80,7 +79,10 @@ jobs:
8079
ref: ${{ github.event.workflow_run.head_branch }}
8180

8281
- name: Write release info
83-
run: awk 'BEGIN {p = 0} {a = 0 }; /^v\d*.\d*.\d*./ { p += 1; a = 1}; p + a == 1 { print } ' CHANGELOG.md | sed -e '1,1d' | sed -e '/./,$!d' -e :a -e '/^\n*$/{$d;N;ba' -e '}' > release_info.txt
82+
run: |
83+
awk 'BEGIN {p = 0} {a = 0 }; /^v\d*.\d*.\d*./ { p += 1; a = 1}; p + a == 1 { print } ' CHANGELOG.md | sed -e '1,1d' | sed -e '/./,$!d' -e :a -e '/^\n*$/{$d;N;ba' -e '}' > release_info.txt
84+
echo "" >> release_info.txt
85+
awk '/CONTRIBUTOR SECTION/{f=1; c=0} f' CHANGELOG.md >> release_info.txt
8486
8587
- name: Release
8688
uses: actions/create-release@v1

.github/workflows/testing.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ jobs:
1818
cache: pip
1919
cache-dependency-path: pyproject.toml
2020

21-
- name: Install dependencies
22-
run: |
23-
python -m pip install --upgrade pip
24-
pip install .[strict,tests,dev]
25-
26-
- name: Lint
27-
run: pre-commit run --all-files --show-diff-on-failure
21+
- uses: pre-commit/[email protected]
2822

2923
test:
3024
services:
@@ -50,7 +44,7 @@ jobs:
5044
- name: Install dependencies
5145
run: |
5246
python -m pip install --upgrade pip
53-
pip install .[strict,tests,docs]
47+
pip install .[strict,tests]
5448
5549
- name: Test
5650
env:

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ repos:
6060
- id: codespell
6161
stages: [commit, commit-msg]
6262
args: [--ignore-words-list, 'titel,statics,ba,nd,te']
63+
types_or: [python, rst, markdown]

CHANGELOG.md

Lines changed: 63 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,91 @@
11
Change log
22
==========
33

4+
v0.0.9
5+
------
6+
7+
New features:
8+
9+
- Defect formation energy workflow with VASP implementation ([@jmmshn][jmmshn], [#215](https://github.com/materialsproject/atomate2/pull/215))
10+
- Job to retrieve a structure from the MP API at run-time ([@mkhorton][mkhorton], [#176](https://github.com/materialsproject/atomate2/pull/176]))
11+
12+
Enhancements:
13+
14+
- Documentation of phonon workflow ([@QuantumChemist][quantumchemist], [#232](https://github.com/materialsproject/atomate2/pull/232))
15+
- Refactor defect code ([@jmmshn][jmmshn], [#214](https://github.com/materialsproject/atomate2/pull/214))
16+
- Use `ruff` for linting ([@janosh][janosh], [#250](https://github.com/materialsproject/atomate2/pull/250))
17+
18+
19+
Bug fixes:
20+
21+
- Use correct k-point density in phonon workflow ([@JaGeo][jageo], [#177](https://github.com/materialsproject/atomate2/pull/177))
22+
- Fix use of `expanduser` path ([@nwinner][nwinner], [#180](https://github.com/materialsproject/atomate2/pull/180))
23+
- Correct `calcs_reversed` to be in the proper order ([@Zhuoying][zhuoying], [#182](https://github.com/materialsproject/atomate2/pull/182))
24+
- Bugfix for `store_volumetric_data` ([@jmmshn][jmmshn], [#212](https://github.com/materialsproject/atomate2/pull/212))
25+
26+
427
v0.0.8
528
------
629

730
New features:
831

9-
- VASP Phonopy workflow ([@JaGeo](https://github.com/JaGeo), [#137](https://github.com/materialsproject/atomate2/pull/137))
10-
- Molecular dynamics VASP job ([@mjwen](https://github.com/mjwen), [#134](https://github.com/materialsproject/atomate2/pull/134))
32+
- VASP Phonopy workflow ([@JaGeo][jageo], [#137](https://github.com/materialsproject/atomate2/pull/137))
33+
- Molecular dynamics VASP job ([@mjwen][mjwen], [#134](https://github.com/materialsproject/atomate2/pull/134))
1134

1235
Enhancements:
1336

14-
- Update IO classes to use pymatgen base classes ([@rkingsbury](https://github.com/rkingsbury), [#141](https://github.com/materialsproject/atomate2/pull/141))
15-
- Read and write VASP structures with higher precision ([@JaGeo](https://github.com/JaGeo), [#167](https://github.com/materialsproject/atomate2/pull/167))
37+
- Update IO classes to use pymatgen base classes ([@rkingsbury][rkingsbury], [#141](https://github.com/materialsproject/atomate2/pull/141))
38+
- Read and write VASP structures with higher precision ([@JaGeo][jageo], [#167](https://github.com/materialsproject/atomate2/pull/167))
1639

1740
Bug fixes:
1841

19-
- Fix code examples in docs ([@JaGeo](https://github.com/JaGeo), [#169](https://github.com/materialsproject/atomate2/pull/169))
20-
- Fix f-orbital DOS properties ([@arosen93](https://github.com/arosen93), [#138](https://github.com/materialsproject/atomate2/pull/138))
21-
- Fix `mock_run_vasp` testing to accept args ([@mjwen](https://github.com/mjwen), [#151](https://github.com/materialsproject/atomate2/pull/151))
22-
- Regenerate calc_types enum ([@mjwen](https://github.com/mjwen), [#153](https://github.com/materialsproject/atomate2/pull/153))
42+
- Fix code examples in docs ([@JaGeo][jageo], [#169](https://github.com/materialsproject/atomate2/pull/169))
43+
- Fix f-orbital DOS properties ([@arosen93][arosen], [#138](https://github.com/materialsproject/atomate2/pull/138))
44+
- Fix `mock_run_vasp` testing to accept args ([@mjwen][mjwen], [#151](https://github.com/materialsproject/atomate2/pull/151))
45+
- Regenerate calc_types enum ([@mjwen][mjwen], [#153](https://github.com/materialsproject/atomate2/pull/153))
2346

2447
v0.0.7
2548
------
2649

2750
New features:
2851

2952
- Include band-related features (e.g. band center, bandwidth, skewness, kurtosis) in
30-
VASP schema ([@arosen93](https://github.com/arosen93), [#92](https://github.com/materialsproject/atomate2/pull/92))
53+
VASP schema ([@arosen93][arosen], [#92](https://github.com/materialsproject/atomate2/pull/92))
3154
- Add `use_auto_ispin` and `update_user_potcar_functional` powerups
3255

3356
Enhancements:
3457

3558
- Add `is_hubbard` and `hubbards` to VASP task doc.
3659
- Migrate build system to pyproject.toml.
3760
- Migrate docs to jupyter-book.
38-
- Docs improvements ([@janosh](https://github.com/janosh), [@mjwen](https://github.com/mjwen))
61+
- Docs improvements ([@janosh][janosh], [@mjwen][mjwen])
3962

4063
Bug fixes:
4164

4265
- Fix HSE tags.
4366
- Fix running bader.
44-
- Make potcar_spec argument usable ([@jmmshn](https://github.com/jmmshn), [#83](https://github.com/materialsproject/atomate2/pull/83))
45-
- Replace monty which with shutil which ([@arosen93](https://github.com/arosen93), [#92](https://github.com/materialsproject/atomate2/pull/92))
46-
- Fix `calculate_deformation_potentials()` ([@janosh](https://github.com/janosh), [#94](https://github.com/materialsproject/atomate2/pull/94))
47-
- Fix gzipping of files with numerical suffixes ([@jmmshn](https://github.com/jmmshn), [#116](https://github.com/materialsproject/atomate2/pull/116))
67+
- Make potcar_spec argument usable ([@jmmshn][jmmshn], [#83](https://github.com/materialsproject/atomate2/pull/83))
68+
- Replace monty which with shutil which ([@arosen93][arosen], [#92](https://github.com/materialsproject/atomate2/pull/92))
69+
- Fix `calculate_deformation_potentials()` ([@janosh][janosh], [#94](https://github.com/materialsproject/atomate2/pull/94))
70+
- Fix gzipping of files with numerical suffixes ([@jmmshn][jmmshn], [#116](https://github.com/materialsproject/atomate2/pull/116))
4871

4972
v0.0.6
5073
------
5174

5275
New features:
5376

5477
- cclib task document supporting virtually all popular molecular DFT codes out-of-the-box
55-
([@arosen93](https://github.com/arosen93), [#64](https://github.com/materialsproject/atomate2/pull/64))
78+
([@arosen93][arosen], [#64](https://github.com/materialsproject/atomate2/pull/64))
5679

5780
Enhancements:
5881

59-
- Add mag_density to VASP output doc ([@arosen93](https://github.com/arosen93), [#65](https://github.com/materialsproject/atomate2/pull/66))
60-
- Double relax maker now supports two different Makers ([@arosen93](https://github.com/arosen93), [#32](https://github.com/materialsproject/atomate2/pull/32))
82+
- Add mag_density to VASP output doc ([@arosen93][arosen], [#65](https://github.com/materialsproject/atomate2/pull/66))
83+
- Double relax maker now supports two different Makers ([@arosen93][arosen], [#32](https://github.com/materialsproject/atomate2/pull/32))
6184

6285
Bug fixes:
6386

64-
- Store band structure efermi in CalculationOutput ([@arosen93](https://github.com/arosen93), [#66](https://github.com/materialsproject/atomate2/pull/66))
65-
- Support for VASP6 and latest pymatgen ([@arosen93](https://github.com/arosen93), [#75](https://github.com/materialsproject/atomate2/pull/75))
87+
- Store band structure efermi in CalculationOutput ([@arosen93][arosen], [#66](https://github.com/materialsproject/atomate2/pull/66))
88+
- Support for VASP6 and latest pymatgen ([@arosen93][arosen], [#75](https://github.com/materialsproject/atomate2/pull/75))
6689
- Fixed atomate2 version string.
6790
- Disabled orbital projections in the electron-phonon workflow.
6891

@@ -73,11 +96,11 @@ This version removed Python 3.7 support following numpy and pymatgen.
7396

7497
New features:
7598

76-
- Base schema for molecule task documents ([@arosen93](https://github.com/arosen93), [#54](https://github.com/materialsproject/atomate2/pull/54))
99+
- Base schema for molecule task documents ([@arosen93][arosen], [#54](https://github.com/materialsproject/atomate2/pull/54))
77100

78101
Bug fixes:
79102

80-
- Fix VASP relaxation using custodian "FULL_OPT" ([@arosen93](https://github.com/arosen93), [#42](https://github.com/materialsproject/atomate2/pull/42))
103+
- Fix VASP relaxation using custodian "FULL_OPT" ([@arosen93][arosen], [#42](https://github.com/materialsproject/atomate2/pull/42))
81104
- Fix supercell generation and input sets in electron-phonon workflow.
82105
- Fix `HSEBSSetGenerator` INCAR settings.
83106
- Fix issue with magnetism in SOC structures.
@@ -101,8 +124,8 @@ New features:
101124
Enhancements:
102125

103126
- Support for automatic handling of ISPIN.
104-
- Add MP base sets ([@arosen93](https://github.com/arosen93), [#27](https://github.com/materialsproject/atomate2/pull/27))
105-
- Docs updates ([@arosen93](https://github.com/arosen93), [#13](https://github.com/materialsproject/atomate2/pull/13) [#17](https://github.com/materialsproject/atomate2/pull/17))
127+
- Add MP base sets ([@arosen93][arosen], [#27](https://github.com/materialsproject/atomate2/pull/27))
128+
- Docs updates ([@arosen93][arosen], [#13](https://github.com/materialsproject/atomate2/pull/13) [#17](https://github.com/materialsproject/atomate2/pull/17))
106129
- Options to strip band structure and DOS projects to reduce object sizes.
107130
- Input sets now use generators to avoid serialization issues.
108131
- Use smart efermi finding to remove errors with tetrahedron integration in VASP 6.
@@ -112,11 +135,11 @@ Bug fixes:
112135

113136
- Use PBEsol by default.
114137
- Increase number of significant figures when writing POSCAR files.
115-
- Remove unused INCAR settings ([@arosen93](https://github.com/arosen93))
116-
- Add missing LASPH flags on vdW functionals ([@arosen93](https://github.com/arosen93), [#31](https://github.com/materialsproject/atomate2/pull/31))
117-
- Use `NSW=0` in static calculations ([@arosen93](https://github.com/arosen93), [#10](https://github.com/materialsproject/atomate2/pull/10))
118-
- `LREAL = False` in static jobs by default ([@arosen93](https://github.com/arosen93), [#23](https://github.com/materialsproject/atomate2/pull/23))
119-
- Add missing functionals in output schema ([@arosen93](https://github.com/arosen93), [#12](https://github.com/materialsproject/atomate2/pull/12))
138+
- Remove unused INCAR settings ([@arosen93][arosen])
139+
- Add missing LASPH flags on vdW functionals ([@arosen93][arosen], [#31](https://github.com/materialsproject/atomate2/pull/31))
140+
- Use `NSW=0` in static calculations ([@arosen93][arosen], [#10](https://github.com/materialsproject/atomate2/pull/10))
141+
- `LREAL = False` in static jobs by default ([@arosen93][arosen], [#23](https://github.com/materialsproject/atomate2/pull/23))
142+
- Add missing functionals in output schema ([@arosen93][arosen], [#12](https://github.com/materialsproject/atomate2/pull/12))
120143
- Many output schema fixes.
121144
- Better support for FireWorks.
122145
- Support writing additional files in VASP jobs.
@@ -135,3 +158,15 @@ v0.0.1
135158
------
136159

137160
Initial release.
161+
162+
[contributors]: <> (CONTRIBUTOR SECTION)
163+
[nwinner]: https://github.com/nwinner
164+
[jageo]: https://github.com/JaGeo
165+
[zhuoying]: https://github.com/Zhuoying
166+
[jmmshn]: https://github.com/jmmshn
167+
[mkhorton]: https://github.com/mkhorton
168+
[QuantumChemist]: https://github.com/QuantumChemist
169+
[janosh]: https://github.com/janosh
170+
[mjwen]: https://github.com/mjwen
171+
[arosen]: https://github.com/arosen93
172+
[rkingsbury]: https://github.com/rkingsbury

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![pypi version](https://img.shields.io/pypi/v/atomate2?color=blue)](https://pypi.org/project/atomate2)
66
![supported python versions](https://img.shields.io/pypi/pyversions/atomate2)
77

8-
**👉 [Full Documentation][docs] 👈**
8+
[Documentation][docs] | [PyPI][pypi] | [GitHub][github]
99

1010
Atomate2 is a free, open-source software for performing complex materials science
1111
workflows using simple Python functions. Features of atomate2 include
@@ -139,3 +139,5 @@ A full list of all contributors can be found [here][contributors].
139139
[vasp_workflows]: https://materialsproject.github.io/atomate2/user/codes/vasp.html
140140
[RelaxBandStructure]: https://materialsproject.github.io/atomate2/user/codes/vasp.html#relax-and-band-structure
141141
[docs]: https://materialsproject.github.io/atomate2/
142+
[github]: https://github.com/materialsproject/atomate2
143+
[pypi]: https://pypi.org/project/atomate2

docs/about/contributors.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ Lawrence Livermore National Laboratory
2525
[jmmshn]: https://github.com/jmmshn
2626
[0000-0002-2743-7531]: https://orcid.org/0000-0002-2743-7531
2727

28-
**Janosh Riebesell** [![gh]][janosh] \
28+
**Janosh Riebesell** [![gh]][janosh] [![orc]][0000-0001-5233-3462]\
2929
PhD Student \
3030
Cambridge University
3131

3232
[janosh]: https://github.com/janosh
33+
[0000-0001-5233-3462]: https://orcid.org/0000-0001-5233-3462
3334

3435
**Ryan Kingsbury** [![gh]][rkingsbury] [![orc]][0000-0002-7168-3967] \
3536
Incoming Assistant Professor \
@@ -52,3 +53,24 @@ University of Houston
5253

5354
[mjwen]: https://github.com/mjwen
5455
[0000-0003-0013-575X]: https://orcid.org0000-0003-0013-575X/
56+
57+
**Christina Ertural** [![gh]][QuantumChemist] [![orc]][0000-0002-7696-5824] \
58+
Postdoctoral Researcher \
59+
Federal Institute for Materials Research and Testing (Berlin)
60+
61+
[QuantumChemist]: https://github.com/QuantumChemist
62+
[0000-0002-7696-5824]: https://orcid.org/0000-0002-7696-5824
63+
64+
**Matthew Horton** [![gh]][mkhorton] [![orc]][0000-0001-7777-8871] \
65+
Senior Research Software Engineer \
66+
Microsoft Research
67+
68+
[mkhorton]: https://github.com/mkhorton
69+
[0000-0001-7777-8871]: https://orcid.org/0000-0001-7777-8871
70+
71+
**Zhuoying Zhu** [![gh]][zhuoying] [![orc]][0000-0003-1775-7651] \
72+
Postdoctoral researcher\
73+
Lawrence Berkeley National Laboratory
74+
75+
[zhuoying]: https://github.com/zhuoying
76+
[0000-0003-1775-7651]: https://orcid.org/0000-0003-1775-7651

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ atm = "atomate2.cli:cli"
7373

7474
[project.urls]
7575
homepage = "https://materialsproject.github.io/atomate2/"
76-
repository = "https://github.com/hackingmaterials/atomate2"
76+
repository = "https://github.com/materialsproject/atomate2"
7777
documentation = "https://materialsproject.github.io/atomate2/"
78-
changelog = "https://github.com/hackingmaterials/atomate2/blob/main/CHANGELOG.md"
78+
changelog = "https://github.com/materialsproject/atomate2/blob/main/CHANGELOG.md"
7979

8080
[tool.setuptools.package-data]
8181
atomate2 = ["py.typed"]

0 commit comments

Comments
 (0)