Colin Watson has proposed merging ~cjwatson/lp-codeimport:rename-wheelhouse into lp-codeimport:master.
Commit message: Rename wheelhouse to wheels Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/397498 We don't really care about the exact name, but the ols charm layer wants it to be called "wheels", so let's go with that. The build_wheels and clean targets still remove the old "wheelhouse" directory for now, to ensure we don't end up with both directories on production. -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:rename-wheelhouse into lp-codeimport:master.
diff --git a/.gitignore b/.gitignore index 2fb1ebf..be0bd74 100644 --- a/.gitignore +++ b/.gitignore @@ -42,5 +42,5 @@ callgrind.out.* !logs/README.txt /logs /pip-cache -/wheelhouse +/wheels requirements/combined.txt diff --git a/Makefile b/Makefile index 6d1a21a..9e788a0 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ PIP_ENV := LC_ALL=C.UTF-8 # reviewed/merged/deployed. PIP_NO_INDEX := 1 PIP_ENV += PIP_NO_INDEX=$(PIP_NO_INDEX) -PIP_ENV += PIP_FIND_LINKS="file://$(WD)/wheelhouse/ file://$(WD)/dependencies/" +PIP_ENV += PIP_FIND_LINKS="file://$(WD)/wheels/ file://$(WD)/dependencies/" VIRTUALENV := $(PIP_ENV) virtualenv PIP := PYTHONPATH= $(PIP_ENV) env/bin/pip --cache-dir=$(WD)/pip-cache/ @@ -96,11 +96,11 @@ requirements/combined.txt: \ # itself; fortunately that doesn't take too long, and we just remove it # afterwards. build_wheels: $(PIP_BIN) requirements/combined.txt - $(RM) -r wheelhouse + $(RM) -r wheelhouse wheels $(SHHH) $(PIP) wheel \ -c requirements/setup.txt -c requirements/combined.txt \ - -w wheelhouse . - $(RM) wheelhouse/lp-codeimport-[0-9]*.whl + -w wheels . + $(RM) wheels/lp-codeimport-[0-9]*.whl $(MAKE) clean_pip # setuptools won't touch files that would have the same contents, but for @@ -116,7 +116,7 @@ $(PY): dependencies requirements/combined.txt setup.py $(VIRTUALENV) \ --python=$(PYTHON) --never-download \ --extra-search-dir=$(WD)/dependencies/ \ - --extra-search-dir=$(WD)/wheelhouse/ \ + --extra-search-dir=$(WD)/wheels/ \ env ln -sfn env/bin bin $(SHHH) $(PIP) install -r requirements/setup.txt @@ -155,7 +155,7 @@ clean_logs: $(RM) logs/thread*.request clean: clean_pip clean_logs - $(RM) -r env wheelhouse + $(RM) -r env wheelhouse wheels $(RM) requirements/combined.txt $(RM) -r build $(RM) $(VERSION_INFO)
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
