Launchpad itself

Merge ~cjwatson/launchpad:rename-wheelhouse into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. rename-wheelhouse
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: bd2f321102af156ec26c0a000481a486d2f7963a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:rename-wheelhouse
Merge into: launchpad:master
Diff against target: 57 lines (+7/-7)
2 files modified
.gitignore (+1/-1)
Makefile (+6/-6)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+399230@code.launchpad.net

Commit message

Rename wheelhouse to wheels

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 0f9be64..502ce43 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -74,5 +74,5 @@ callgrind.out.*
6 !logs/README.txt
7 /logs
8 yarn/node_modules
9-/wheelhouse
10+/wheels
11 requirements/combined.txt
12diff --git a/Makefile b/Makefile
13index fd2d794..5779007 100644
14--- a/Makefile
15+++ b/Makefile
16@@ -23,7 +23,7 @@ PIP_ENV := LC_ALL=C.UTF-8
17 # be reviewed/merged/deployed.
18 PIP_NO_INDEX := 1
19 PIP_ENV += PIP_NO_INDEX=$(PIP_NO_INDEX)
20-PIP_ENV += PIP_FIND_LINKS="file://$(WD)/wheelhouse/ file://$(WD)/download-cache/dist/"
21+PIP_ENV += PIP_FIND_LINKS="file://$(WD)/wheels/ file://$(WD)/download-cache/dist/"
22
23 VIRTUALENV := $(PIP_ENV) virtualenv
24 PIP := PYTHONPATH= $(PIP_ENV) env/bin/pip --cache-dir=$(WD)/download-cache/
25@@ -261,11 +261,11 @@ requirements/combined.txt: \
26 # dependencies without also building a useless wheel of Launchpad itself;
27 # fortunately that doesn't take too long, and we just remove it afterwards.
28 build_wheels: $(PIP_BIN) requirements/combined.txt
29- $(RM) -r wheelhouse
30+ $(RM) -r wheelhouse wheels
31 $(SHHH) $(PIP) wheel \
32 -c requirements/setup.txt -c requirements/combined.txt \
33- -w wheelhouse .
34- $(RM) wheelhouse/lp-[0-9]*.whl
35+ -w wheels .
36+ $(RM) wheels/lp-[0-9]*.whl
37 $(MAKE) clean_pip
38
39 # Compatibility
40@@ -284,7 +284,7 @@ $(PY): download-cache requirements/combined.txt setup.py
41 $(VIRTUALENV) \
42 --python=$(PYTHON) --never-download \
43 --extra-search-dir=$(WD)/download-cache/dist/ \
44- --extra-search-dir=$(WD)/wheelhouse/ \
45+ --extra-search-dir=$(WD)/wheels/ \
46 env
47 ln -sfn env/bin bin
48 $(SHHH) $(PIP) install -r requirements/setup.txt
49@@ -428,7 +428,7 @@ lxc-clean: clean_js clean_pip clean_logs
50 # it does everything expected from a clean target. When the
51 # referenced bug is fixed, this target may be reunited with
52 # the 'clean' target.
53- $(RM) -r env wheelhouse
54+ $(RM) -r env wheelhouse wheels
55 $(RM) requirements/combined.txt
56 $(RM) -r $(LP_BUILT_JS_ROOT)/*
57 $(RM) -r $(CODEHOSTING_ROOT)/*

Subscribers

People subscribed via source and target branches

to status/vote changes: