diff --git a/CHANGELOG.md b/CHANGELOG.md
index f160bf492d86..75273b3ada27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2018.6.0-beta 11 June 2018)
+## 2018.6.0 (20 June 2018)
 
 ### Thanks
 
@@ -53,17 +53,39 @@ part of!
 
 ### Enhancements
 
-1. Add setting for auto run test discovery on save, `python.unitTest.autoTestDiscoverOnSaveEnabled`.
+1. Add setting to control automatic test discovery on save, `python.unitTest.autoTestDiscoverOnSaveEnabled`.
    (thanks [Lingyu Li](http://github.com/lingyv-li/))
    ([#1037](https://github.com/Microsoft/vscode-python/issues/1037))
 1. Add `gevent` launch configuration option to enable debugging of gevent monkey patched code.
+   (thanks [Bence Nagy](https://github.com/underyx))
    ([#127](https://github.com/Microsoft/vscode-python/issues/127))
+1. Add support for the `"source.organizeImports"` setting for `"editor.codeActionsOnSave"` (thanks [Nathan Gaberel](https://github.com/n6g7)); you can turn this on just for Python using:
+   ```json
+   "[python]": {
+       "editor.codeActionsOnSave": {
+           "source.organizeImports": true
+       }
+   }
+   ```
+   ([#156](https://github.com/Microsoft/vscode-python/issues/156))
 1. Added Spanish translation.
    (thanks [Mario Rubio](https://github.com/mario-mra/))
    ([#1902](https://github.com/Microsoft/vscode-python/issues/1902))
+1. Add a French translation (thanks to [Jérémy](https://github.com/PixiBixi) for
+   the initial patch, and thanks to [Nathan Gaberel](https://github.com/n6g7),
+   [Bruno Alla](https://github.com/browniebroke), and
+   [Tarek Ziade](https://github.com/tarekziade) for reviews).
+   ([#1959](https://github.com/Microsoft/vscode-python/issues/1959))
+1. Add syntax highlighting for [Pipenv](http://pipenv.readthedocs.io/en/latest/)-related
+   files (thanks [Nathan Gaberel](https://github.com/n6g7)).
+   ([#995](https://github.com/Microsoft/vscode-python/issues/995))
 
 ### Fixes
 
+1. Modified to change error message displayed when path to a tool (`linter`, `formatter`, etc) is invalid.
+   ([#1064](https://github.com/Microsoft/vscode-python/issues/1064))
+1. Improvements to the logic used to parse the arguments passed into the test frameworks.
+   ([#1070](https://github.com/Microsoft/vscode-python/issues/1070))
 1. Ensure navigation to definitons follows imports and is transparent to decoration.
    (thanks [Peter Law](https://github.com/PeterJCLaw))
    ([#1638](https://github.com/Microsoft/vscode-python/issues/1638))
@@ -74,10 +96,14 @@ part of!
 1. Fix to display all interpreters in the interpreter list when a workspace contains a `Pipfile`.
    ([#1800](https://github.com/Microsoft/vscode-python/issues/1800))
 1. Use file system API to perform file path comparisons when performing code navigation.
-   (thanks to [bstaint](https://github.com/bstaint) for the initial patch)
+   (thanks to [bstaint](https://github.com/bstaint) for the problem diagnosis)
    ([#1811](https://github.com/Microsoft/vscode-python/issues/1811))
 1. Automatically add path mappings for remote debugging when attaching to the localhost.
    ([#1829](https://github.com/Microsoft/vscode-python/issues/1829))
+1. Change keyboard shortcut for `Run Selection/Line in Python Terminal` to `Shit+Enter`.
+   ([#1875](https://github.com/Microsoft/vscode-python/issues/1875))
+1. Fix unhandled rejected promises in unit tests.
+   ([#1919](https://github.com/Microsoft/vscode-python/issues/1919))
 1. Fix debugger issue that causes the debugger to hang and silently exit stepping over a line of code instantiating an ITK vector object.
    ([#459](https://github.com/Microsoft/vscode-python/issues/459))
 
@@ -85,14 +111,22 @@ part of!
 
 1. Add telemetry to capture type of python interpreter used in workspace.
    ([#1237](https://github.com/Microsoft/vscode-python/issues/1237))
+1. Enabled multi-thrreaded debugger tests for the `experimental` debugger.
+   ([#1250](https://github.com/Microsoft/vscode-python/issues/1250))
+1. Log relevant environment information when the existence of `pipenv` cannot be determined.
+   ([#1338](https://github.com/Microsoft/vscode-python/issues/1338))
 1. Use [dotenv](https://www.npmjs.com/package/dotenv) package to parse [environment variables definition files](https://code.visualstudio.com/docs/python/environments#_environment-variable-definitions-file).
    ([#1376](https://github.com/Microsoft/vscode-python/issues/1376))
 1. Move from yarn to npm.
    ([#1402](https://github.com/Microsoft/vscode-python/issues/1402))
+1. Fix django and flask debugger tests when using the experimental debugger.
+   ([#1407](https://github.com/Microsoft/vscode-python/issues/1407))
 1. Capture telemetry for the usage of the `Create Terminal` command along with other instances when a terminal is created implicitly.
    ([#1542](https://github.com/Microsoft/vscode-python/issues/1542))
 1. Add telemetry to capture availability of Python 3, version of Python used in workspace and the number of workspace folders.
    ([#1545](https://github.com/Microsoft/vscode-python/issues/1545))
+1. Ensure all CI tests (except for debugger) are no longer allowed to fail.
+   ([#1614](https://github.com/Microsoft/vscode-python/issues/1614))
 1. Capture telemetry for the usage of the feature that formats a line as you type (`editor.formatOnType`).
    ([#1766](https://github.com/Microsoft/vscode-python/issues/1766))
 1. Capture telemetry for the new debugger.
@@ -113,7 +147,7 @@ part of!
    ([#1842](https://github.com/Microsoft/vscode-python/issues/1842))
 1. Add better exception handling when parsing responses received from the Jedi language service.
    ([#1867](https://github.com/Microsoft/vscode-python/issues/1867))
-1. Resolve warnings in CI Tests and fix some broken CI Tests.
+1. Resolve warnings in CI Tests and fix some broken CI tests.
    ([#1885](https://github.com/Microsoft/vscode-python/issues/1885))
 1. Reduce sample count used to capture performance metrics in order to reduce time taken to complete the tests.
    ([#1887](https://github.com/Microsoft/vscode-python/issues/1887))
@@ -121,6 +155,16 @@ part of!
    ([#1893](https://github.com/Microsoft/vscode-python/issues/1893))
 1. Add JUnit file output to enable CI integration with VSTS.
    ([#1897](https://github.com/Microsoft/vscode-python/issues/1897))
+1. Log unhandled rejected promises when running unit tests.
+   ([#1918](https://github.com/Microsoft/vscode-python/issues/1918))
+1. Add ability to run tests without having to launch VS Code.
+   ([#1922](https://github.com/Microsoft/vscode-python/issues/1922))
+1. Fix rename refactoring unit tests.
+   ([#1953](https://github.com/Microsoft/vscode-python/issues/1953))
+1. Fix failing test on Mac when validating the path of a python interperter.
+   ([#1957](https://github.com/Microsoft/vscode-python/issues/1957))
+1. Display banner prompting user to complete a survey for the use of the `Experimental Debugger`.
+   ([#1968](https://github.com/Microsoft/vscode-python/issues/1968))
 1. Use a glob pattern to look for `conda` executables.
    ([#256](https://github.com/Microsoft/vscode-python/issues/256))
 1. Create tests to measure activation times for the extension.
@@ -128,6 +172,8 @@ part of!
 
 
 
+
+
 ## 2018.5.0 (05 Jun 2018)
 
 Thanks to the following projects which we fully rely on to provide some of
diff --git a/news/1 Enhancements/1037.md b/news/1 Enhancements/1037.md
deleted file mode 100644
index f096c595b71f..000000000000
--- a/news/1 Enhancements/1037.md	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add setting for auto run test discover on save, `python.unitTest.autoTestDiscoverOnSaveEnabled`.
-(thanks [Lingyu Li](http://github.com/lingyv-li/))
diff --git a/news/1 Enhancements/127.md b/news/1 Enhancements/127.md
deleted file mode 100644
index 1bcda6fbb75d..000000000000
--- a/news/1 Enhancements/127.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add `gevent` launch configuration option to enable debugging of gevent monkey patched code.
diff --git a/news/1 Enhancements/156.md b/news/1 Enhancements/156.md
deleted file mode 100644
index c5c4258764b7..000000000000
--- a/news/1 Enhancements/156.md	
+++ /dev/null
@@ -1,8 +0,0 @@
-Add support for the `"source.organizeImports"` setting for `"editor.codeActionsOnSave"` (thanks [Nathan Gaberel](https://github.com/n6g7)); you can turn this on just for Python using:
-```json
-"[python]": {
-    "editor.codeActionsOnSave": {
-        "source.organizeImports": true
-    }
-}
-```
diff --git a/news/1 Enhancements/1902.md b/news/1 Enhancements/1902.md
deleted file mode 100644
index c9272a9ddebd..000000000000
--- a/news/1 Enhancements/1902.md	
+++ /dev/null
@@ -1,2 +0,0 @@
-Added Spanish translation.
-(thanks [Mario Rubio](https://github.com/mario-mra/))
diff --git a/news/1 Enhancements/1959.md b/news/1 Enhancements/1959.md
deleted file mode 100644
index b24f3458ba05..000000000000
--- a/news/1 Enhancements/1959.md	
+++ /dev/null
@@ -1,4 +0,0 @@
-Add a French translation (thanks to [Jérémy](https://github.com/PixiBixi) for
-the initial patch, and thanks to [Nathan Gaberel](https://github.com/n6g7),
-[Bruno Alla](https://github.com/browniebroke), and
-[Tarek Ziade](https://github.com/tarekziade) for reviews).
diff --git a/news/1 Enhancements/995.md b/news/1 Enhancements/995.md
deleted file mode 100644
index 28e84ce78994..000000000000
--- a/news/1 Enhancements/995.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add syntax highlighting for [Pipenv](http://pipenv.readthedocs.io/en/latest/) files (thanks [Nathan Gaberel](https://github.com/n6g7)).
diff --git a/news/2 Fixes/1064.md b/news/2 Fixes/1064.md
deleted file mode 100644
index 389199f587a6..000000000000
--- a/news/2 Fixes/1064.md	
+++ /dev/null
@@ -1 +0,0 @@
-Modified to change error message displayed when path to a tool (`linter`, `formatter`, etc) is invalid.
diff --git a/news/2 Fixes/1070.md b/news/2 Fixes/1070.md
deleted file mode 100644
index 5f9100ebc192..000000000000
--- a/news/2 Fixes/1070.md	
+++ /dev/null
@@ -1 +0,0 @@
-Improvements to the logic used to parse the arguments passed into the test frameworks.
diff --git a/news/2 Fixes/1638.md b/news/2 Fixes/1638.md
deleted file mode 100644
index 82123fa1102c..000000000000
--- a/news/2 Fixes/1638.md	
+++ /dev/null
@@ -1,2 +0,0 @@
-Ensure navigation to definitons follows imports and is transparent to decoration.
-(thanks [Peter Law](https://github.com/PeterJCLaw))
diff --git a/news/2 Fixes/1721.md b/news/2 Fixes/1721.md
deleted file mode 100644
index 8b733365272c..000000000000
--- a/news/2 Fixes/1721.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix for intellisense failing when using the new `Outline` feature.
diff --git a/news/2 Fixes/1759.md b/news/2 Fixes/1759.md
deleted file mode 100644
index 4938502ae95f..000000000000
--- a/news/2 Fixes/1759.md	
+++ /dev/null
@@ -1 +0,0 @@
-When debugging unit tests, use the `env` file configured in `settings.json` under `python.envFile`.
diff --git a/news/2 Fixes/1800.md b/news/2 Fixes/1800.md
deleted file mode 100644
index a4fb662e2cd3..000000000000
--- a/news/2 Fixes/1800.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix to display all interpreters in the interpreter list when a workspace contains a `Pipfile`.
diff --git a/news/2 Fixes/1811.md b/news/2 Fixes/1811.md
deleted file mode 100644
index c33287129520..000000000000
--- a/news/2 Fixes/1811.md	
+++ /dev/null
@@ -1,2 +0,0 @@
-Use file system API to perform file path comparisons when performing code navigation.
-(thanks to [bstaint](https://github.com/bstaint) for the initial patch)
diff --git a/news/2 Fixes/1829.md b/news/2 Fixes/1829.md
deleted file mode 100644
index de0e75d4e4db..000000000000
--- a/news/2 Fixes/1829.md	
+++ /dev/null
@@ -1 +0,0 @@
-Automatically add path mappings for remote debugging when attaching to the localhost.
diff --git a/news/2 Fixes/1875.md b/news/2 Fixes/1875.md
deleted file mode 100644
index d687dcf63a14..000000000000
--- a/news/2 Fixes/1875.md	
+++ /dev/null
@@ -1 +0,0 @@
-Change keyboard shortcut for `Run Selection/Line in Python Terminal` to `Shit+Enter`.
diff --git a/news/2 Fixes/1919.md b/news/2 Fixes/1919.md
deleted file mode 100644
index bff5edbd4083..000000000000
--- a/news/2 Fixes/1919.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix unhandled rejected promises in unit tests.
diff --git a/news/2 Fixes/459.md b/news/2 Fixes/459.md
deleted file mode 100644
index bba743f3c26f..000000000000
--- a/news/2 Fixes/459.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix debugger issue that causes the debugger to hang and silently exit stepping over a line of code instantiating an ITK vector object.
diff --git a/news/3 Code Health/1237.md b/news/3 Code Health/1237.md
deleted file mode 100644
index 782e955854c6..000000000000
--- a/news/3 Code Health/1237.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add telemetry to capture type of python interpreter used in workspace.
diff --git a/news/3 Code Health/1250.md b/news/3 Code Health/1250.md
deleted file mode 100644
index f4eeb42a9892..000000000000
--- a/news/3 Code Health/1250.md	
+++ /dev/null
@@ -1 +0,0 @@
-Enabled multi-thrreaded debugger tests for the `experimental` debugger.
diff --git a/news/3 Code Health/1338.md b/news/3 Code Health/1338.md
deleted file mode 100644
index 9846aecaa276..000000000000
--- a/news/3 Code Health/1338.md	
+++ /dev/null
@@ -1 +0,0 @@
-Log relevant environment information when the existence of `pipenv` cannot be determined.
diff --git a/news/3 Code Health/1376.md b/news/3 Code Health/1376.md
deleted file mode 100644
index c884f9aa7a5c..000000000000
--- a/news/3 Code Health/1376.md	
+++ /dev/null
@@ -1 +0,0 @@
-Use [dotenv](https://www.npmjs.com/package/dotenv) package to parse [environment variables definition files](https://code.visualstudio.com/docs/python/environments#_environment-variable-definitions-file).
diff --git a/news/3 Code Health/1402.md b/news/3 Code Health/1402.md
deleted file mode 100644
index 6e174acb433d..000000000000
--- a/news/3 Code Health/1402.md	
+++ /dev/null
@@ -1 +0,0 @@
-Move from yarn to npm.
diff --git a/news/3 Code Health/1407.md b/news/3 Code Health/1407.md
deleted file mode 100644
index d61ba644abe2..000000000000
--- a/news/3 Code Health/1407.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix django and flask debugger tests when using the `experimental` debugger.
diff --git a/news/3 Code Health/1542.md b/news/3 Code Health/1542.md
deleted file mode 100644
index 9421570bde59..000000000000
--- a/news/3 Code Health/1542.md	
+++ /dev/null
@@ -1 +0,0 @@
-Capture telemetry for the usage of the `Create Terminal` command along with other instances when a terminal is created implicitly.
diff --git a/news/3 Code Health/1545.md b/news/3 Code Health/1545.md
deleted file mode 100644
index 58ecc563d484..000000000000
--- a/news/3 Code Health/1545.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add telemetry to capture availability of Python 3, version of Python used in workspace and the number of workspace folders.
diff --git a/news/3 Code Health/1614.md b/news/3 Code Health/1614.md
deleted file mode 100644
index 6a5ad111df25..000000000000
--- a/news/3 Code Health/1614.md	
+++ /dev/null
@@ -1 +0,0 @@
-Ensure all CI tests (except for debugger) are no longer allowed to fail.
diff --git a/news/3 Code Health/1766.md b/news/3 Code Health/1766.md
deleted file mode 100644
index 6af23252b987..000000000000
--- a/news/3 Code Health/1766.md	
+++ /dev/null
@@ -1 +0,0 @@
-Capture telemetry for the usage of the feature that formats a line as you type (`editor.formatOnType`).
diff --git a/news/3 Code Health/1767.md b/news/3 Code Health/1767.md
deleted file mode 100644
index b8bfe4bd2839..000000000000
--- a/news/3 Code Health/1767.md	
+++ /dev/null
@@ -1 +0,0 @@
-Capture telemetry for the new debugger.
diff --git a/news/3 Code Health/1770.md b/news/3 Code Health/1770.md
deleted file mode 100644
index 0c7d35e39b22..000000000000
--- a/news/3 Code Health/1770.md	
+++ /dev/null
@@ -1 +0,0 @@
-Capture telemetry for usage of the setting `python.autocomplete.addBrackets`
diff --git a/news/3 Code Health/1803.md b/news/3 Code Health/1803.md
deleted file mode 100644
index 9a272209b91e..000000000000
--- a/news/3 Code Health/1803.md	
+++ /dev/null
@@ -1 +0,0 @@
-Speed up githook by skipping commits not containing any `.ts` files.
diff --git a/news/3 Code Health/1815.md b/news/3 Code Health/1815.md
deleted file mode 100644
index cd0a4f5d40e7..000000000000
--- a/news/3 Code Health/1815.md	
+++ /dev/null
@@ -1 +0,0 @@
-Update typescript package to 2.9.1.
diff --git a/news/3 Code Health/1817.md b/news/3 Code Health/1817.md
deleted file mode 100644
index f50a3adb42e1..000000000000
--- a/news/3 Code Health/1817.md	
+++ /dev/null
@@ -1 +0,0 @@
-Log Conda not existing message as an information instead of an error.
diff --git a/news/3 Code Health/1821.md b/news/3 Code Health/1821.md
deleted file mode 100644
index 2ef4abc844c2..000000000000
--- a/news/3 Code Health/1821.md	
+++ /dev/null
@@ -1 +0,0 @@
-Make use of `ILogger` to log messages instead of using `console.error`.
diff --git a/news/3 Code Health/1833.md b/news/3 Code Health/1833.md
deleted file mode 100644
index e9a49948e14a..000000000000
--- a/news/3 Code Health/1833.md	
+++ /dev/null
@@ -1 +0,0 @@
-Update `parso` package to 0.2.1.
diff --git a/news/3 Code Health/1842.md b/news/3 Code Health/1842.md
deleted file mode 100644
index f0ab0021f46d..000000000000
--- a/news/3 Code Health/1842.md	
+++ /dev/null
@@ -1 +0,0 @@
-Update `isort` package to 4.3.4.
diff --git a/news/3 Code Health/1867.md b/news/3 Code Health/1867.md
deleted file mode 100644
index 57590fb445fb..000000000000
--- a/news/3 Code Health/1867.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add better exception handling when parsing responses received from the Jedi language service.
diff --git a/news/3 Code Health/1885.md b/news/3 Code Health/1885.md
deleted file mode 100644
index ed55aae702af..000000000000
--- a/news/3 Code Health/1885.md	
+++ /dev/null
@@ -1 +0,0 @@
-Resolve warnings in CI Tests and fix some broken CI Tests.
diff --git a/news/3 Code Health/1887.md b/news/3 Code Health/1887.md
deleted file mode 100644
index f9e26d3bd5c4..000000000000
--- a/news/3 Code Health/1887.md	
+++ /dev/null
@@ -1 +0,0 @@
-Reduce sample count used to capture performance metrics in order to reduce time taken to complete the tests.
diff --git a/news/3 Code Health/1893.md b/news/3 Code Health/1893.md
deleted file mode 100644
index 88cf91a7e1b0..000000000000
--- a/news/3 Code Health/1893.md	
+++ /dev/null
@@ -1 +0,0 @@
-Ensure workspace information is passed into installer when determining whether a product/tool is installed.
diff --git a/news/3 Code Health/1897.md b/news/3 Code Health/1897.md
deleted file mode 100644
index 57d93b45447a..000000000000
--- a/news/3 Code Health/1897.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add JUnit file output to enable CI integration with VSTS.
\ No newline at end of file
diff --git a/news/3 Code Health/1918.md b/news/3 Code Health/1918.md
deleted file mode 100644
index e49860ba62f6..000000000000
--- a/news/3 Code Health/1918.md	
+++ /dev/null
@@ -1 +0,0 @@
-Log unhandled rejected promises when running unit tests.
diff --git a/news/3 Code Health/1922.md b/news/3 Code Health/1922.md
deleted file mode 100644
index ce836f31d3b9..000000000000
--- a/news/3 Code Health/1922.md	
+++ /dev/null
@@ -1 +0,0 @@
-Add ability to run tests without having to launch VS Code.
diff --git a/news/3 Code Health/1953.md b/news/3 Code Health/1953.md
deleted file mode 100644
index 4749e1048d14..000000000000
--- a/news/3 Code Health/1953.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix rename refactoring unit tests.
diff --git a/news/3 Code Health/1957.md b/news/3 Code Health/1957.md
deleted file mode 100644
index 9c638c49be95..000000000000
--- a/news/3 Code Health/1957.md	
+++ /dev/null
@@ -1 +0,0 @@
-Fix failing test on Mac when validating the path of a python interperter.
diff --git a/news/3 Code Health/1968.md b/news/3 Code Health/1968.md
deleted file mode 100644
index b4a14a27dde1..000000000000
--- a/news/3 Code Health/1968.md	
+++ /dev/null
@@ -1 +0,0 @@
-Display banner prompting user to complete a survey for the use of the `Experimental Debugger`.
diff --git a/news/3 Code Health/256.md b/news/3 Code Health/256.md
deleted file mode 100644
index 60e5ca2d1222..000000000000
--- a/news/3 Code Health/256.md	
+++ /dev/null
@@ -1 +0,0 @@
-Use a glob pattern to look for `conda` executables.
diff --git a/news/3 Code Health/932.md b/news/3 Code Health/932.md
deleted file mode 100644
index 6e2f9c6ace41..000000000000
--- a/news/3 Code Health/932.md	
+++ /dev/null
@@ -1 +0,0 @@
-Create tests to measure activation times for the extension.
diff --git a/news/announce.py b/news/announce.py
index f924f4189368..053b7071e13d 100644
--- a/news/announce.py
+++ b/news/announce.py
@@ -21,19 +21,20 @@
 def NewsEntry(issue_number, description, path):
     """Construct a data object for a news entry."""
     # TODO: replace with a dataclass in Python 3.7.
-    return types.SimpleNamespace(issue_number=issue_number,
-                                 description=description, path=path)
+    return types.SimpleNamespace(
+        issue_number=issue_number, description=description, path=path
+    )
 
 
 def news_entries(directory):
     """Yield news entries in the directory."""
     for path in directory.iterdir():
-        if path.name == 'README.md':
+        if path.name == "README.md":
             continue
         match = FILENAME_RE.match(path.name)
         if match is None:
-            raise ValueError(f'{path} has a bad file name')
-        issue = int(match.group('issue'))
+            raise ValueError(f"{path} has a bad file name")
+        issue = int(match.group("issue"))
         entry = path.read_text("utf-8")
         yield NewsEntry(issue, entry, path)
 
@@ -48,15 +49,17 @@ def sections(directory):
     """Yield the sections in their appropriate order."""
     found = []
     for path in directory.iterdir():
-        if not path.is_dir() or path.name.startswith('.'):
+        if not path.is_dir() or path.name.startswith("."):
             continue
-        position, sep, title = path.name.partition(' ')
+        position, sep, title = path.name.partition(" ")
         if not sep:
-            print(f'directory name {path.name!r} is missing ranking; skipping',
-                  file=sys.stderr)
+            print(
+                f"directory {path.name!r} is missing a ranking; skipping",
+                file=sys.stderr,
+            )
             continue
         found.append(SectionTitle(int(position), title, path))
-    return sorted(found, key=operator.attrgetter('index'))
+    return sorted(found, key=operator.attrgetter("index"))
 
 
 def gather(directory):
@@ -70,17 +73,19 @@ def gather(directory):
 def entry_markdown(entry):
     """Generate the Markdown for the specified entry."""
     enumerated_item = "1. "
-    indent = ' ' * len(enumerated_item)
-    issue_url = f'https://github.com/Microsoft/vscode-python/issues/{entry.issue_number}'
-    issue_md = f'([#{entry.issue_number}]({issue_url}))'
+    indent = " " * len(enumerated_item)
+    issue_url = (
+        f"https://github.com/Microsoft/vscode-python/issues/{entry.issue_number}"
+    )
+    issue_md = f"([#{entry.issue_number}]({issue_url}))"
     entry_lines = entry.description.strip().splitlines()
-    formatted_lines = [f'{enumerated_item}{entry_lines[0]}']
-    formatted_lines.extend(f'{indent}{line}' for line in entry_lines[1:])
-    formatted_lines.append(f'{indent}{issue_md}')
-    return '\n'.join(formatted_lines)
-    return ENTRY_TEMPLATE.format(entry=entry.description.strip(),
-                                 issue=entry.issue_number,
-                                 issue_url=issue_url)
+    formatted_lines = [f"{enumerated_item}{entry_lines[0]}"]
+    formatted_lines.extend(f"{indent}{line}" for line in entry_lines[1:])
+    formatted_lines.append(f"{indent}{issue_md}")
+    return "\n".join(formatted_lines)
+    return ENTRY_TEMPLATE.format(
+        entry=entry.description.strip(), issue=entry.issue_number, issue_url=issue_url
+    )
 
 
 def changelog_markdown(data):
@@ -96,9 +101,12 @@ def changelog_markdown(data):
 
 def git_rm(path):
     """Run git-rm on the path."""
-    status = subprocess.run(['git', 'rm', os.fspath(path.resolve())],
-                            shell=True, stdout=subprocess.PIPE,
-                            stderr=subprocess.STDOUT)
+    status = subprocess.run(
+        ["git", "rm", os.fspath(path.resolve())],
+        shell=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+    )
     try:
         status.check_returncode()
     except Exception:
@@ -126,12 +134,13 @@ def main(run_type, directory):
     data = gather(directory)
     markdown = changelog_markdown(data)
     if run_type != RunType.dry_run:
+        # XXX This can lead to mojibake; hopefully Python 3.7 will resolve this.
         print(markdown)
     if run_type == RunType.final:
         cleanup(data)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     arguments = docopt.docopt(__doc__)
     for possible_run_type in RunType:
         if arguments[f"--{possible_run_type.name}"]:
diff --git a/package.json b/package.json
index 4f6382ef049d..262d0b4149d7 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded, remote), Intellisense, code formatting, refactoring, unit tests, snippets, and more.",
-    "version": "2018.6.0-beta",
+    "version": "2018.6.0",
     "publisher": "ms-python",
     "author": {
         "name": "Microsoft Corporation"