Merge pull request #700 from glotzerlab/release/2.4.1

Release/2.4.1

.circleci/config.yml

@@ -84,8 +84,7 @@ references:
 
   windows_env: &windows_env
     PYTHON: "python"
-    TBB_INCLUDE: "C:\\tools\\miniconda3\\Library\\include"
-    TBB_LINK: "C:\\tools\\miniconda3\\Library\\lib"
+    TBBROOT: "C:\\tools\\miniconda3\\Library"
 
   build_windows: &build_windows
     run:

CMake/FindTBB.cmake

@@ -1,5 +1,5 @@
-find_path(TBB_INCLUDE_DIR tbb/tbb.h HINTS $ENV{TBB_ROOT}/include
-                                          $ENV{TBB_INCLUDE})
+find_path(TBB_INCLUDE_DIR tbb/tbb.h HINTS $ENV{TBBROOT}/include
+                                          $ENV{TBB_INCLUDE_DIR})
 
 # Check OS-specific env variables for libraries.
 if(DEFINED ENV{LD_LIBRARY_PATH})
@@ -12,8 +12,8 @@ else()
   set(LD_LIBRARY_DIR_LIST "")
 endif()
 
-find_library(TBB_LIBRARY tbb HINTS ${TBB_INCLUDE_DIR}/../lib
-                                   ${LD_LIBRARY_DIR_LIST} $ENV{TBB_LINK})
+find_library(TBB_LIBRARY tbb HINTS $ENV{TBBROOT}/lib ${LD_LIBRARY_DIR_LIST}
+                                   ${TBB_INCLUDE_DIR}/../lib)
 
 if(TBB_INCLUDE_DIR AND EXISTS "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h")
   file(STRINGS "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h" TBB_H

ChangeLog.md

@@ -4,7 +4,7 @@ The format is based on
 and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## v2.x.x - 20xx-xx-xx
+## v2.4.1 - 2020-11-16
 
 ### Fixed
 * Python 3.8 builds with Windows MSVC were broken due to an unrecognized CMake compiler option.

contributors.txt

@@ -1,10 +1,10 @@
-  2060	Vyas Ramasubramani <vramasub@umich.edu>
-  1729	Bradley Dice <bdice@bradleydice.com>
+  2066	Vyas Ramasubramani <vramasub@umich.edu>
+  1773	Bradley Dice <bdice@bradleydice.com>
   1030	Eric Harper <harperic@umich.edu>
    456	Jin Soo Ihm <jinihm@umich.edu>
    278	Joshua A. Anderson <joaander@umich.edu>
    240	Matthew Spellings <mspells@umich.edu>
-   155	Kelly Wang <kelwang@umich.edu>
+   159	Kelly Wang <kelwang@umich.edu>
    110	Erin Teich <erteich@umich.edu>
     66	M. Eric Irrgang <eirrgang@umich.edu>
     53	Chrisy Du <xiyudu@umich.edu>

doc/source/conf.py

@@ -68,8 +68,8 @@
 # built documents.
 #
 # version and release are set the same for this package.
-version = '2.4.0'
-release = '2.4.0'
+version = '2.4.1'
+release = '2.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/gettingstarted/installation.rst

@@ -79,8 +79,6 @@ You can also build **freud** in place so that you can run from within the folder
     python setup.py build_ext --inplace
 
 Building **freud** in place has certain advantages, since it does not affect your Python behavior except within the **freud** directory itself (where **freud** can be imported after building).
-Additionally, due to limitations inherent to the distutils/setuptools infrastructure, building extension modules can only be parallelized using the build_ext subcommand of setup.py, not with install.
-As a result, it will be faster to manually run build_ext and then install (which normally calls build_ext under the hood anyway) the built packages.
 
 CMake Options
 +++++++++++++
@@ -107,17 +105,14 @@ The **freud** CMake configuration also respects the following environment variab
 
 .. glossary::
 
-    TBB_ROOT
+    TBBROOT
       The root directory where TBB is installed.
-      Useful if TBB is installed in a non-standard location or cannot be located by Python for some other reason.
+      Useful if TBB is installed in a non-standard location or cannot be located for some other reason.
+      This variable is set by the ``tbbvars.sh`` script included with TBB when building from source.
 
-    TBB_INCLUDE
+    TBB_INCLUDE_DIR
       The directory where the TBB headers (e.g. ``tbb.h``) are located.
-      Useful if TBB is installed in a non-standard location or cannot be located by Python for some other reason.
-
-    TBB_LINK
-      The directory where the TBB shared library (e.g. ``libtbb.so`` or ``libtbb.dylib``) is located.
-      Useful if TBB is installed in a non-standard location or cannot be located by Python for some other reason.
+      Useful if TBB is installed in a non-standard location or cannot be located for some other reason.
 
 .. note::
 

freud/__init__.py

@@ -22,7 +22,7 @@
 # automatic selection runs, the user cannot change it.
 set_num_threads(0)
 
-__version__ = '2.4.0'
+__version__ = '2.4.1'
 
 __all__ = [
     '__version__',

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.0
+current_version = 2.4.1
 commit = True
 tag = True
 message = Bump up to version {new_version}.

setup.py

@@ -2,7 +2,7 @@
 import os
 from skbuild import setup as skbuild_setup
 
-version = '2.4.0'
+version = '2.4.1'
 
 # Read README for PyPI, fallback to short description if it fails.
 desc = 'Powerful, efficient trajectory analysis in scientific Python.'