From 2a9bb815ffee3e9576c9e431921f733860d7cf14 Mon Sep 17 00:00:00 2001
From: Dan Ryan <dan@danryan.co>
Date: Mon, 18 Jun 2018 20:14:32 -0400
Subject: [PATCH] Updated changelog

Signed-off-by: Dan Ryan <dan@danryan.co>
---
 CHANGELOG.rst    | 8 ++++++--
 tasks/release.py | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3bfe4e0d48..5ad4fcd892 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,5 @@
-2018.05.18 (2018-06-17)
-=======================
+2018.6.0.dev0 (2018-06-18)
+==========================
 
 
 Features & Improvements
@@ -78,6 +78,10 @@ Bug Fixes
   
 - VCS dependencies are now manually obtained only if they do not match the requested ref.  `#2304 <https://github.com/pypa/pipenv/issues/2304>`_
   
+- Added error handling functionality to properly cope with single-digit ``Requires-Python`` metatdata with no specifiers.  `#2377 <https://github.com/pypa/pipenv/issues/2377>`_
+  
+- ``pipenv update`` will now always run the resolver and lock before ensuring your dependencies are in sync with your lockfile.  `#2379 <https://github.com/pypa/pipenv/issues/2379>`_
+  
 
 Vendored Libraries
 ------------------
diff --git a/tasks/release.py b/tasks/release.py
index 78d0ace629..260e46acbf 100644
--- a/tasks/release.py
+++ b/tasks/release.py
@@ -53,10 +53,14 @@ def upload_dists(ctx):
 
 
 @invoke.task
-def generate_changelog(ctx, commit=False):
+def generate_changelog(ctx, commit=False, draft=False):
     log('Generating changelog...')
-    ctx.run('towncrier')
+    if draft:
+        commit = False
+        log('Writing draft to file...')
+        ctx.run('towncrier --draft > CHANGELOG.rst')
     if commit:
+        ctx.run('towncrier')
         log('Committing...')
         ctx.run('git add .')
         ctx.run('git commit -m "Update changelog."')