launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-no-sourcecode into launchpad:master.

Commit message:
Don't build sourcecode on Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

sourcecode/Makefile currently builds cscvs and pygettextpo, neither of which work on Python 3; and there's a good chance that fixing them to work on Python 3 will also involve moving them out of sourcecode.  Only build sourcecode if we're running on Python 2.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-no-sourcecode into launchpad:master.

diff --git a/Makefile b/Makefile
index 2a5ee82..f35bd18 100644
--- a/Makefile
+++ b/Makefile
@@ -289,8 +289,10 @@ $(subst $(PY),,$(PIP_BIN)): $(PY)
 # a prerequisite, to make sure it's up to date when doing deployments.
 compile: $(PY)
 	${SHHH} utilities/relocate-virtualenv env
-	${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \
-	    LPCONFIG=${LPCONFIG}
+	if grep -q '^2\.' env/python_version; then \
+		${SHHH} $(MAKE) -C sourcecode build \
+			PYTHON=${PYTHON} LPCONFIG=${LPCONFIG}; \
+	fi
 	$(PYTHON) utilities/link-system-packages.py \
 		"$(SITE_PACKAGES)" system-packages.txt
 	${SHHH} bin/build-twisted-plugin-cache