mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 00:14:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into coral

Browse source
This commit is contained in:
Anthony Scopatz 2019-06-10 14:24:21 -04:00
commit 986d10f70a
10 changed files with 35 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor.yml
View file

@ -1,4 +1,4 @@
version: 0.9.5.{build}
version: 0.9.6.{build}
os: Windows Server 2012 R2
environment:

10
.authors.yml
View file

@ -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

3
.mailmap
View file

@ -32,11 +32,11 @@ Rob Brewer <rwb123@gmail.com> Robert W. Brewer <rwb123@gmail.com>
Burak Yiğit Kaya <ben@byk.im> Burak Yigit Kaya <ben@byk.im>
Sagar Tewari <sagartewari01@gmail.com> Sagar Tewari <sagartewariym@yahoo.com>
Matthias Bussonnier <bussonniermatthias@gmail.com>
virus <virusbb001a@gmail.com>
Konstantin Molchanov <kmolchanov@machinezone.com> Konstantin Molchanov <moigagoo@live.com>
Guillaume Leclerc <guillaume.leclerc@epfl.ch> Guillaume Leclerc <guillaume.leclerc.work@gmail.com>
Gordon Ball <gordon@chronitis.net>
Travis Shirk <travis@pobox.com>
virus <virusbb001a@gmail.com>
Joel Gerber <joel@grrbrr.ca>
Bernardas Ališauskas <bernardas.alisauskas@gmail.com> Bernardas <bernardas.alisauskas@gmail.com>
Derek Thomas <derekathomas@gmail.com>
@ -128,6 +128,7 @@ Danmou <dmrtzn@gmail.com>
Niklas Hambüchen <mail@nh2.me>
Sébastien Pierre <sebastien.pierre@gmail.com>
con-f-use <con-f-use@users.noreply.github.com>
shadow-light <42055707+shadow-light@users.noreply.github.com>
Mark Wiebe <mwwiebe@gmail.com>
Nathan Hoad <nathan@getoffmalawn.com>
Eric Dill <edill@bnl.gov>

3
AUTHORS.rst
View file

@ -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

22
CHANGELOG.rst
View file

@ -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
====================

23
news/fix-help-ver-predictor.rst
View file

@ -1,23 +0,0 @@
**Added:**
* <news item>
**Changed:**
* <news item>
**Deprecated:**
* <news item>
**Removed:**
* <news item>
**Fixed:**
* Fixed exception in help/version threadable predictor
**Security:**
* <news item>

23
news/patch-gitstatus-delete.rst
View file

@ -1,23 +0,0 @@
**Added:**
* <news item>
**Changed:**
* <news item>
**Deprecated:**
* <news item>
**Removed:**
* <news item>
**Fixed:**
* Fixed gitstatus prompt so that it also now reports deleted files
**Security:**
* <news item>

25
news/ptk2-mlp0.rst
View file

@ -1,25 +0,0 @@
**Added:**
* <news item>
**Changed:**
* <news item>
**Deprecated:**
* <news item>
**Removed:**
* <news item>
**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:**
* <news item>

24
news/stderr-pre.rst
View file

@ -1,24 +0,0 @@
**Added:**
* <news item>
**Changed:**
* <news item>
**Deprecated:**
* <news item>
**Removed:**
* <news item>
**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:**
* <news item>

2
xonsh/__init__.py
View file

@ -1,4 +1,4 @@
__version__ = "0.9.5"
__version__ = "0.9.6"
# amalgamate exclude jupyter_kernel parser_table parser_test_table pyghooks