Skip to content

Commit acdc06f

Browse files
merge devel to master (#535)
2 parents 85a3b5e + ec7985b commit acdc06f

40 files changed

+1468
-323
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install rdkit
2323
run: python -m pip install rdkit openbabel-wheel
2424
- name: Install dependencies
25-
run: python -m pip install .[amber,ase,pymatgen] coverage
25+
run: python -m pip install .[amber,ase,pymatgen] coverage ./tests/plugin
2626
- name: Test
2727
run: cd tests && coverage run --source=../dpdata -m unittest && cd .. && coverage combine tests/.coverage && coverage report
2828
- name: Run codecov

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ _version.py
2424
__pycache__
2525
docs/_build
2626
docs/formats.csv
27+
docs/drivers.csv
28+
docs/minimizers.csv
2729
docs/api/
30+
docs/formats/

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ repos:
1818
- id: check-toml
1919
# Python
2020
- repo: https://github.com/psf/black
21-
rev: 23.3.0
21+
rev: 23.7.0
2222
hooks:
2323
- id: black-jupyter
24-
- repo: https://github.com/charliermarsh/ruff-pre-commit
24+
- repo: https://github.com/astral-sh/ruff-pre-commit
2525
# Ruff version.
26-
rev: v0.0.263
26+
rev: v0.0.287
2727
hooks:
2828
- id: ruff
2929
args: ["--fix"]
@@ -35,7 +35,7 @@ repos:
3535
args: ["--write"]
3636
# Python inside docs
3737
- repo: https://github.com/asottile/blacken-docs
38-
rev: 1.13.0
38+
rev: 1.16.0
3939
hooks:
4040
- id: blacken-docs
4141
ci:

.readthedocs.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
3+
build:
4+
os: ubuntu-22.04
5+
tools:
6+
python: "3.11"
7+
sphinx:
8+
configuration: docs/conf.py
9+
formats: all
10+
python:
11+
install:
12+
- requirements: docs/requirements.txt

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# dpdata
2+
3+
[![conda-forge](https://img.shields.io/conda/dn/conda-forge/dpdata?color=red&label=conda-forge&logo=conda-forge)](https://anaconda.org/conda-forge/dpdata)
4+
[![pip install](https://img.shields.io/pypi/dm/dpdata?label=pip%20install&logo=pypi)](https://pypi.org/project/dpdata)
5+
[![Documentation Status](https://readthedocs.org/projects/dpdata/badge/)](https://dpdata.readthedocs.io/)
6+
17
**dpdata** is a python package for manipulating data formats of software in computational science, including DeePMD-kit, VASP, LAMMPS, GROMACS, Gaussian.
28
dpdata only works with python 3.7 or above.
39

@@ -82,11 +88,12 @@ The `System` or `LabeledSystem` can be constructed from the following file forma
8288
| Amber | multi | True | True | LabeledSystem | 'amber/md' |
8389
| Amber/sqm | sqm.out | False | False | System | 'sqm/out' |
8490
| Gromacs | gro | True | False | System | 'gromacs/gro' |
85-
| ABACUS | STRU | False | False | System | 'abacus/stru' |
91+
| ABACUS | STRU | False | False | System | 'abacus/stru' |
8692
| ABACUS | STRU | False | True | LabeledSystem | 'abacus/scf' |
8793
| ABACUS | cif | True | True | LabeledSystem | 'abacus/md' |
8894
| ABACUS | STRU | True | True | LabeledSystem | 'abacus/relax' |
8995
| ase | structure | True | True | MultiSystems | 'ase/structure' |
96+
| DFTB+ | dftbplus | False | True | LabeledSystem | 'dftbplus' |
9097

9198

9299
The Class `dpdata.MultiSystems` can read data from a dir which may contains many files of different systems, or from single xyz file which contains different systems.

docs/formats.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ dpdata supports the following formats:
66
.. csv-table:: Supported Formats
77
:file: formats.csv
88
:header-rows: 1
9+
10+
11+
.. toctree::
12+
:maxdepth: 1
13+
:glob:
14+
15+
formats/*

0 commit comments

Comments
 (0)