Merge pull request #801 from glotzerlab/release/2.6.1

Release/2.6.1
glotzerlab · Jun 23, 2021 · 103573c · 103573c
2 parents e07ba32 + ffb88fa
commit 103573c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/.mailmap b/.mailmap
@@ -51,3 +51,4 @@ Maya Martirossyan <[email protected]> mmartirossyan <[email protected]>
 James Proctor <[email protected]> James Proctor <[email protected]>
 Andrew Kerr <[email protected]> Andrew Kerr <[email protected]>
 Charlotte Shiqi Zhao <[email protected]> Charlottez112 <[email protected]>
+Emily Siew <[email protected]> esiew <[email protected]>
diff --git 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
@@ -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
@@ -1,12 +1,12 @@
   2122	Vyas Ramasubramani <[email protected]>
-  2042	Bradley Dice <[email protected]>
+  2047	Bradley Dice <[email protected]>
   1030	Eric Harper <[email protected]>
    456	Jin Soo Ihm <[email protected]>
    294	Joshua A. Anderson <[email protected]>
    240	Matthew Spellings <[email protected]>
    166	Kelly Wang <[email protected]>
    110	Erin Teich <[email protected]>
-    83	Brandon Butler <[email protected]>
+    86	Brandon Butler <[email protected]>
     66	M. Eric Irrgang <[email protected]>
     61	Charlotte Shiqi Zhao <[email protected]>
     53	Chrisy Du <[email protected]>
@@ -44,7 +44,7 @@
      3	Rose Cersonsky <[email protected]>
      3	Wenbo Shen <[email protected]>
      2	Maya Martirossyan <[email protected]>
+     1	Emily Siew <[email protected]>
      1	Jiwoong Yu <[email protected]>
      1	Patrick Lawton <[email protected]>
      1	Paul Dodd <[email protected]>
-     1	Emily Siew <[email protected]>
diff --git 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
@@ -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
@@ -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
@@ -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."