Amalgamated release (#4355)

* pip: Ensure the release version of xonsh is amalgamated

It will be amalgamated regardless of whether amalgamate.py is installed

* manifest: Remove non-existent PLY files

* pip: Add completion parser table

* amalgam: Update init files
This commit is contained in:
Daniel Shimon 2021-07-05 20:59:44 +03:00 committed by GitHub
parent c578c37f83
commit daa27337dd
Failed to generate hash of commit
4 changed files with 27 additions and 24 deletions

View file

@ -6,10 +6,5 @@ include README.rst
include run-tests.xsh
recursive-include tests *
exclude tests/test_news.py
recursive-include xonsh/ply/example *
recursive-include xonsh/ply/doc *
recursive-include xonsh/ply/test *
include xonsh/ply/CONTRIBUTING.md
include xonsh/ply/README.md
include xonsh/ply/CHANGES
global-exclude *.pyc
include amalgamate.py

View file

@ -66,12 +66,18 @@ def build_tables():
root_dir = os.path.abspath(os.path.dirname(__file__))
sys.path.insert(0, root_dir)
from xonsh.parser import Parser
from xonsh.parsers.completion_context import CompletionContextParser
Parser(
yacc_table="parser_table",
outputdir=os.path.join(root_dir, "xonsh"),
yacc_debug=True,
)
CompletionContextParser(
yacc_table="completion_parser_table",
outputdir=os.path.join(root_dir, "xonsh"),
debug=True,
)
sys.path.pop(0)

View file

@ -14,8 +14,6 @@ else:
try:
from xonsh import __amalgam__
xontribs_meta = __amalgam__
_sys.modules["xonsh.xontribs_meta"] = __amalgam__
cli_utils = __amalgam__
_sys.modules["xonsh.cli_utils"] = __amalgam__
contexts = __amalgam__
@ -28,6 +26,8 @@ else:
_sys.modules["xonsh.platform"] = __amalgam__
pretty = __amalgam__
_sys.modules["xonsh.pretty"] = __amalgam__
xontribs_meta = __amalgam__
_sys.modules["xonsh.xontribs_meta"] = __amalgam__
codecache = __amalgam__
_sys.modules["xonsh.codecache"] = __amalgam__
lazyimps = __amalgam__
@ -46,8 +46,6 @@ else:
_sys.modules["xonsh.commands_cache"] = __amalgam__
completer = __amalgam__
_sys.modules["xonsh.completer"] = __amalgam__
diff_history = __amalgam__
_sys.modules["xonsh.diff_history"] = __amalgam__
events = __amalgam__
_sys.modules["xonsh.events"] = __amalgam__
foreign_shells = __amalgam__
@ -64,8 +62,12 @@ else:
_sys.modules["xonsh.xontribs"] = __amalgam__
ansi_colors = __amalgam__
_sys.modules["xonsh.ansi_colors"] = __amalgam__
diff_history = __amalgam__
_sys.modules["xonsh.diff_history"] = __amalgam__
dirstack = __amalgam__
_sys.modules["xonsh.dirstack"] = __amalgam__
execer = __amalgam__
_sys.modules["xonsh.execer"] = __amalgam__
shell = __amalgam__
_sys.modules["xonsh.shell"] = __amalgam__
style_tools = __amalgam__
@ -78,22 +80,20 @@ else:
_sys.modules["xonsh.base_shell"] = __amalgam__
environ = __amalgam__
_sys.modules["xonsh.environ"] = __amalgam__
imphooks = __amalgam__
_sys.modules["xonsh.imphooks"] = __amalgam__
inspectors = __amalgam__
_sys.modules["xonsh.inspectors"] = __amalgam__
aliases = __amalgam__
_sys.modules["xonsh.aliases"] = __amalgam__
main = __amalgam__
_sys.modules["xonsh.main"] = __amalgam__
readline_shell = __amalgam__
_sys.modules["xonsh.readline_shell"] = __amalgam__
tracer = __amalgam__
_sys.modules["xonsh.tracer"] = __amalgam__
dumb_shell = __amalgam__
_sys.modules["xonsh.dumb_shell"] = __amalgam__
execer = __amalgam__
_sys.modules["xonsh.execer"] = __amalgam__
imphooks = __amalgam__
_sys.modules["xonsh.imphooks"] = __amalgam__
main = __amalgam__
_sys.modules["xonsh.main"] = __amalgam__
del __amalgam__
except ImportError:
pass

View file

@ -11,24 +11,26 @@ else:
bash_completion = __amalgam__
_sys.modules["xonsh.completers.bash_completion"] = __amalgam__
completer = __amalgam__
_sys.modules["xonsh.completers.completer"] = __amalgam__
pip = __amalgam__
_sys.modules["xonsh.completers.pip"] = __amalgam__
tools = __amalgam__
_sys.modules["xonsh.completers.tools"] = __amalgam__
xompletions = __amalgam__
_sys.modules["xonsh.completers.xompletions"] = __amalgam__
_aliases = __amalgam__
_sys.modules["xonsh.completers._aliases"] = __amalgam__
commands = __amalgam__
_sys.modules["xonsh.completers.commands"] = __amalgam__
completer = __amalgam__
_sys.modules["xonsh.completers.completer"] = __amalgam__
environment = __amalgam__
_sys.modules["xonsh.completers.environment"] = __amalgam__
man = __amalgam__
_sys.modules["xonsh.completers.man"] = __amalgam__
path = __amalgam__
_sys.modules["xonsh.completers.path"] = __amalgam__
pip = __amalgam__
_sys.modules["xonsh.completers.pip"] = __amalgam__
python = __amalgam__
_sys.modules["xonsh.completers.python"] = __amalgam__
xompletions = __amalgam__
_sys.modules["xonsh.completers.xompletions"] = __amalgam__
_aliases = __amalgam__
_sys.modules["xonsh.completers._aliases"] = __amalgam__
base = __amalgam__
_sys.modules["xonsh.completers.base"] = __amalgam__
bash = __amalgam__