Merged master again

.travis.yml

@@ -6,11 +6,19 @@ env:
     - PYTHON_VER=3.3
     - PYTHON_VER=3.4
 
+sudo: false
+cache:
+  directories:
+  - pythons
+# Note on this cache directories: "make build" downloads pythons elsewhere,
+# but installs the compiled bin/lib/share in pythons/pythonx.y/ .
+
 notifications:
   email:
     - buildout-development@googlegroups.com
 
 install:
+    - ls -al pythons
     - deactivate
     - make build
 

CHANGES.rst

@@ -6,11 +6,11 @@ Unreleased
 
 - Undo breakage on Windows machines where ``sys.prefix`` can also be a
   ``site-packages`` directory:  don't remove it from ``sys.path``.  See
-  https://github.com/buildout/buildout/issues/217
+  https://github.com/buildout/buildout/issues/217 .
 
 - Remove assumption that ``pkg_resources`` is a module (untrue since
   release of `setuptools 8.3``).  See
-  https://github.com/buildout/buildout/issues/227
+  https://github.com/buildout/buildout/issues/227 .
 
 - Fix for #212. For certain kinds of conflict errors you'd get an UnpackError
   when rendering the error message. Instead of a nicely formatted version
@@ -19,7 +19,7 @@ Unreleased
 
 - Making sure we use the correct easy_install when setuptools is installed
   globally. See https://github.com/buildout/buildout/pull/232 and
-  https://github.com/buildout/buildout/pull/222
+  https://github.com/buildout/buildout/pull/222 .
   [lrowe]
 
 - Fixed: In ``zc.recipe.egg#custom`` recipe's ``rpath`` support, don't
@@ -28,6 +28,16 @@ Unreleased
   https://github.com/buildout/buildout/issues/225.
   [tseaver]
 
+- Bootstrap script now accepts ``--to-dir``. Setuptools is installed there. If
+  already available there, it is reused. This can be used to bootstrap
+  buildout without internet access. Similarly, a local ``ez_setup.py`` is used
+  when available instead of it being downloaded. You need setuptools 14.0 or
+  higher for this functionality.
+  [lrowe]
+
+- Updated buildout's `travis-ci <https://travis-ci.org/buildout/buildout>`_
+  configuration so that tests run much quicker so that buildout is easier and
+  quicker to develop.
 
 2.3.1 (2014-12-16)
 ==================

Makefile

 HERE = $(shell pwd)
 PYTHON_VER ?= 2.7
-PYTHON_PATH = $(HERE)/python$(PYTHON_VER)
+PYTHON_PATH = $(HERE)/pythons/$(PYTHON_VER)
+PYTHON_BUILD_DIR = $(HERE)/python_builds
 
 ifeq ($(PYTHON_VER),2.6)
 	PYTHON_MINOR ?= 2.6.8
@@ -32,28 +33,29 @@ BUILD_DIRS = $(PYTHON_PATH) bin build develop-eggs eggs parts
 
 all: build
 
-$(PYTHON_PATH):
+$(PYTHON_PATH)/bin/$(PYTHON_EXE):
 	@echo "Installing Python"
 	mkdir -p $(PYTHON_PATH)
-	cd $(PYTHON_PATH) && \
+	mkdir -p $(PYTHON_BUILD_DIR)
+	cd $(PYTHON_BUILD_DIR) && \
 	curl --progress-bar --location $(PYTHON_DOWNLOAD) | tar -zx
 ifeq ($(PYTHON_VER),2.6)
-	cd $(PYTHON_PATH) && \
+	cd $(PYTHON_BUILD_DIR) && \
 	curl --progress-bar -L https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch > ssl.patch
-	cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \
+	cd $(PYTHON_BUILD_DIR)/$(PYTHON_ARCHIVE) && \
 	patch -p0 < ../ssl.patch
 endif
-	cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \
+	cd $(PYTHON_BUILD_DIR)/$(PYTHON_ARCHIVE) && \
 	./configure --prefix $(PYTHON_PATH) $(PYTHON_CONFIGURE_ARGS) >/dev/null 2>&1 && \
 	make >/dev/null 2>&1 && \
 	make install >/dev/null 2>&1
 	@echo "Finished installing Python"
 
-build: $(PYTHON_PATH)
+build: $(PYTHON_PATH)/bin/$(PYTHON_EXE)
 	$(PYTHON_PATH)/bin/$(PYTHON_EXE) dev.py
 
 clean:
-	rm -rf $(BUILD_DIRS)
+	rm -rf $(BUILD_DIRS) $(PYTHON_BUILD_DIR)
 
 test:
 	$(HERE)/bin/test -1 -v