Merge lp:~cjwatson/turnip/turnipcake-virtualenv into lp:~canonical-launchpad-branches/turnip/turnipcake

[Colin Watson]

Add targets to build a virtualenv and to build a tarball with included pip cache.

Add targets to build a virtualenv and to build a tarball with included pip cache.

This parallels https://code.launchpad.net/~cjwatson/turnip/virtualenv/+merge/274701, and takes basically the same approach. While we only need this for development, it greatly simplifies updating the Mojo spec if we can treat both turnip and turnipcake more or less the same way.

[lp:~cjwatson/turnip/turnipcake-virtualenv]

28. By Colin Watson on 2015-10-23

Fix turnip dependencies URL.

29. By Colin Watson on 2015-10-29

Move PIP_SOURCE_DIR check from build-tarball to $(ENV).

[Colin Watson (cjwatson)]

Approving as a parallel of https://code.launchpad.net/~cjwatson/turnip/virtualenv/+merge/274701.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-02-10 21:22:55 +0000
+++ .bzrignore	2015-10-29 11:00:49 +0000
@@ -1,4 +1,7 @@
 __pycache__
 *.egg-info
 *.db
-*.venv
\ No newline at end of file
+*.venv
+build
+env
+pip-cache

=== modified file 'Makefile'
--- Makefile	2015-03-26 01:07:54 +0000
+++ Makefile	2015-10-29 11:00:49 +0000
@@ -1,21 +1,59 @@
 # Copyright 2005-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-PYTHON=python
-PSERVE=pserve
-FLAKE8=flake8
-ALEMBIC=alembic
-
-check:
+ENV = $(CURDIR)/env
+PIP_CACHE = $(CURDIR)/pip-cache
+
+PYTHON = $(ENV)/bin/python
+PSERVE = $(ENV)/bin/pserve
+FLAKE8 = $(ENV)/bin/flake8
+ALEMBIC = $(ENV)/bin/alembic
+
+PIP_CACHE_ARGS := -q --no-use-wheel
+ifneq ($(PIP_SOURCE_DIR),)
+PIP_CACHE_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
+endif
+
+# Create archives in labelled directories (e.g.
+# <rev-id>/$(PROJECT_NAME).tar.gz)
+TARBALL_BUILD_LABEL ?= $(shell bzr log -rlast: --show-ids | sed -n 's/^revision-id: //p')
+TARBALL_FILE_NAME = turnipcake.tar.gz
+TARBALL_BUILDS_DIR ?= build
+TARBALL_BUILD_DIR = $(TARBALL_BUILDS_DIR)/$(TARBALL_BUILD_LABEL)
+TARBALL_BUILD_PATH = $(TARBALL_BUILD_DIR)/$(TARBALL_FILE_NAME)
+
+build: $(ENV)
+
+$(ENV):
+ifeq ($(PIP_SOURCE_DIR),)
+	@echo "Set PIP_SOURCE_DIR to the path of a checkout of" >&2
+	@echo "lp:~canonical-launchpad-branches/turnip/dependencies." >&2
+	@exit 1
+endif
+	mkdir -p $(ENV)
+	(echo '[easy_install]'; \
+	 echo "allow_hosts = ''"; \
+	 echo 'find_links = file://$(realpath $(PIP_SOURCE_DIR))/') \
+		>$(ENV)/.pydistutils.cfg
+	virtualenv $(ENV)
+	$(ENV)/bin/pip install $(PIP_CACHE_ARGS) \
+		-r bootstrap-requirements.txt
+	$(ENV)/bin/pip install $(PIP_CACHE_ARGS) \
+		-r requirements.txt \
+		-r deploy-requirements.txt \
+		-e .
+
+check: $(ENV)
 	$(PYTHON) -m unittest discover turnipcake
 
 clean:
-	@find turnipcake -name '*.py[co]' -exec rm '{}' \;
-	@find . -depth -name '__pycache__' -exec rm -rf '{}' \;	
-	@rm -f .coverage
+	find turnipcake -name '*.py[co]' -exec rm '{}' \;
+	find . -depth -name '__pycache__' -exec rm -rf '{}' \;	
+	rm -f .coverage
+	rm -rf $(ENV) $(PIP_CACHE)
 
 dist:
-	$(PYTHON) ./setup.py sdist
+	python ./setup.py sdist
 
 TAGS:
 	ctags -e -R turnipcake
@@ -23,13 +61,33 @@
 tags:
 	ctags -R turnipcake
 
-lint:
+lint: $(ENV)
 	@$(FLAKE8) turnipcake
 
-run:
+run: $(ENV)
 	$(PSERVE) turnipcake.ini --reload
 
-migrate:
+migrate: $(ENV)
 	$(ALEMBIC) -c turnipcake.ini upgrade head
 
-.PHONY: check clean dist lint run
+$(PIP_CACHE): $(ENV)
+	mkdir -p $(PIP_CACHE)
+	$(ENV)/bin/pip install $(PIP_CACHE_ARGS) -d $(PIP_CACHE) \
+		-r bootstrap-requirements.txt \
+		-r requirements.txt \
+		-r deploy-requirements.txt
+
+# XXX cjwatson 2015-10-20: limit to only interesting files
+build-tarball:
+	@echo "Creating deployment tarball at $(TARBALL_BUILD_PATH)"
+	rm -rf $(PIP_CACHE)
+	$(MAKE) $(PIP_CACHE)
+	mkdir -p $(TARBALL_BUILD_DIR)
+	tar -czf $(TARBALL_BUILD_PATH) \
+		--exclude-vcs \
+		--exclude build \
+		--exclude dist \
+		--exclude env \
+		./
+
+.PHONY: build check clean dist lint run migrate build-tarball

=== added file 'bootstrap-requirements.txt'
--- bootstrap-requirements.txt	1970-01-01 00:00:00 +0000
+++ bootstrap-requirements.txt	2015-10-29 11:00:49 +0000
@@ -0,0 +1,2 @@
+pip==7.1.2
+setuptools==18.4

=== added file 'deploy-requirements.txt'
--- deploy-requirements.txt	1970-01-01 00:00:00 +0000
+++ deploy-requirements.txt	2015-10-29 11:00:49 +0000
@@ -0,0 +1,3 @@
+# This will be merged into requirements.txt once the turnipcake charm uses
+# the new tarball construction code.
+gunicorn==19.3.0