From f77f37a6a8ab579928d6dadb75900129c1d5fd9a Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Tue, 26 Apr 2022 15:16:42 -0400 Subject: [PATCH 1/4] Update change log. --- CHANGELOG.rst | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 04161781f8..d4254d9eb8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,14 +13,18 @@ v3.1.0 (not yet released) *Added* * Support LLVM 13 when ``ENABLE_LLVM=on``. -* ``hoomd.md.pair.LJGauss`` Lennard-Jones-Gaussian pair potential. -* ``hoomd.md.alchemy.methods.NVT`` Alchemical molecular dynamics integration method. -* ``hoomd.md.alchemy.pair.LJGauss`` Lennard-Jones-Gaussian pair potential with alchemical degrees of - freedom. +* ``hoomd.md.pair.LJGauss`` - Lennard-Jones-Gaussian pair potential. +* ``hoomd.md.alchemy.methods.NVT`` - Alchemical molecular dynamics integration method. +* ``hoomd.md.alchemy.pair.LJGauss`` - Lennard-Jones-Gaussian pair potential with alchemical degrees + of freedom. +* ``hoomd.hpmc.update.Shape`` - Alchemical hard particle Monte Carlo through shape change moves. +* ``hoomd.hpmc.shape_move.Elastic`` - Shape move with elastic potential energy penalty. +* ``hoomd.hpmc.shape_move.ShapeSpace`` - Moves in a user defined shape space. +* ``hoomd.hpmc.shape_move.Vertex`` - Translate shape vertices. *Changed* -* Change HPMC fugacity to a per-type quantity. +* HPMC fugacity is now a per-type quantity. * Improved documentation. * [developers] Reduced the time needed for incremental builds. * [developers] Reduced memory needed to compile HOOMD. From 97fe4eb8a6ad1d0d82bba1ba1a357de4e0089dd2 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Tue, 26 Apr 2022 15:27:04 -0400 Subject: [PATCH 2/4] Update actions versions. --- .github/workflows/release.yml | 2 +- .github/workflows/templates/release.yml | 2 +- .github/workflows/templates/test.yml | 6 +++--- .github/workflows/test.yml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5b9534b3a..53b497b762 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.0.0 + uses: actions/checkout@v3.0.2 with: fetch-depth: 0 submodules: true diff --git a/.github/workflows/templates/release.yml b/.github/workflows/templates/release.yml index 5dd1a730f4..a420eadffe 100644 --- a/.github/workflows/templates/release.yml +++ b/.github/workflows/templates/release.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.0.0 + uses: actions/checkout@v3.0.2 with: fetch-depth: 0 submodules: true diff --git a/.github/workflows/templates/test.yml b/.github/workflows/templates/test.yml index d08ea233bd..0a82488331 100644 --- a/.github/workflows/templates/test.yml +++ b/.github/workflows/templates/test.yml @@ -49,7 +49,7 @@ env: <% endmacro %> <% set build_steps %> - name: Checkout - uses: actions/checkout@v3.0.0 + uses: actions/checkout@v3.0.2 with: path: code submodules: true @@ -250,10 +250,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.0.0 + - uses: actions/checkout@v3.0.2 with: path: code - - uses: actions/cache@v3.0.0 + - uses: actions/cache@v3.0.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-openstacksdk==0.61.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f1f66eb613..7045199885 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: run: rm -rf ./* - name: Checkout - uses: actions/checkout@v3.0.0 + uses: actions/checkout@v3.0.2 with: path: code submodules: true @@ -274,7 +274,7 @@ jobs: run: rm -rf ./* - name: Checkout - uses: actions/checkout@v3.0.0 + uses: actions/checkout@v3.0.2 with: path: code submodules: true @@ -464,10 +464,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.0.0 + - uses: actions/checkout@v3.0.2 with: path: code - - uses: actions/cache@v3.0.0 + - uses: actions/cache@v3.0.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-openstacksdk==0.61.0 From a4c1a5536ddfeecfd1cb68487096e8aa2a75a431 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Tue, 26 Apr 2022 15:28:28 -0400 Subject: [PATCH 3/4] Bump version to v3.1.0. --- .bumpversion.cfg | 2 +- BUILDING.rst | 4 ++-- CMakeLists.txt | 2 +- hoomd/hpmc/external/user.py | 4 ++-- hoomd/hpmc/pair/user.py | 2 +- sphinx-doc/conf.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ede7e27111..1c5c5829c5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.1 +current_version = 3.1.0 commit = False tag = False parse = ^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))(?:\.(?P0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)))?$ diff --git a/BUILDING.rst b/BUILDING.rst index 77aa1dd7c1..27fa7af674 100644 --- a/BUILDING.rst +++ b/BUILDING.rst @@ -138,7 +138,7 @@ Clone using Git_:: $ git clone --recursive https://github.com/glotzerlab/hoomd-blue -Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-v3.0.1.tar.gz`_. +Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-v3.1.0.tar.gz`_. .. seealso:: @@ -151,7 +151,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-v3.0.1.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v3.0.1/hoomd-v3.0.1.tar.gz +.. _Download hoomd-v3.1.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v3.1.0/hoomd-v3.1.0.tar.gz .. _GitHub release: https://github.com/glotzerlab/hoomd-blue/releases .. _git book: https://git-scm.com/book .. _Git: https://git-scm.com/ diff --git a/CMakeLists.txt b/CMakeLists.txt index cf276f472a..3cd9cfa550 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory (CMake) ################################ ## Version information -set(HOOMD_VERSION_RAW "3.0.1") +set(HOOMD_VERSION_RAW "3.1.0") string(REGEX MATCH "(.*)\\.(.*)\\.(.*)$" _hoomd_version_match ${HOOMD_VERSION_RAW}) set(HOOMD_VERSION_MAJOR ${CMAKE_MATCH_1}) set(HOOMD_VERSION_MINOR ${CMAKE_MATCH_2}) diff --git a/hoomd/hpmc/external/user.py b/hoomd/hpmc/external/user.py index e85014471e..f646c7510f 100644 --- a/hoomd/hpmc/external/user.py +++ b/hoomd/hpmc/external/user.py @@ -67,9 +67,9 @@ class CPPExternalPotential(ExternalField): Your code *must* return a value. .. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\ - v3.0.1/hoomd/VectorMath.h + v3.1.0/hoomd/VectorMath.h .. _BoxDim.h: https://github.com/glotzerlab/hoomd-blue/blob/\ - v3.0.1/hoomd/BoxDim.h + v3.1.0/hoomd/BoxDim.h Example: .. code-block:: python diff --git a/hoomd/hpmc/pair/user.py b/hoomd/hpmc/pair/user.py index 1dd2de6550..0658854361 100644 --- a/hoomd/hpmc/pair/user.py +++ b/hoomd/hpmc/pair/user.py @@ -76,7 +76,7 @@ class CPPPotentialBase(_HOOMDBaseObject): HOOMD-blue source code. .. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\ - v3.0.1/hoomd/VectorMath.h + v3.1.0/hoomd/VectorMath.h Note: Your code *must* return a value. diff --git a/sphinx-doc/conf.py b/sphinx-doc/conf.py index 1f5f800098..7f690582a5 100644 --- a/sphinx-doc/conf.py +++ b/sphinx-doc/conf.py @@ -56,8 +56,8 @@ copyright = f'2009-{ year } The Regents of the University of Michigan' author = 'The Regents of the University of Michigan' -version = '3.0.1' -release = '3.0.1' +version = '3.1.0' +release = '3.1.0' language = None From 57407800e52b8927b97d5c3cc0a27462c537429a Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Tue, 26 Apr 2022 15:39:11 -0400 Subject: [PATCH 4/4] Add date to change log. --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d4254d9eb8..7cf3cdcfe5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,8 +7,8 @@ Change Log v3.x ---- -v3.1.0 (not yet released) -^^^^^^^^^^^^^^^^^^^^^^^^^ +v3.1.0 (2022-04-27) +^^^^^^^^^^^^^^^^^^^ *Added*