From e5e3f5a8d457bea04188ac893fa21bb7c1e98ddf Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 12 Oct 2018 14:06:53 -0500 Subject: [PATCH] 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 --- web/__init__.py | 4 ---- zuul/_setup_hook.py | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 web/__init__.py diff --git a/web/__init__.py b/web/__init__.py deleted file mode 100644 index 5c4a874e98..0000000000 --- a/web/__init__.py +++ /dev/null @@ -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. diff --git a/zuul/_setup_hook.py b/zuul/_setup_hook.py index be3e56b92a..9d2bcc5f2e 100644 --- a/zuul/_setup_hook.py +++ b/zuul/_setup_hook.py @@ -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):