Commit 424541b8 authored by Marius Gedminas's avatar Marius Gedminas

Fix and reenable Python 3.4 tests on Travis

Closes #203

Some background: PEP 453 introduced the 'ensurepip' module to Python 3.4.
'make install' runs 'python3.4 -m ensurepip' which installs setuptools
into site-packages.  Our test suite doesn't like that.  Luckily,
Python's ./configure has an option to disable ensurepip.
parent 7ba6d163
...@@ -4,6 +4,7 @@ env: ...@@ -4,6 +4,7 @@ env:
- PYTHON_VER=2.7 - PYTHON_VER=2.7
- PYTHON_VER=3.2 - PYTHON_VER=3.2
- PYTHON_VER=3.3 - PYTHON_VER=3.3
- PYTHON_VER=3.4
notifications: notifications:
email: email:
......
...@@ -14,6 +14,10 @@ endif ...@@ -14,6 +14,10 @@ endif
ifeq ($(PYTHON_VER),3.3) ifeq ($(PYTHON_VER),3.3)
PYTHON_MINOR ?= 3.3.0 PYTHON_MINOR ?= 3.3.0
endif endif
ifeq ($(PYTHON_VER),3.4)
PYTHON_MINOR ?= 3.4.2
PYTHON_CONFIGURE_ARGS ?= --without-ensurepip
endif
ifndef PYTHON_MINOR ifndef PYTHON_MINOR
$(error Please specify desired PYTHON_MINOR for Python $(PYTHON_VER)) $(error Please specify desired PYTHON_MINOR for Python $(PYTHON_VER))
...@@ -40,7 +44,7 @@ ifeq ($(PYTHON_VER),2.6) ...@@ -40,7 +44,7 @@ ifeq ($(PYTHON_VER),2.6)
patch -p0 < ../ssl.patch patch -p0 < ../ssl.patch
endif endif
cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \ cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \
./configure --prefix $(PYTHON_PATH) >/dev/null 2>&1 && \ ./configure --prefix $(PYTHON_PATH) $(PYTHON_CONFIGURE_ARGS) >/dev/null 2>&1 && \
make >/dev/null 2>&1 && \ make >/dev/null 2>&1 && \
make install >/dev/null 2>&1 make install >/dev/null 2>&1
@echo "Finished installing Python" @echo "Finished installing Python"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment