← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:clean-pip-remove-env into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:clean-pip-remove-env into launchpad:master.

Commit message:
Remove env/ directory in "make clean_pip"

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/401034

This target is used as part of the wheel-building machinery for production deployments.  If we leave the env/ directory in place after building wheels, then pushing code can get confused: since env/ still exists, it thinks it doesn't need to rebuild it, but bin/ has been removed so the tree won't work until it's been rebuilt.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:clean-pip-remove-env into launchpad:master.
diff --git a/Makefile b/Makefile
index 5466ef7..0c824f8 100644
--- a/Makefile
+++ b/Makefile
@@ -414,6 +414,7 @@ clean_pip:
 	$(RM) -r build
 	if [ -d $(CONVOY_ROOT) ]; then $(RM) -r $(CONVOY_ROOT) ; fi
 	$(RM) -r bin
+	$(RM) -r env
 	$(RM) -r parts
 	$(RM) .installed.cfg