Skip to content

Commit 9507165

Browse files
authored
Merge devel into master (#426)
2 parents 2e148f2 + 06c21b6 commit 9507165

File tree

177 files changed

+9818
-5279
lines changed

Some content is hidden

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

177 files changed

+9818
-5279
lines changed

.git-blame-ignore-revs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# .git-blame-ignore-revs
2+
# pre-commit
3+
ffa52c5d6230303d6f7ee4f1356f01aa5b2a011d
4+
# pre-commit docs python block
5+
ecdf566626c4b2d1824b946d1b7ad809cb8946dd
6+
# pre-commit imports
7+
4f1a91167b58f9042ae17cae05b609b7fdf5f20c

.github/ISSUE_TEMPLATE/request-for-help.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Before asking questions, you can
1313
search the previous issues or discussions
1414
check the [README](https://github.com/deepmodeling/dpdata/#readme).
1515

16-
Please **do not** post requests for help (e.g. with installing or using dpdata) here.
16+
Please **do not** post requests for help (e.g. with installing or using dpdata) here.
1717
Instead go to [discussions](https://github.com/deepmodeling/dpdata/discussions).
1818

1919
This issue tracker is for tracking dpdata development related issues only.

.github/workflows/pub-pypi.yml

-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ jobs:
3636
uses: pypa/gh-action-pypi-publish@master
3737
with:
3838
password: ${{ secrets.PYPI_API_TOKEN }}
39-

.github/workflows/test.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,9 @@ jobs:
3030
pass:
3131
needs: [build]
3232
runs-on: ubuntu-latest
33+
if: always()
3334
steps:
34-
- run: echo "All jobs passed"
35+
- name: Decide whether the needed jobs succeeded or failed
36+
uses: re-actors/alls-green@release/v1
37+
with:
38+
jobs: ${{ toJSON(needs) }}

.github/workflows/test_import.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ jobs:
1515
architecture: 'x64'
1616
- run: python -m pip install .
1717
- run: python -c 'import dpdata'
18-

.pre-commit-config.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v4.4.0
6+
hooks:
7+
# there are many log files in tests
8+
# TODO: seperate py files and log files
9+
- id: trailing-whitespace
10+
exclude: "^tests/.*$"
11+
- id: end-of-file-fixer
12+
exclude: "^tests/.*$"
13+
- id: check-yaml
14+
- id: check-json
15+
- id: check-added-large-files
16+
- id: check-merge-conflict
17+
- id: check-symlinks
18+
- id: check-toml
19+
# Python
20+
- repo: https://github.com/psf/black
21+
rev: 22.12.0
22+
hooks:
23+
- id: black-jupyter
24+
- repo: https://github.com/PyCQA/isort
25+
rev: 5.12.0
26+
hooks:
27+
- id: isort
28+
files: \.py$
29+
# numpydoc
30+
- repo: https://github.com/Carreau/velin
31+
rev: 0.0.12
32+
hooks:
33+
- id: velin
34+
args: ["--write"]
35+
# Python inside docs
36+
- repo: https://github.com/asottile/blacken-docs
37+
rev: 1.13.0
38+
hooks:
39+
- id: blacken-docs
40+
ci:
41+
autoupdate_branch: devel

0 commit comments

Comments
 (0)