Skip to content

Commit

Permalink
Merge pull request #848 from glotzerlab/release/2.7.0
Browse files Browse the repository at this point in the history
Release/2.7.0
  • Loading branch information
tommy-waltmann authored Oct 1, 2021
2 parents 887a879 + d066a24 commit b7f4e6c
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 26 deletions.
4 changes: 4 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Vyas Ramasubramani <[email protected]> Vyas <[email protected]>
Vyas Ramasubramani <[email protected]> Vyas Ramasubramani <[email protected]>
Vyas Ramasubramani <[email protected]> vyasr <[email protected]>
Vyas Ramasubramani <[email protected]> vyasr <[email protected]>
Vyas Ramasubramani <[email protected]> Vyas Ramasubramani <[email protected]>
Richmond Newman <[email protected]> Richmond <[email protected]>
Richmond Newman <[email protected]> newmanrs <[email protected]>
Richmond Newman <[email protected]> Richmond Newman <[email protected]>
Expand Down Expand Up @@ -50,5 +51,8 @@ Pavel Buslaev <[email protected]> pbuslaev <[email protected]>
Maya Martirossyan <[email protected]> mmartirossyan <[email protected]>
James Proctor <[email protected]> James Proctor <[email protected]>
Andrew Kerr <[email protected]> Andrew Kerr <[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]>
DomFijan <[email protected]> domagoj <[email protected]>
DomFijan <[email protected]> Domagoj Fijan <[email protected]>
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ repos:
- id: debug-statements
- id: requirements-txt-fixer
- repo: https://github.com/asottile/pyupgrade
rev: 'v2.20.0'
rev: 'v2.29.0'
hooks:
- id: pyupgrade
args:
- --py36-plus
- repo: https://github.com/PyCQA/isort
rev: '5.9.1'
rev: '5.9.3'
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: '21.6b0'
rev: '21.9b0'
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The format is based on
and this project adheres to
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## next
## v2.7.0 -- 2021-10-01

### Added
* `freud.diffraction.StaticStructureFactorDebye` class (unstable) can be used to compute the static structure factor S(k) using the Debye formula.
Expand Down
33 changes: 17 additions & 16 deletions contributors.txt
Original file line number Diff line number Diff line change
@@ -1,50 +1,51 @@
2122 Vyas Ramasubramani <[email protected]>
2054 Bradley Dice <[email protected]>
2156 Bradley Dice <[email protected]>
2134 Vyas Ramasubramani <[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]>
167 Kelly Wang <[email protected]>
110 Erin Teich <[email protected]>
86 Brandon Butler <[email protected]>
70 dependabot <dependabot[bot]@users.noreply.github.com>
66 M. Eric Irrgang <[email protected]>
61 Charlotte Shiqi Zhao <[email protected]>
53 Chrisy Du <[email protected]>
51 dependabot <dependabot[bot]@users.noreply.github.com>
42 Tommy Waltmann <[email protected]>
41 Yezhi Jin <[email protected]>
40 Antonio Osorio <[email protected]>
39 DomFijan <[email protected]>
35 Michael Stryk <[email protected]>
34 Tommy Waltmann <[email protected]>
31 Richmond Newman <[email protected]>
25 Carl Simon Adorf <[email protected]>
22 Jens Glaser <[email protected]>
19 Andrew Kerr <[email protected]>
22 Andrew Kerr <[email protected]>
19 Tim Moore <[email protected]>
15 pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
18 pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
13 Pavel Buslaev <[email protected]>
10 Benjamin Schultz <[email protected]>
10 Bryan VanSaders <[email protected]>
10 Matt Palathingal <[email protected]>
9 Andrew Karas <[email protected]>
9 Mike Henry <[email protected]>
9 Andrew Karas <[email protected]>
8 Fengyi Gao <[email protected]>
8 Ryan Marson <[email protected]>
6 Allen LaCour <[email protected]>
6 James Proctor <[email protected]>
6 Pengji Zhou <[email protected]>
6 James Proctor <[email protected]>
6 Tom Grubb <[email protected]>
6 Yina Geng <[email protected]>
5 Alex Dutton <alxdttn@umich.edu>
6 Allen LaCour <alacour@umich.edu>
5 Carolyn Phillips <[email protected]>
5 Alex Dutton <[email protected]>
4 Ben Swerdlow <[email protected]>
4 James Antonaglia <[email protected]>
4 Mayank Agrawal <[email protected]>
4 William Zygmunt <[email protected]>
3 Greg van Anders <grva@umich.edu>
4 Mayank Agrawal <amayank@umich.edu>
3 Rose Cersonsky <[email protected]>
3 Greg van Anders <[email protected]>
3 Wenbo Shen <[email protected]>
2 Emily Siew <[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 Patrick Lawton <[email protected]>
1 Jiwoong Yu <[email protected]>
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
# built documents.
#
# version and release are set the same for this package.
version = "2.6.2"
release = "2.6.2"
version = "2.7.0"
release = "2.7.0"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/gettingstarted/examples
2 changes: 1 addition & 1 deletion freud/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# automatic selection runs, the user cannot change it.
set_num_threads(0)

__version__ = "2.6.2"
__version__ = "2.7.0"

__all__ = [
"__version__",
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.6.2
current_version = 2.7.0
commit = True
tag = False
message = Bump up to version {new_version}.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from skbuild import setup as skbuild_setup

version = "2.6.2"
version = "2.7.0"

# Read README for PyPI, fallback to short description if it fails.
description = "Powerful, efficient trajectory analysis in scientific Python."
Expand Down

0 comments on commit b7f4e6c

Please sign in to comment.