Skip to content

Commit 2da95f6

Browse files
authored
Merge pull request #2182 from glotzerlab/release-6.0.0
Release 6.0.0
2 parents b8691d2 + e4091ac commit 2da95f6

30 files changed

+138
-105
lines changed

.bumpversion.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "5.4.0"
2+
current_version = "6.0.0"
33

44
[[tool.bumpversion.files]]
55
filename = "INSTALLING.rst"

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ body:
6060
attributes:
6161
label: HOOMD-blue version
6262
description: What version of HOOMD-blue are you using?
63-
placeholder: 5.4.0
63+
placeholder: 6.0.0
6464
validations:
6565
required: true
6666
- type: markdown

.github/ISSUE_TEMPLATE/release.md

Lines changed: 66 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,81 @@
11
---
22
name: Release checklist
33
about: '[for maintainer use]'
4-
title: 'Release 5.4.0'
4+
title: 'Release 6.0.0'
55
labels: ''
6-
assignees: 'joaander'
76

87
---
98

10-
Minor and major releases:
9+
To make a new HOOMD-blue release:
1110

12-
- [ ] Update tutorial submodule.
11+
- [ ] Make a new `release-{X.Y.Z}` branch (where `{X.Y.Z}` is the new version).
12+
13+
On that branch, take the following steps (committing after each step when needed):
14+
15+
- [ ] Run `prek autoupdate`
1316
- [ ] Check for new or duplicate contributors since the last release:
1417
`comm -13 (git log $(git describe --tags --abbrev=0) --format="%aN <%aE>" | sort | uniq | psub) (git log --format="%aN <%aE>" | sort | uniq | psub)`.
1518
Add entries to `.mailmap` to remove duplicates.
19+
- [ ] Update tutorial submodule.
1620
- [ ] Ensure that added features have Sybil examples.
21+
- [ ] Review `CHANGELOG.rst` and revise if needed.
22+
- [ ] Run `bump-my-version bump {type}`. Replace `{type}` with:
23+
- `patch` when this release *only* includes bug fixes.
24+
- `minor` when this release includes new features and possibly bug fixes.
25+
- `major` when this release includes API breaking changes.
26+
- [ ] Push the branch and open a pull request.
27+
- [ ] Check that readthedocs builds the docs correctly in the pull request checks.
28+
- [ ] Merge the pull request after all tests pass.
29+
- [ ] Make a new tag on the trunk branch:
30+
```
31+
git switch trunk
32+
git pull
33+
git tag -a v{X.Y.Z}
34+
git push origin --tags
35+
```
36+
37+
> [!IMPORTANT]
38+
> Make sure to **include** `v` in the tag name!
39+
40+
- [ ] Add a blank release notes entry for the next release:
41+
```
42+
Next release
43+
^^^^^^^^^^^^^^^^^^^^
44+
45+
*Added*
46+
47+
*Changed*
48+
49+
*Deprecated*
50+
51+
*Removed*
52+
53+
*Fixed*
54+
```
55+
56+
> [!NOTE]
57+
> Paste `Next release` exactly as shown. `bump-my-version` will replace that
58+
> string with the version number and date.
59+
60+
GitHub Actions will trigger on the tag and create a GitHub release. After a few
61+
hours, the conda-forge autotick bot will submit a PR for the new release.
62+
63+
- [ ] Check that the GitHub release posted correctly: https://github.com/glotzerlab/hoomd-blue/releases
64+
- [ ] Merge the conda-forge recipe, updating it first if necessary (e.g. when adding dependencies).
65+
- [ ] Update *glotzerlab-software*. Build the new version on:
66+
- [ ] Great Lakes
67+
- [ ] Anvil
68+
- [ ] Delta
69+
- [ ] Frontier
70+
- [ ] Andes
71+
72+
For major and minor releases:
73+
74+
- [ ] Test *hoomd-component-template* against the new version.
75+
- Sync those changes with:
76+
- [ ] *hoomd-md-pair-template*.
77+
- [ ] *hoomd-hpmc-shape-template*.
78+
- [ ] *hpmc-energy-template*.
1779
- [ ] Run [hoomd-benchmarks](https://github.com/glotzerlab/hoomd-benchmarks), check for performance
1880
regressions with the previous release, and post the tables in the release pull request.
1981
- [ ] Run [hoomd-validation](https://github.com/glotzerlab/hoomd-validation).
20-
21-
All releases:
22-
23-
- [ ] Run `prek autoupdate`
24-
- [ ] Run *bump-my-version*.
25-
- [ ] Review change log.
26-
- [ ] Check readthedocs build, especially change log formatting.
27-
- [ ] Tag and push.
28-
- [ ] Update conda-forge recipe.
29-
- [ ] Update *glotzerlab-software*.
30-
- [ ] Update *hoomd-component-template*.
31-
- [ ] Update *hoomd-md-pair-template*.
32-
- [ ] Update *hoomd-hpmc-shape-template*.
33-
- [ ] Update *hpmc-energy-template*.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!-- Please confirm that your work is based on the correct branch. -->
2-
<!-- Bug fixes should be based on *trunk-patch*. -->
3-
<!-- Backwards compatible new features should be based on *trunk-minor*. -->
4-
<!-- Incompatible API changes should be based on *trunk-major*. -->
5-
61
## Description
72

83
<!-- Describe your changes in detail. -->
@@ -23,7 +18,7 @@ Resolves #???
2318

2419
## Checklist:
2520

26-
- [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-blue/blob/trunk-minor/CONTRIBUTING.rst).
27-
- [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-blue/blob/trunk-minor/ContributorAgreement.md).
21+
- [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-blue/blob/trunk/CONTRIBUTING.rst).
22+
- [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-blue/blob/trunk/ContributorAgreement.md).
2823
- [ ] My name is on the list of contributors (`sphinx-doc/credits.rst`) in the pull request source branch.
2924
- [ ] I have summarized these changes in `CHANGELOG.rst` following the established format.

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
push:
1111
branches:
12-
- "trunk-*"
12+
- "trunk"
1313
tags:
1414
- "v*"
1515

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ on:
88

99
jobs:
1010
stale:
11-
uses: glotzerlab/workflows/.github/workflows/stale.yaml@894d9678188a02b06560fdeb2b9ba98d016cd371 # 0.10.0
11+
uses: glotzerlab/workflows/.github/workflows/stale.yaml@2245be9e78600bf7846aaf9555da322446f46110 # 0.11.0

.github/workflows/style.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
push:
1313
branches:
14-
- "trunk-*"
14+
- "trunk"
1515

1616
jobs:
1717
prek:
@@ -20,7 +20,7 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2222
- name: prek
23-
uses: glotzerlab/workflows/prek@894d9678188a02b06560fdeb2b9ba98d016cd371 # 0.10.0
23+
uses: glotzerlab/workflows/prek@2245be9e78600bf7846aaf9555da322446f46110 # 0.11.0
2424

2525
# This job is used to provide a single requirement for branch merge conditions.
2626
tests_complete:

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
push:
1212
branches:
13-
- "trunk-*"
13+
- "trunk"
1414

1515
workflow_dispatch:
1616

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,4 @@ Suraj Kannur <[email protected]> surajkannur <[email protected]>
192192
Suraj Kannur <[email protected]> SURAJ KANNUR <[email protected]>
193193
W. Kwabena Darko <[email protected]> W. Kwabena Darko <[email protected]>
194194
195+

.pre-commit-config.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ repos:
2929
pass_filenames: false
3030
always_run: true
3131
additional_dependencies:
32-
- numpy==2.1.0
33-
- repo: https://github.com/pre-commit/pre-commit-hooks
34-
rev: 'v5.0.0'
32+
- numpy==2.3.5
33+
- repo: builtin
3534
hooks:
3635
- id: end-of-file-fixer
3736
exclude_types: [svg]
@@ -40,7 +39,6 @@ repos:
4039
- id: check-json
4140
- id: check-yaml
4241
exclude: "\\.clang-format"
43-
- id: check-case-conflict
4442
- id: mixed-line-ending
4543
- repo: https://github.com/glotzerlab/fix-license-header
4644
rev: v0.4.1
@@ -60,18 +58,18 @@ repos:
6058
- --keep-before=#!
6159
- --keep-after=.. include
6260
- repo: https://github.com/kynan/nbstripout
63-
rev: 0.8.1
61+
rev: 0.8.2
6462
hooks:
6563
- id: nbstripout
6664
- repo: https://github.com/astral-sh/ruff-pre-commit
67-
rev: 'v0.12.2'
65+
rev: v0.14.6
6866
hooks:
6967
- id: ruff-format
7068
types_or: [python]
7169
- id: ruff-check
7270
types_or: [python]
7371
- repo: https://github.com/pre-commit/mirrors-clang-format
74-
rev: v20.1.7
72+
rev: v21.1.6
7573
hooks:
7674
- id: clang-format
7775
types_or: [c, c++, cuda, inc]

0 commit comments

Comments
 (0)