From a7916f1428a1e1ccddc54d5e567018d3e418ea71 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Wed, 21 Jul 2021 11:56:24 -0700
Subject: [PATCH] Bump jax version and CHANGELOG to 0.2.18

---
 CHANGELOG.md   | 35 +++++++++++++++++++----------------
 jax/version.py |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e5ca5383..693f8cc21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,25 @@ Remember to align the itemized text with the first line of an item within a list
 PLEASE REMEMBER TO CHANGE THE '..main' WITH AN ACTUAL TAG in GITHUB LINK.
 -->
 
-## jax 0.2.18 (unreleased)
-* [GitHub commits](https://github.com/google/jax/compare/jax-v0.2.17...main).
+## jax 0.2.19 (unreleased)
+* [GitHub commits](https://github.com/google/jax/compare/jax-v0.2.18...main).
+
+## jaxlib 0.1.70 (unreleased)
+* Breaking changes:
+  * Support for Python 3.6 has been dropped, per the
+    [deprecation policy](https://jax.readthedocs.io/en/latest/deprecation.html).
+    Please upgrade to a supported Python version.
+
+
+* Breaking changes:
+  * The host_callback mechnism now uses one thread per local device for
+    making the calls to the Python callbacks. Previously there was a single
+    thread for all devices. This means that the callbacks may now be called
+    interleaved. The callbacks corresponding to one device will still be
+    called in sequence.
+
+## jax 0.2.18 (July 21 2021)
+* [GitHub commits](https://github.com/google/jax/compare/jax-v0.2.17...jax-v0.2.18).
 
 * Breaking changes:
   * Support for Python 3.6 has been dropped, per the
@@ -28,20 +45,6 @@ PLEASE REMEMBER TO CHANGE THE '..main' WITH AN ACTUAL TAG in GITHUB LINK.
     ({jax-issue}`#7196`)
 
 
-## jaxlib 0.1.70 (unreleased)
-* Breaking changes:
-  * Support for Python 3.6 has been dropped, per the
-    [deprecation policy](https://jax.readthedocs.io/en/latest/deprecation.html).
-    Please upgrade to a supported Python version.
-
-
-* Breaking changes:
-  * The host_callback mechnism now uses one thread per local device for
-    making the calls to the Python callbacks. Previously there was a single
-    thread for all devices. This means that the callbacks may now be called
-    interleaved. The callbacks corresponding to one device will still be
-    called in sequence.
-
 ## jaxlib 0.1.69 (July 9 2021)
 * Fix bugs in TFRT CPU backend that results in incorrect results.
 
diff --git a/jax/version.py b/jax/version.py
index 6ecc80f20..f45a1e56b 100644
--- a/jax/version.py
+++ b/jax/version.py
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.2.17"
+__version__ = "0.2.18"
 _minimum_jaxlib_version = "0.1.69"