From 366e2375a240baeac8437793d79b357d4899e213 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Thu, 13 Apr 2023 15:31:51 -0400 Subject: [PATCH 1/6] Update mail map. --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 1961831412..3738e3c2a0 100644 --- a/.mailmap +++ b/.mailmap @@ -156,3 +156,5 @@ Raymond Asare rayasare Marco Klement Marco Klement, M.Sc Chris Jones Melody Zhang Melody Zhang <114299909+melodyyzh@users.noreply.github.com> +Jen Bradley Jen Bradley <55467578+janbridley@users.noreply.github.com> +Jen Bradley janbridley From b7979d27ce827cc06c3e01f8913706ae04c89395 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Thu, 13 Apr 2023 15:38:12 -0400 Subject: [PATCH 2/6] Run clang-format. --- hoomd/hpmc/ComputeSDF.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hoomd/hpmc/ComputeSDF.h b/hoomd/hpmc/ComputeSDF.h index a64e5bbd8c..3d0b404bb7 100644 --- a/hoomd/hpmc/ComputeSDF.h +++ b/hoomd/hpmc/ComputeSDF.h @@ -163,11 +163,11 @@ template class ComputeSDF : public Compute double m_xmax; //!< Maximum lambda value double m_dx; //!< Histogram step size - bool m_shape_requires_expansion_moves; //!< If expansion moves are required - std::vector m_hist_compression; //!< Raw histogram data - std::vector m_sdf_compression; //!< Computed SDF - std::vector m_hist_expansion; //!< Raw histogram data - std::vector m_sdf_expansion; //!< Computed SDF + bool m_shape_requires_expansion_moves; //!< If expansion moves are required + std::vector m_hist_compression; //!< Raw histogram data + std::vector m_sdf_compression; //!< Computed SDF + std::vector m_hist_expansion; //!< Raw histogram data + std::vector m_sdf_expansion; //!< Computed SDF //! Find the maximum particle separation beyond which all interactions are zero Scalar getMaxInteractionDiameter(); @@ -591,7 +591,7 @@ template void ComputeSDF::countHistogramLinearSearch(uint64_ { hist_weight_ptl_i_compression = 1.0; // = 1-e^(-\infty) min_bin_compression = bin_to_sample; - } // end if (hard_overlap) + } // end if (hard_overlap) // if no hard overlap, check for a soft overlap if we have // patches @@ -644,7 +644,7 @@ template void ComputeSDF::countHistogramLinearSearch(uint64_ { hist_weight_ptl_i_expansion = 1.0; // = 1-e^(-\infty) min_bin_expansion = bin_to_sample; - } // end if (hard_overlap) + } // end if (hard_overlap) // if no hard overlap, check for a soft overlap if necessary if (!hard_overlap && m_mc->getPatchEnergy()) From af8c52486cf82756a8ae05ab67f746f0d8b1fc9b Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Thu, 13 Apr 2023 15:38:21 -0400 Subject: [PATCH 3/6] Bump actions versions. --- .github/workflows/release.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/templates/release.yml | 2 +- .github/workflows/templates/test.yml | 4 ++-- .github/workflows/test.yml | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd5abdd904..41a07f0b34 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 submodules: true diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f80c2eeac6..a9d4d640af 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Run stale action - uses: actions/stale@v7.0.0 + uses: actions/checkout@v8.0.0 with: operations-per-run: 120 delete-branch: true diff --git a/.github/workflows/templates/release.yml b/.github/workflows/templates/release.yml index e750ccfaf4..b70a1ba3fa 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.3.0 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 submodules: true diff --git a/.github/workflows/templates/test.yml b/.github/workflows/templates/test.yml index 22be82723d..f81c478988 100644 --- a/.github/workflows/templates/test.yml +++ b/.github/workflows/templates/test.yml @@ -181,7 +181,7 @@ env: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -209,7 +209,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Use jetstream2-admin/start - uses: glotzerlab/jetstream2-admin/start@v1.2.1 + uses: glotzerlab/jetstream2-admin/start@v1.2.2 with: OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }} OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cf59db9e45..dc00fccc7a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Use jetstream2-admin/start - uses: glotzerlab/jetstream2-admin/start@v1.2.1 + uses: glotzerlab/jetstream2-admin/start@v1.2.2 with: OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }} OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }} @@ -84,7 +84,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -192,7 +192,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -255,7 +255,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -305,7 +305,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -370,7 +370,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -487,7 +487,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true @@ -559,7 +559,7 @@ jobs: run: ( shopt -s dotglob nullglob; rm -rf ./* ) shell: bash - name: Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.5.2 with: path: code submodules: true From 9e06f626dc6cdaf91af232f2c82520d7f448c877 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Thu, 13 Apr 2023 15:39:40 -0400 Subject: [PATCH 4/6] Bump version to 3.11.0. --- .bumpversion.cfg | 2 +- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- BUILDING.rst | 4 ++-- CMakeLists.txt | 2 +- hoomd/hpmc/external/user.py | 4 ++-- hoomd/hpmc/pair/user.py | 2 +- sphinx-doc/conf.py | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 14188f9d09..cf87d3945f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.10.0 +current_version = 3.11.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/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 7014aaa18f..1960d74312 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -62,7 +62,7 @@ body: attributes: label: HOOMD-blue version description: What version of HOOMD-blue are you using? - placeholder: 3.10.0 + placeholder: 3.11.0 validations: required: true - type: markdown diff --git a/BUILDING.rst b/BUILDING.rst index f00d1e82f8..e5465c6c9f 100644 --- a/BUILDING.rst +++ b/BUILDING.rst @@ -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-v3.10.0.tar.gz`_. +Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-v3.11.0.tar.gz`_. .. seealso:: @@ -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-v3.10.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v3.10.0/hoomd-v3.10.0.tar.gz +.. _Download hoomd-v3.11.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v3.11.0/hoomd-v3.11.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 45c1246216..704eb21004 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory (CMake) ################################ ## Version information -set(HOOMD_VERSION_RAW "3.10.0") +set(HOOMD_VERSION_RAW "3.11.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 109681b517..2d0bfa0832 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.10.0/hoomd/VectorMath.h + v3.11.0/hoomd/VectorMath.h .. _BoxDim.h: https://github.com/glotzerlab/hoomd-blue/blob/\ - v3.10.0/hoomd/BoxDim.h + v3.11.0/hoomd/BoxDim.h Example: .. code-block:: python diff --git a/hoomd/hpmc/pair/user.py b/hoomd/hpmc/pair/user.py index f811102c44..b391ed421a 100644 --- a/hoomd/hpmc/pair/user.py +++ b/hoomd/hpmc/pair/user.py @@ -75,7 +75,7 @@ class CPPPotentialBase(AutotunedObject): HOOMD-blue source code. .. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\ - v3.10.0/hoomd/VectorMath.h + v3.11.0/hoomd/VectorMath.h Note: Your code *must* return a value. diff --git a/sphinx-doc/conf.py b/sphinx-doc/conf.py index 4dbaa90e2a..6d4d45740f 100644 --- a/sphinx-doc/conf.py +++ b/sphinx-doc/conf.py @@ -63,8 +63,8 @@ copyright = f'2009-{ year } The Regents of the University of Michigan' author = 'The Regents of the University of Michigan' -version = '3.10.0' -release = '3.10.0' +version = '3.11.0' +release = '3.11.0' language = 'en' From 18db10142eb007e125304ed426e1abac5b0b11aa Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Thu, 13 Apr 2023 15:44:21 -0400 Subject: [PATCH 5/6] Label release date. --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d4392e39c2..828d9526d2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,8 +7,8 @@ Change Log v3.x ---- -v3.11.0 (not yet released) -^^^^^^^^^^^^^^^^^^^^^^^^^^ +v3.11.0 (2023-04-14) +^^^^^^^^^^^^^^^^^^^^ Added: From 5725264651bcddf22f0e0af2f24cb0f57d2523e3 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Fri, 14 Apr 2023 11:43:22 -0400 Subject: [PATCH 6/6] Fix stale action. --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index a9d4d640af..23832bd175 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Run stale action - uses: actions/checkout@v8.0.0 + uses: actions/stale@v8.0.0 with: operations-per-run: 120 delete-branch: true