zuul
/
zuul
Code Issues Proposed changes

Remove unneeded cruft from bdist_wheel fix attempts 

We added __init__.py files in places, as well as code to generate them.
Turns out none of them are needed. Running sdist before bdist_wheel (or
running yarn build by itself) is the thing with the magic.

Depends-On: https://review.openstack.org/610142
Change-Id: I9610cb5dbaf10e432d824314275fb46e901a93c3
This commit is contained in:
Monty Taylor 2018-10-12 14:06:53 -05:00
parent 0df2e79c39
commit e5e3f5a8d4
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/__init__.py
View File

@ -1,4 +0,0 @@
# This file is here because without it python setup.py bdist_wheel does not
# pick up the built javascript files in zuul/web/static. It does not cause
# web/ itself to be put into the wheel, but without it built wheels do not
# have the built javascript files.

4
zuul/_setup_hook.py
View File

@ -32,10 +32,6 @@ def _build_javascript():
r = subprocess.Popen(['yarn', 'build'], cwd="web/").wait()
if r:
raise RuntimeError("Yarn build failed")
# Touch the static paths so that bdist_wheel includes them
for path in ('', 'static', 'static/js', 'static/css', 'static/media'):
with open(os.path.join('web/build', path, '__init__.py'), 'w'):
pass
def _from_git(distribution):