Skip to content

Commit 042ea32

Browse files
njzjznjzjz
authored
merge devel to master (#1382)
2 parents 4be4f6d + 9ddef6a commit 042ea32

File tree

366 files changed

+17266
-10000
lines changed

Some content is hidden

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

366 files changed

+17266
-10000
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

-37
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Bug report
2+
description: Create a bug report to help us eliminate issues and improve deepmd-kit.
3+
title: "[BUG] "
4+
labels: bug
5+
assignees: []
6+
body:
7+
- type: textarea
8+
id: summary
9+
attributes:
10+
label: Bug summary
11+
description: Please provide a clear and concise description of what the bug is.
12+
placeholder:
13+
value:
14+
validations:
15+
required: true
16+
- type: input
17+
id: version
18+
attributes:
19+
label: DP-GEN Version
20+
description: "`dpgen --version`"
21+
validations:
22+
required: true
23+
- type: textarea
24+
id: other-version
25+
attributes:
26+
label: Platform, Python Version, Remote Platform, etc
27+
description: "If applicable, specify what platform you are running on."
28+
placeholder:
29+
value:
30+
validations:
31+
required: false
32+
- type: textarea
33+
id: log
34+
attributes:
35+
label: Input Files, Running Commands, Error Log, etc.
36+
description: "Please provide necessary information including input file, running commands, error log , etc., AS DETAILED AS POSSIBLE to help locate and reproduce your problem. WARNING: Do not use image to show error log! Paste texts in a code block instead."
37+
placeholder:
38+
value:
39+
validations:
40+
required: true
41+
- type: textarea
42+
id: reproduce
43+
attributes:
44+
label: Steps to Reproduce
45+
description: "Describe the steps required to (quickly) reproduce the issue. You can attach (small) files to the section below or add URLs where to download an archive with all necessary files. Please try to create an input set that is as minimal and small as possible and reproduces the bug as quickly as possible. **NOTE:** the less effort and time it takes to reproduce your reported bug, the more likely it becomes, that somebody will look into it and fix the problem."
46+
placeholder:
47+
value:
48+
validations:
49+
required: true
50+
- type: textarea
51+
id: further
52+
attributes:
53+
label: Further Information, Files, and Links
54+
description: Put any additional information here, attach relevant text or image files and URLs to external sites, e.g. relevant publications
55+
placeholder:
56+
value:
57+
validations:
58+
required: false

‎.github/ISSUE_TEMPLATE/config.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Submit DeePMD-kit issue
4+
url: https://github.com/deepmodeling/deepmd-kit/issues
5+
about: If the issue is related to DeePMD-kit (model training and inference), submit to deepmd-kit repository
6+
- name: Submit dpdata issue
7+
url: https://github.com/deepmodeling/dpdata/issues
8+
about: If the issue is related to dpdata (format conversion), submit to dpdata repository
9+
- name: Submit dpdispatcher issue
10+
url: https://github.com/deepmodeling/dpdispatcher/issues
11+
about: If the issue is related to dpdispatcher (job submission), submit to dpdispatcher repository
12+
- name: Request for Help
13+
url: https://github.com/deepmodeling/dpgen/discussions/new?category=q-a
14+
about: If you have an usage question

‎.github/ISSUE_TEMPLATE/feature_request.md

-21
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Feature request
2+
description: Suggest an idea for this project.
3+
title: "[Feature Request] "
4+
labels: enhancement
5+
assignees: []
6+
body:
7+
- type: textarea
8+
id: summary
9+
attributes:
10+
label: Summary
11+
description: "Please provide a brief and concise description of the suggested feature or change"
12+
placeholder:
13+
value:
14+
validations:
15+
required: true
16+
- type: textarea
17+
id: details
18+
attributes:
19+
label: Detailed Description
20+
description: "Please explain how you would like to see deepmd-kit enhanced, what feature(s) you are looking for, what specific problems this will solve. If possible, provide references to relevant background information like publications or web pages, and whether you are planning to implement the enhancement yourself or would like to participate in the implementation. If applicable add a reference to an existing bug report or issue that this will address."
21+
placeholder:
22+
value:
23+
validations:
24+
required: true
25+
- type: textarea
26+
id: further
27+
attributes:
28+
label: Further Information, Files, and Links
29+
description: Put any additional information here, attach relevant text or image files and URLs to external sites, e.g. relevant publications
30+
placeholder:
31+
value:
32+
validations:
33+
required: false

‎.github/ISSUE_TEMPLATE/generic-issue.md

-25
This file was deleted.

‎.github/ISSUE_TEMPLATE/generic-issue.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Generic issue
2+
description: For issues that do not fit any of the other categories.
3+
assignees: []
4+
body:
5+
- type: textarea
6+
id: summary
7+
attributes:
8+
label: Summary
9+
description: "Please provide a clear and concise description of what the question is."
10+
placeholder:
11+
value:
12+
validations:
13+
required: true
14+
- type: input
15+
id: version
16+
attributes:
17+
label: DP-GEN Version
18+
description: "`dpgen --version`"
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: other-version
23+
attributes:
24+
label: Platform, Python Version, etc
25+
description: "If applicable, specify what platform you are running on."
26+
placeholder:
27+
value:
28+
validations:
29+
required: false
30+
- type: textarea
31+
id: details
32+
attributes:
33+
label: Details
34+
description: "Please explain the issue in detail here."
35+
placeholder:
36+
value:
37+
validations:
38+
required: true

‎.github/ISSUE_TEMPLATE/parameters.md

-25
This file was deleted.

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

-21
This file was deleted.

‎.github/workflows/release.yml

+18-3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,21 @@ jobs:
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3535
release-to-pypi:
36-
uses: deepmodeling/workflows/.github/workflows/release-to-pypi.yml@main
37-
secrets:
38-
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
36+
name: Release to pypi
37+
runs-on: ubuntu-latest
38+
permissions:
39+
# IMPORTANT: this permission is mandatory for trusted publishing
40+
id-token: write
41+
steps:
42+
- uses: actions/checkout@v3
43+
- name: Setup python
44+
uses: actions/setup-python@v4
45+
with:
46+
python-version: 3.x
47+
architecture: x64
48+
- name: Install dependencies
49+
run: python -m pip install build
50+
- run: python -m build
51+
- name: Publish a Python distribution to PyPI
52+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
53+
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python-version: [3.8, 3.9]
12+
python-version: ["3.9", "3.12"]
1313

1414
steps:
1515
- uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020
- name: Install dependencies
21-
run: pip install coverage git+https://github.com/materialsproject/pymatgen@b56698019098247ff54f50997a67c562b4375fc3 -e .
21+
run: pip install -e .[test]
2222
- name: Test
2323
run: coverage run --source=./dpgen -m unittest -v && coverage report
2424
- uses: codecov/codecov-action@v3

‎.pre-commit-config.yaml

+13-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.4.0
5+
rev: v4.5.0
66
hooks:
77
# there are many log files in tests
88
# TODO: seperate py files and log files
@@ -12,22 +12,27 @@ repos:
1212
exclude: "^tests/.*$"
1313
- id: check-yaml
1414
exclude: "^conda/.*$"
15-
#- id: check-json
15+
- id: check-json
16+
exclude: "^examples/CH4-lebesgue/.*$"
1617
- id: check-added-large-files
1718
- id: check-merge-conflict
1819
- id: check-symlinks
1920
exclude: "^tests/tools/run_report_test_output/.*$"
2021
- id: check-toml
22+
- id: pretty-format-json
23+
args:
24+
- "--autofix"
25+
- "--no-sort-keys"
26+
- "--indent=4"
27+
exclude: "^examples/CH4-lebesgue/.*$"
28+
2129
# Python
22-
- repo: https://github.com/psf/black
23-
rev: 22.12.0
24-
hooks:
25-
- id: black-jupyter
26-
- repo: https://github.com/charliermarsh/ruff-pre-commit
27-
rev: v0.0.253
30+
- repo: https://github.com/astral-sh/ruff-pre-commit
31+
rev: v0.1.3
2832
hooks:
2933
- id: ruff
3034
args: ["--fix"]
35+
- id: ruff-format
3136
# numpydoc
3237
- repo: https://github.com/Carreau/velin
3338
rev: 0.0.12

0 commit comments

Comments
 (0)