Skip to content

Commit

Permalink
Merge pull request #1783 from glotzerlab/release-4.7.0
Browse files Browse the repository at this point in the history
Release 4.7.0
  • Loading branch information
joaander committed May 16, 2024
2 parents 68461aa + ff4c6d4 commit be621be
Show file tree
Hide file tree
Showing 16 changed files with 77 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.6.0
current_version = 4.7.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 Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ body:
attributes:
label: HOOMD-blue version
description: What version of HOOMD-blue are you using?
placeholder: 4.6.0
placeholder: 4.7.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.6.0'
title: 'Release 4.7.0'
labels: ''
assignees: 'joaander'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
fetch-depth: 0
submodules: true
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
run: tar -cvzf ${name}-${tag:1}.tar.gz ${name}-${tag:1}

- name: Upload release files
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: release
path: |
Expand All @@ -84,7 +84,7 @@ jobs:

steps:
- name: Download artifacts
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: release

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/templates/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
fetch-depth: 0
submodules: true
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
run: tar -cvzf ${name}-${tag:1}.tar.gz ${name}-${tag:1}

- name: Upload release files
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: release
path: |
Expand All @@ -71,7 +71,7 @@ jobs:

steps:
- name: Download artifacts
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: release

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/templates/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,29 +107,29 @@ env:
# Upload the tarballs. Retain the file for a limited time in case developers need to download
# and run tests locally for further debugging.
- name: 'Upload build'
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: build-${{ join(matrix.config, '_') }}-${{ github.sha }}
path: build.tar
retention-days: 7
- name: 'Upload install'
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
path: install.tar
retention-days: 7
<% endset %>
<% set download_build_steps %>
- name: Download build
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: build-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar build
run: << tar_command >> -xvf build.tar
<% endset %>
<% set download_install_steps %>
- name: Download install
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar install
Expand Down Expand Up @@ -183,7 +183,7 @@ env:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Use jetstream2-admin/start
uses: glotzerlab/jetstream2-admin/start@v1.2.4
uses: glotzerlab/jetstream2-admin/start@v1.2.5
with:
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Use jetstream2-admin/start
uses: glotzerlab/jetstream2-admin/start@v1.2.4
uses: glotzerlab/jetstream2-admin/start@v1.2.5
with:
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true
Expand Down Expand Up @@ -145,13 +145,13 @@ jobs:
# Upload the tarballs. Retain the file for a limited time in case developers need to download
# and run tests locally for further debugging.
- name: 'Upload build'
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: build-${{ join(matrix.config, '_') }}-${{ github.sha }}
path: build.tar
retention-days: 7
- name: 'Upload install'
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
path: install.tar
Expand Down Expand Up @@ -190,13 +190,13 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true

- name: Download install
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar install
Expand Down Expand Up @@ -251,13 +251,13 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true

- name: Download build
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: build-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar build
Expand Down Expand Up @@ -301,13 +301,13 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true

- name: Download install
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar install
Expand Down Expand Up @@ -364,7 +364,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true
Expand Down Expand Up @@ -425,13 +425,13 @@ jobs:
# Upload the tarballs. Retain the file for a limited time in case developers need to download
# and run tests locally for further debugging.
- name: 'Upload build'
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: build-${{ join(matrix.config, '_') }}-${{ github.sha }}
path: build.tar
retention-days: 7
- name: 'Upload install'
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.3.3
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
path: install.tar
Expand Down Expand Up @@ -479,13 +479,13 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true

- name: Download install
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: install-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar install
Expand Down Expand Up @@ -549,13 +549,13 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.4
with:
path: code
submodules: true

- name: Download build
uses: actions/download-artifact@v4.1.4
uses: actions/download-artifact@v4.1.7
with:
name: build-${{ join(matrix.config, '_') }}-${{ github.sha }}
- name: Untar build
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,4 @@ Simone Ciarella <s.ciarella@tue.nl> Ciarella, S <s.ciarella@tue.nl>
Simone Ciarella <s.ciarella@tue.nl> SCiarella <simoneciarella@gmail.com>
Simone Ciarella <s.ciarella@tue.nl> SCiarella <58949181+SCiarella@users.noreply.github.com>
Kieran Nehil-Puleo <nehilkieran@gmail.com> kierannp <nehilkieran@gmail.com>
Cristina Butu <icb2114@columbia.edu> crisbutu <129013261+crisbutu@users.noreply.github.com>
4 changes: 2 additions & 2 deletions BUILDING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Clone using Git_::

$ git clone --recursive https://github.com/glotzerlab/hoomd-blue

Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-4.6.0.tar.gz`_.
Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-4.7.0.tar.gz`_.

.. seealso::

Expand All @@ -158,7 +158,7 @@ Release tarballs are also available as `GitHub release`_ assets: `Download hoomd
Execute ``git submodule update --init`` to fetch the submodules each time you switch branches
and the submodules show as modified.

.. _Download hoomd-4.6.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v4.6.0/hoomd-4.6.0.tar.gz
.. _Download hoomd-4.7.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v4.7.0/hoomd-4.7.0.tar.gz
.. _GitHub release: https://github.com/glotzerlab/hoomd-blue/releases
.. _git book: https://git-scm.com/book
.. _Git: https://git-scm.com/
Expand Down
31 changes: 31 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,37 @@ Change Log
4.x
---

4.7.0 (2024-05-16)
^^^^^^^^^^^^^^^^^^

*Fixed*

* ``md.methods.rattle.Brownian`` executes without causing a segmentation fault on the CPU with domain
decomposition (`#1748 <https://github.com/glotzerlab/hoomd-blue/pull/1748>`__).
* Compile ``BoxDim.h`` without warnings
(`#1756 <https://github.com/glotzerlab/hoomd-blue/pull/1756>`__).
* Do not compute dipole-dipole interactions that are not necessary
(`#1758 <https://github.com/glotzerlab/hoomd-blue/pull/1758>`__).
* Correctly define the units of gamma in ``md.methods.Langevin``
(`#1771 <https://github.com/glotzerlab/hoomd-blue/pull/1771>`__).
* Fix compile errors with external components that use the Expanded Mie potential
(`#1781 <https://github.com/glotzerlab/hoomd-blue/pull/1781>`__).
* Allow HPMC pair potentials to be subclassed in external components
(`#1780 <https://github.com/glotzerlab/hoomd-blue/pull/1780>`__).

*Added*

* "How to tune move sizes in multicomponent HPMC systems" documentation page
(`#1750 <https://github.com/glotzerlab/hoomd-blue/pull/1750>`__).
* ``hoomd.box.from_basis_vectors`` - construct a box from arbitrary basis vectors
(`#1769 <https://github.com/glotzerlab/hoomd-blue/pull/1769>`__).

*Changed*

* Make readthedocs builds more reproducible
(`#1758 <https://github.com/glotzerlab/hoomd-blue/pull/1758>`__).


4.6.0 (2024-03-19)
^^^^^^^^^^^^^^^^^^

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ add_subdirectory (CMake)

################################
## Version information
set(HOOMD_VERSION_RAW "4.6.0")
set(HOOMD_VERSION_RAW "4.7.0")
string(REGEX MATCH "(.*)\\.(.*)\\.(.*)$" _hoomd_version_match ${HOOMD_VERSION_RAW})
set(HOOMD_VERSION_MAJOR ${CMAKE_MATCH_1})
set(HOOMD_VERSION_MINOR ${CMAKE_MATCH_2})
Expand Down
6 changes: 3 additions & 3 deletions INSTALLING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ Conda package
**HOOMD-blue** is available on conda-forge_ on the *linux-64*, *osx-64*, and *osx-arm64* platforms.
Install the ``hoomd`` package from the conda-forge_ channel into a conda environment::

$ conda install hoomd=4.6.0
$ conda install hoomd=4.7.0

``conda`` auto-detects whether your system has a GPU and attempts to install the appropriate
package. Override this and force the GPU enabled package installation with::

$ export CONDA_OVERRIDE_CUDA="12.0"
$ conda install "hoomd=4.6.0=*gpu*" "cuda-version=12.0"
$ conda install "hoomd=4.7.0=*gpu*" "cuda-version=12.0"

Similarly, you can force CPU only package installation with::

$ conda install "hoomd=4.6.0=*cpu*"
$ conda install "hoomd=4.7.0=*cpu*"

.. note::

Expand Down
4 changes: 2 additions & 2 deletions hoomd/hpmc/external/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ class CPPExternalPotential(ExternalField):
Your code *must* return a value.
.. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\
v4.6.0/hoomd/VectorMath.h
v4.7.0/hoomd/VectorMath.h
.. _BoxDim.h: https://github.com/glotzerlab/hoomd-blue/blob/\
v4.6.0/hoomd/BoxDim.h
v4.7.0/hoomd/BoxDim.h
.. rubric:: Example:
Expand Down
4 changes: 2 additions & 2 deletions hoomd/hpmc/pair/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class CPPPotentialBase(AutotunedObject):
HOOMD-blue source code.
.. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\
v4.6.0/hoomd/VectorMath.h
v4.7.0/hoomd/VectorMath.h
Note:
Your code *must* return a value.
Expand Down Expand Up @@ -343,7 +343,7 @@ class CPPPotentialUnion(CPPPotentialBase):
CPPPotentialUnion uses threaded execution on multiple CPU cores.
.. deprecated:: 4.6.0
.. deprecated:: 4.7.0
``num_cpu_threads >= 1`` is deprecated. Set ``num_cpu_threads = 1``.
Expand Down

0 comments on commit be621be

Please sign in to comment.