Merge pull request #1507 from xonsh/fix_ply_version

fix reported PLY version in bundled PLY
This commit is contained in:
Anthony Scopatz 2016-07-28 12:14:55 -07:00 committed by GitHub
commit 4f472fc035
3 changed files with 19 additions and 1 deletions

14
news/ply.rst Normal file
View file

@ -0,0 +1,14 @@
**Added:** None
**Changed:** None
**Deprecated:** None
**Removed:** None
**Fixed:**
* Version number reported by bundled PLY
* ``xonfig`` no longer breaks if PLY is externally installed and version 3.8
**Security:** None

View file

@ -1,5 +1,5 @@
# PLY package
# Author: David Beazley (dave@dabeaz.com)
__version__ = '3.7'
__version__ = '3.8'
__all__ = ['lex','yacc']

View file

@ -337,6 +337,10 @@ def _xonfig_format_json(data):
def _info(ns):
env = builtins.__xonsh_env__
try:
ply.__version__ = ply.__version__
except AttributeError:
ply.__version__ = '3.8'
data = [
('xonsh', XONSH_VERSION),
('Git SHA', githash()),