diff --git a/.mailmap b/.mailmap index 0138d56b2..4245c8103 100644 --- a/.mailmap +++ b/.mailmap @@ -51,3 +51,4 @@ Maya Martirossyan mmartirossyan James Proctor James Proctor <47364977+j-proc@users.noreply.github.com> Andrew Kerr Andrew Kerr <79798289+AKerr9509@users.noreply.github.com> Charlotte Shiqi Zhao Charlottez112 <56694726+Charlottez112@users.noreply.github.com> +Emily Siew esiew diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d237577fc..628959e06 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,17 +30,17 @@ repos: - id: debug-statements - id: requirements-txt-fixer - repo: https://github.com/asottile/pyupgrade - rev: 'v2.19.0' + rev: 'v2.19.4' hooks: - id: pyupgrade args: - --py36-plus - repo: https://github.com/PyCQA/isort - rev: '5.8.0' + rev: '5.9.1' hooks: - id: isort - repo: https://github.com/psf/black - rev: '21.5b2' + rev: '21.6b0' hooks: - id: black - repo: https://github.com/PyCQA/flake8 diff --git a/ChangeLog.md b/ChangeLog.md index 8366a7f6f..c81b0da5e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,8 +1,13 @@ # Change Log The format is based on -[Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to -[Semantic Versioning](http://semver.org/spec/v2.0.0.html). +[Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## v2.6.1 -- 2021-06-23 + +### Fixed +* Added missing git submodules to source distribution. ## v2.6.0 - 2021-06-22 diff --git a/contributors.txt b/contributors.txt index 38efd755a..ed245e50e 100644 --- a/contributors.txt +++ b/contributors.txt @@ -1,12 +1,12 @@ 2122 Vyas Ramasubramani - 2042 Bradley Dice + 2047 Bradley Dice 1030 Eric Harper 456 Jin Soo Ihm 294 Joshua A. Anderson 240 Matthew Spellings 166 Kelly Wang 110 Erin Teich - 83 Brandon Butler + 86 Brandon Butler 66 M. Eric Irrgang 61 Charlotte Shiqi Zhao 53 Chrisy Du @@ -44,7 +44,7 @@ 3 Rose Cersonsky 3 Wenbo Shen 2 Maya Martirossyan + 1 Emily Siew 1 Jiwoong Yu 1 Patrick Lawton 1 Paul Dodd - 1 Emily Siew diff --git a/doc/source/conf.py b/doc/source/conf.py index ed5bf7579..1449539c2 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -70,8 +70,8 @@ # built documents. # # version and release are set the same for this package. -version = "2.6.0" -release = "2.6.0" +version = "2.6.1" +release = "2.6.1" # 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 8fa67f609..885d1b06b 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__ = "2.6.0" +__version__ = "2.6.1" __all__ = [ "__version__", diff --git a/setup.cfg b/setup.cfg index b6b81f905..6856005e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.6.0 +current_version = 2.6.1 commit = True tag = False message = Bump up to version {new_version}. diff --git a/setup.py b/setup.py index 555e710b0..38d1c1259 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from skbuild import setup as skbuild_setup -version = "2.6.0" +version = "2.6.1" # Read README for PyPI, fallback to short description if it fails. description = "Powerful, efficient trajectory analysis in scientific Python."