diff --git a/.appveyor.yml b/.appveyor.yml index af7b1bfd2..a4ea37453 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 0.9.5.{build} +version: 0.9.6.{build} os: Windows Server 2012 R2 environment: diff --git a/.authors.yml b/.authors.yml index 4785ad94f..1f8b112c4 100644 --- a/.authors.yml +++ b/.authors.yml @@ -378,7 +378,7 @@ email: lalochcz@gmail.com aliases: - laloch - num_commits: 41 + num_commits: 42 first_commit: 2018-07-26 13:51:50 github: laloch - name: Nico Lehmann @@ -428,7 +428,7 @@ github: funkyfuture - name: Anthony Scopatz email: scopatz@gmail.com - num_commits: 2465 + num_commits: 2472 first_commit: 2015-01-21 17:04:13 github: scopatz - name: anatoly techtonik @@ -959,7 +959,7 @@ github: ntdef - name: virus email: virusbb001a@gmail.com - num_commits: 24 + num_commits: 30 first_commit: 2019-03-06 10:36:26 github: virusbb001 - name: Steven Kryskalla @@ -1002,3 +1002,7 @@ num_commits: 2 first_commit: 2019-05-10 06:18:40 github: eppeters +- name: shadow-light + email: 42055707+shadow-light@users.noreply.github.com + num_commits: 3 + first_commit: 2018-09-16 22:50:24 diff --git a/.mailmap b/.mailmap index 8427cbd34..5194f05f9 100644 --- a/.mailmap +++ b/.mailmap @@ -32,11 +32,11 @@ Rob Brewer Robert W. Brewer Burak Yiğit Kaya Burak Yigit Kaya Sagar Tewari Sagar Tewari Matthias Bussonnier +virus Konstantin Molchanov Konstantin Molchanov Guillaume Leclerc Guillaume Leclerc Gordon Ball Travis Shirk -virus Joel Gerber Bernardas Ališauskas Bernardas Derek Thomas @@ -128,6 +128,7 @@ Danmou Niklas Hambüchen Sébastien Pierre con-f-use +shadow-light <42055707+shadow-light@users.noreply.github.com> Mark Wiebe Nathan Hoad Eric Dill diff --git a/AUTHORS.rst b/AUTHORS.rst index 7b6519daf..641c39252 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -20,11 +20,11 @@ Authors are sorted by number of commits. * Burak Yiğit Kaya * Sagar Tewari * Matthias Bussonnier +* virus * Konstantin Molchanov * Guillaume Leclerc * Gordon Ball * Travis Shirk -* virus * Joel Gerber * Bernardas Ališauskas * Derek Thomas @@ -116,6 +116,7 @@ Authors are sorted by number of commits. * Niklas Hambüchen * Sébastien Pierre * con-f-use +* shadow-light * Mark Wiebe * Nathan Hoad * Eric Dill diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a4a1b4636..83d3a013e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,28 @@ Xonsh Change Log .. current developments +v0.9.6 +==================== + +**Fixed:** + +* Fixed exception in help/version threadable predictor +* Fixed gitstatus prompt so that it also now reports deleted files +* Fixed issue where the prompt-toolkit2 shell could not display and + would end up in an infinite error loop if ``$MULTILINE_PROMPT`` + was a suitably "false" value, such as ``None`` or an empty string. +* Fixed issue where setting ``$XONSH_STDERR_PREFIX`` and ``$XONSH_STDERR_POSTFIX`` + and running a command in the ``xonshrc`` file would throw an error. + +**Authors:** + +* Anthony Scopatz +* David Strobach +* virus +* shadow-light + + + v0.9.5 ==================== diff --git a/news/fix-help-ver-predictor.rst b/news/fix-help-ver-predictor.rst deleted file mode 100644 index 410e76c11..000000000 --- a/news/fix-help-ver-predictor.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Fixed exception in help/version threadable predictor - -**Security:** - -* diff --git a/news/patch-gitstatus-delete.rst b/news/patch-gitstatus-delete.rst deleted file mode 100644 index d4fde5732..000000000 --- a/news/patch-gitstatus-delete.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Fixed gitstatus prompt so that it also now reports deleted files - -**Security:** - -* diff --git a/news/ptk2-mlp0.rst b/news/ptk2-mlp0.rst deleted file mode 100644 index 05e6ceeb9..000000000 --- a/news/ptk2-mlp0.rst +++ /dev/null @@ -1,25 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Fixed issue where the prompt-toolkit2 shell could not display and - would end up in an infinite error loop if ``$MULTILINE_PROMPT`` - was a suitably "false" value, such as ``None`` or an empty string. - -**Security:** - -* diff --git a/news/stderr-pre.rst b/news/stderr-pre.rst deleted file mode 100644 index 9de0c25b2..000000000 --- a/news/stderr-pre.rst +++ /dev/null @@ -1,24 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Fixed issue where setting ``$XONSH_STDERR_PREFIX`` and ``$XONSH_STDERR_POSTFIX`` - and running a command in the ``xonshrc`` file would throw an error. - -**Security:** - -* diff --git a/xonsh/__init__.py b/xonsh/__init__.py index 3ec5a440d..af6471312 100644 --- a/xonsh/__init__.py +++ b/xonsh/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.9.5" +__version__ = "0.9.6" # amalgamate exclude jupyter_kernel parser_table parser_test_table pyghooks