Skip to content

Commit e02e6a2

Browse files
authored
merge devel to master (v0.13.0) (#1676)
2 parents 6943db5 + c4f05db commit e02e6a2

File tree

142 files changed

+959
-953
lines changed

Some content is hidden

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

142 files changed

+959
-953
lines changed

.git_archival.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node: $Format:%H$
2+
node-date: $Format:%cI$
3+
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.git_archival.txt export-subst

.github/workflows/release.yml

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,16 @@ on:
66
- 'v*'
77

88
jobs:
9-
conda-publish:
10-
runs-on: ubuntu-latest
11-
steps:
12-
- uses: actions/checkout@v2
13-
- name: publish-to-conda
14-
uses: felix5572/conda-publish-action@v1.9
15-
with:
16-
subdir: 'conda'
17-
anacondatoken: ${{ secrets.ANACONDA_TOKEN }}
18-
platforms: 'noarch'
19-
construct-and-publish:
20-
runs-on: ubuntu-latest
21-
needs: conda-publish
22-
steps:
23-
- uses: actions/checkout@master
24-
- uses: s-weigand/setup-conda@v1
25-
- run: conda install constructor jinja2 -y
26-
- run: constructor ./conda
27-
- name: Upload to release
28-
uses: softprops/action-gh-release@master
29-
if: startsWith(github.ref, 'refs/tags/')
30-
with:
31-
files: dpgen-*.sh
32-
repository: ${{ env.GITHUB_REPOSITORY }}
33-
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
359
release-to-pypi:
3610
name: Release to pypi
3711
runs-on: ubuntu-latest
3812
permissions:
3913
# IMPORTANT: this permission is mandatory for trusted publishing
4014
id-token: write
4115
steps:
42-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
4317
- name: Setup python
44-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
4519
with:
4620
python-version: 3.x
4721
architecture: x64

.github/workflows/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ jobs:
1212
python-version: ["3.9", "3.12"]
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v2
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: ${{ matrix.python-version }}
20+
- run: pip install uv
2021
- name: Install dependencies
21-
run: pip install -e .[test]
22+
run: uv pip install --system -e .[test]
2223
- name: Test
2324
run: coverage run --source=./dpgen -m unittest -v && coverage report
24-
- uses: codecov/codecov-action@v4
25+
- uses: codecov/codecov-action@v5
2526
env:
2627
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2728
pass:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
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.6.0
5+
rev: v5.0.0
66
hooks:
77
# there are many log files in tests
88
# TODO: seperate py files and log files
@@ -28,7 +28,7 @@ repos:
2828

2929
# Python
3030
- repo: https://github.com/astral-sh/ruff-pre-commit
31-
rev: v0.3.5
31+
rev: v0.7.4
3232
hooks:
3333
- id: ruff
3434
args: ["--fix"]

.readthedocs.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ build:
1010
os: ubuntu-22.04
1111
tools:
1212
python: "3.10"
13-
13+
jobs:
14+
post_create_environment:
15+
- pip install uv
16+
post_install:
17+
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH uv pip install -r doc/requirements.txt
1418
# Build documentation in the docs/ directory with Sphinx
1519
sphinx:
1620
configuration: doc/conf.py
1721

1822
# If using Sphinx, optionally build your docs in additional formats such as PDF
1923
formats: all
20-
21-
# Optionally declare the Python requirements required to build your docs
22-
python:
23-
install:
24-
- requirements: doc/requirements.txt

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For detailed usage and parameters, read [DP-GEN documentation](https://docs.deep
5353

5454
* [Tutorials](https://tutorials.deepmodeling.com/en/latest/Tutorials/DP-GEN/): basic tutorials for DP-GEN.
5555
* [Examples](examples): input files in [JSON](https://docs.python.org/3/library/json.html) format.
56-
* [Publications](https://deepmodeling.com/blog/papers/dpgen/): Published research articles using DP-GEN.
56+
* [Publications](https://blogs.deepmodeling.com/papers/dpgen/): Published research articles using DP-GEN.
5757
* [User guide](https://docs.deepmodeling.com/projects/dpgen/en/latest/user-guide/): frequently asked questions listed in troubleshooting.
5858

5959
## License

conda/conda_build_config.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

conda/construct.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

conda/meta.yaml

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)