From ddbe12caf788e7181e1239e3523238eb5cb9961b Mon Sep 17 00:00:00 2001 From: Tommy Waltmann Date: Thu, 13 Jun 2024 16:44:14 -0400 Subject: [PATCH 1/3] changes for making the release --- .mailmap | 1 + .pre-commit-config.yaml | 8 ++++---- ChangeLog.md | 6 ++---- contributors.txt | 13 +++++++------ doc/source/gettingstarted/examples | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.mailmap b/.mailmap index 28145e955..39c5ef989 100644 --- a/.mailmap +++ b/.mailmap @@ -64,3 +64,4 @@ Alain Kadar AlainKadar <73320455+AlainKadar@users.noreply.git Alain Kadar AlainKadar Melody Zhang Melody Zhang <114299909+melodyyzh@users.noreply.github.com> Melody Zhang yiyuanmz +Jen Bradley <55467578+janbridley@users.noreply.github.com> janbridley diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f0c668da8..e6abc2ea2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: (?:^extern/) repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 'v4.5.0' + rev: 'v4.6.0' hooks: - id: end-of-file-fixer exclude: | @@ -56,7 +56,7 @@ repos: - --add=This file is from the freud project, released under the BSD 3-Clause License. - --comment-prefix=// - repo: https://github.com/asottile/pyupgrade - rev: 'v3.15.2' + rev: 'v3.16.0' hooks: - id: pyupgrade args: @@ -66,7 +66,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: '24.3.0' + rev: '24.4.2' hooks: - id: black - repo: https://github.com/PyCQA/flake8 @@ -83,7 +83,7 @@ repos: hooks: - id: cmake-format - repo: https://github.com/pre-commit/mirrors-clang-format - rev: 'v18.1.2' + rev: 'v18.1.6' hooks: - id: clang-format types_or: [c, c++] diff --git a/ChangeLog.md b/ChangeLog.md index 37ef53b18..2c5760fde 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -4,15 +4,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## v3.1.0 -- 20xx-xx-xx +## v3.1.0 -- 2024-06-17 ### Added * New continuous coordination number compute `freud.order.ContinuousCoordination`. * New methods for conversion of box lengths and angles to/from `freud.box.Box`. -* Support Numpy 2.0. - -### Changed * Add copy button to documentation code snippets. +* Support Numpy 2.0. ### Fixed * Default value for `terminate_after_blocked` in `FilterRAD`. diff --git a/contributors.txt b/contributors.txt index 3c207e75b..ba327ed57 100644 --- a/contributors.txt +++ b/contributors.txt @@ -1,17 +1,17 @@ 2373 Bradley Dice 2148 Vyas Ramasubramani 1030 Eric Harper - 1000 Tommy Waltmann + 1030 Tommy Waltmann 456 Jin Soo Ihm - 328 Joshua A. Anderson - 275 dependabot + 366 Joshua A. Anderson + 294 dependabot 240 Matthew Spellings - 202 DomFijan + 230 DomFijan 167 Kelly Wang + 126 Brandon Butler 110 Erin Teich - 98 Brandon Butler + 105 pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> 94 Charlotte Shiqi Zhao - 94 pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> 66 M. Eric Irrgang 53 Chrisy Du 41 Yezhi Jin @@ -47,6 +47,7 @@ 4 Mayank Agrawal 4 William Zygmunt 3 Greg van Anders + 3 Jen Bradley <55467578+janbridley@users.noreply.github.com> 3 Rose Cersonsky 3 Wenbo Shen 2 Emily Siew diff --git a/doc/source/gettingstarted/examples b/doc/source/gettingstarted/examples index 18c84895a..b135ea692 160000 --- a/doc/source/gettingstarted/examples +++ b/doc/source/gettingstarted/examples @@ -1 +1 @@ -Subproject commit 18c84895abf64ed5766957d8aa20322c3f18364b +Subproject commit b135ea69247308bd0a46f6a880f8c1944bf9a5f1 From a8074108d43bc4e7d137cf36b04eebfc5c2612fe Mon Sep 17 00:00:00 2001 From: Tommy Waltmann Date: Thu, 13 Jun 2024 16:44:17 -0400 Subject: [PATCH 2/3] Bump up to version 3.1.0. --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- doc/source/conf.py | 4 ++-- freud/__init__.py | 2 +- setup.cfg | 3 ++- setup.py | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 15d87f5d1..0179499e3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -26,7 +26,7 @@ body: attributes: label: freud Version description: What version of freud are you using? - placeholder: v3.0.0 + placeholder: v3.1.0 validations: required: true - type: input diff --git a/doc/source/conf.py b/doc/source/conf.py index 0d0af77e5..c430582ae 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -77,8 +77,8 @@ # built documents. # # version and release are set the same for this package. -version = "3.0.0" -release = "3.0.0" +version = "3.1.0" +release = "3.1.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/freud/__init__.py b/freud/__init__.py index 011662049..aacc5685a 100644 --- a/freud/__init__.py +++ b/freud/__init__.py @@ -23,7 +23,7 @@ # automatic selection runs, the user cannot change it. set_num_threads(0) -__version__ = "3.0.0" +__version__ = "3.1.0" __all__ = [ "__version__", diff --git a/setup.cfg b/setup.cfg index 21f47b91f..f8f0af974 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.0 +current_version = 3.1.0 commit = True tag = False message = Bump up to version {new_version}. @@ -36,3 +36,4 @@ ignore_errors = True [coverage:html] directory = coverage_html_report + diff --git a/setup.py b/setup.py index 71df90059..1a8af0f0f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from skbuild import setup -version = "3.0.0" +version = "3.1.0" # Read README for PyPI, fallback to short description if it fails. description = "Powerful, efficient trajectory analysis in scientific Python." From 979ff76fa19b40854bd4070b77a5db44476b55c3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 20:46:17 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f8f0af974..a0d9c491e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,4 +36,3 @@ ignore_errors = True [coverage:html] directory = coverage_html_report -