From 7d1a7ea9cb515eddfcdced3cb3eef24d811e126e Mon Sep 17 00:00:00 2001
From: Anthony Scopatz <scopatz@gmail.com>
Date: Sun, 16 Aug 2020 13:03:57 -0500
Subject: [PATCH] fixed pip install && setup.py sdist to include generated
 files

---
 setup.py | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index 3b116b89c..6861e7217 100755
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@ from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
 from setuptools.command.install import install
 from setuptools.command.develop import develop
+from setuptools.command.build_py import build_py
 from setuptools.command.install_scripts import install_scripts
 
 try:
@@ -195,9 +196,23 @@ def restore_version():
         f.write(upd)
 
 
+class xbuild_py(build_py):
+    """Xonsh specialization of setuptools build_py class."""
+
+    def run(self):
+        clean_tables()
+        build_tables()
+        amalgamate_source()
+        # add dirty version number
+        dirty = dirty_version()
+        super().run()
+        if dirty:
+            restore_version()
+
+
 class xinstall(install):
     """Xonsh specialization of setuptools install class.
-    For production, let setuptools generate the 
+    For production, let setuptools generate the
     startup script, e.g: `pip installl .' rather than
     relying on 'python setup.py install'."""
 
@@ -217,6 +232,7 @@ class xinstall(install):
 
             traceback.print_exc()
             print("Installing Jupyter hook failed.")
+
         super().run()
         if dirty:
             restore_version()
@@ -230,6 +246,7 @@ class xsdist(sdist):
         build_tables()
         amalgamate_source()
         dirty = dirty_version()
+        files.extend(TABLES)
         super().make_release_tree(basedir, files)
         if dirty:
             restore_version()
@@ -279,18 +296,15 @@ class install_scripts_rewrite(install_scripts):
 
 
 # The custom install needs to be used on Windows machines
+cmdclass = {
+    "install": xinstall,
+    "sdist": xsdist,
+    "build_py": xbuild_py,
+}
 if os.name == "nt":
-    cmdclass = {
-        "install": xinstall,
-        "sdist": xsdist,
-        "install_scripts": install_scripts_quoted_shebang,
-    }
+    cmdclass["install_scripts"] = install_scripts_quoted_shebang
 else:
-    cmdclass = {
-        "install": xinstall,
-        "sdist": xsdist,
-        "install_scripts": install_scripts_rewrite,
-    }
+    cmdclass["install_scripts"] = install_scripts_rewrite
 
 
 class xdevelop(develop):