Skip to content

Commit

Permalink
Merge branch 'trunk-minor' into trunk-major
Browse files Browse the repository at this point in the history
  • Loading branch information
joaander committed Oct 29, 2024
2 parents 9313978 + e93861a commit 4a00311
Show file tree
Hide file tree
Showing 85 changed files with 16,521 additions and 1,837 deletions.
4 changes: 1 addition & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.8.2
current_version = 4.9.0
commit = False
tag = False
parse = ^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))(?:\.(?P<number>0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)))?$
Expand All @@ -14,8 +14,6 @@ values =

[bumpversion:file:INSTALLING.rst]

[bumpversion:file:BUILDING.rst]

[bumpversion:file:CMakeLists.txt]

[bumpversion:file:sphinx-doc/conf.py]
Expand Down
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,11 @@ body:
- Compiled from source
- Conda-forge package
- glotzerlab-software package
validations:
required: true
- type: input
attributes:
label: HOOMD-blue version
description: What version of HOOMD-blue are you using?
placeholder: 4.8.2
placeholder: 4.9.0
validations:
required: true
- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Release checklist
about: '[for maintainer use]'
title: 'Release 4.8.2'
title: 'Release 4.9.0'
labels: ''
assignees: 'joaander'

Expand Down
8 changes: 1 addition & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,9 @@ Resolves #???
<!--- Please build the sphinx documentation and check that any changes to
documentation display properly. -->

## Change log

<!-- Propose a change log entry. -->
```
```

## Checklist:

- [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-blue/blob/trunk-minor/CONTRIBUTING.rst).
- [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-blue/blob/trunk-minor/ContributorAgreement.md).
- [ ] My name is on the list of contributors (`sphinx-doc/credits.rst`) in the pull request source branch.
- [ ] I have summarized these changes in `CHANGELOG.rst` following the established format.
8 changes: 4 additions & 4 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ jobs:
submodules: true

- name: Create Python Environment
uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 # v1.9.0
uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 # v2.0.0
with:
micromamba-version: '1.5.8-0'
micromamba-version: '2.0.2-2'
environment-name: test
environment-file: code/.github/workflows/environments/py${{ inputs.python }}-conda-lock.yml
post-cleanup: all
Expand Down Expand Up @@ -233,9 +233,9 @@ jobs:
path: code

- name: Create Python Environment
uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 # v1.9.0
uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 # v2.0.0
with:
micromamba-version: '1.5.8-0'
micromamba-version: '2.0.2-2'
environment-name: test
environment-file: code/.github/workflows/environments/py${{ inputs.python }}-conda-lock.yml
post-cleanup: all
Expand Down
Loading

0 comments on commit 4a00311

Please sign in to comment.