From 2b8d6003be7a34eb0f58f9677fe1b704346d8637 Mon Sep 17 00:00:00 2001
From: Sean Law <seanmylaw@gmail.com>
Date: Mon, 15 Jun 2020 11:14:30 -0400
Subject: [PATCH] v1.4.0

---
 CHANGELOG.md     | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py         |  2 +-
 stumpy/scrump.py |  2 +-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8eafb9801..2de099fa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,54 @@
+# 2020-06-15    [ 1.4.0 ]:
+--------------------------
+* bugfixes
+  - Fixed bad chunking in `compute_mean_std`
+* features
+  - Added parallelized `scrump`
+  - Added NaN/inf support to `scrump`
+  - Added `prescrump` (and, consequently, scrump++)
+  - Added AB-join to `scrump`
+  - Added unit test for `scrump`
+  - Added constrained inclusion motif search for `mstump`/`mstumped`
+  - Added discord support for `mstump`/`mstumped`
+  - Changed sorting to pure numpy in `mstump`/`mstumped` for better performance
+  - Added NaN/inf support to `gpu_stump`
+  - Added new `core.preprocess` function
+  - Added NaN/inf support to `core.mass`
+  - Added `core.apply_exclusion_zone` for consistent exclusion zone across functions
+  - Added `stumpi` for incrementally updating matrix profiles with streaming data
+  - Added `stumpi` unit tests
+  - Added NaN/inf support for `stumpi`
+  - Converted `floss.floss` generator to `class`
+* tasks
+  - Added Python 3.8 to Azure Pipelines for unit testing
+  - Moved `stomp` to `_stomp` to prevent public usage
+  - Fixed numerous typos
+  - Added several `np.asarray` calls to input arrays
+  - Split some unit tests out into separate files
+  - Updated distributed teststo use context manager
+  - Refactored `_calculate_squared_distance`
+  - Added `core.py` to JIT-compiled unit test section
+  - Remove mypy config file
+  - Corrected cuda.jit signature for `gpu_stump`
+  - Shortened time series length for faster GPU tests
+  - Removed link to discourse from documentation
+  - Added global variables for controlling chunking in `compute_mean_std`
+  - Replaced name of `naive_mass` with `naive_stamp`
+  - Removed redundant "caption" in RTD ToC
+  - Renamed `stamp.mass` to private `stamp._mass_PI`
+  - Added flake8-docstrings checking
+  - Renamed `utils.py` to `naive.py` and updated corresponding function calls
+  - Added `stumpi` and `scrump` to STUMPY API (RTD) 
+* documentation
+  - Initialized shapelet discovery tutorial (WIP)
+  - Updated `check_window_size` docstring
+  - Added `gpu_stump` to tutorial
+  - Added `scrump` tutorial for Fast Approximate Matrix Profiles
+  - Updated string formatting to conform to flake8
+  - Added `stumpi` tutorial
+  - Improved `mstump` tutorial (WIP)
+  - Added additional references to original matrix profile papers
+
 # 2020-03-27    [ 1.3.1 ]:
 --------------------------
 * bugfixes
diff --git a/setup.py b/setup.py
index ee0091220..3b4ec1665 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ def readme():
 
 configuration = {
     "name": "stumpy",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "python_requires=": ">=3.6",
     "author": "Sean M. Law",
     "author_email": "seanmylaw@gmail.com",
diff --git a/stumpy/scrump.py b/stumpy/scrump.py
index 2dcde2471..7fd711247 100644
--- a/stumpy/scrump.py
+++ b/stumpy/scrump.py
@@ -749,7 +749,7 @@ def __init__(
     def update(self):
         """
         Update the matrix profile and the matrix profile indices by computing
-        additional new distances (limited by `percentage`) that make up the full 
+        additional new distances (limited by `percentage`) that make up the full
         distance matrix.
         """
         if self._chunk <= self._n_chunks: