Skip to content

Commit 38ea4a9

Browse files
committed
fix #44 by updating the tests to run with python 2.7b1
1 parent 24c821d commit 38ea4a9

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Makefile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
export VERSION=$(shell python setup.py --version)
33

44
# Locations of Python interpreter binaries
5+
PYTHON27=/Users/dhellmann/Devel/virtualenvwrapper/Python/2.7b1/bin/python2.7
56
PYTHON26=/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6
67
PYTHON25=/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5
78
PYTHON24=/Users/dhellmann/Devel/virtualenvwrapper/Python/2.4.6/bin/python2.4
89

9-
# The main version of Python supported.
10-
PRIMARY_PYTHON_VERSION=$(PYTHON26)
11-
1210
# The test-quick pattern changes the definition of
1311
# this variable to only run against a single version of python.
1412
ifeq ($(PYTHON_BINARIES),)
15-
PYTHON_BINARIES=$(PRIMARY_PYHTON_VERSION) $(PYTHON25) $(PYTHON24)
13+
PYTHON_BINARIES=$(PYTHON26) $(PYTHON27) $(PYTHON25) $(PYTHON24)
1614
endif
1715

1816
SUPPORTED_SHELLS=bash sh ksh zsh
@@ -100,11 +98,19 @@ test-loop:
10098
done \
10199
done
102100

103-
test-quick:
104-
PYTHON_BINARIES=$(PRIMARY_PYTHON_VERSION) $(MAKE) test-bash
101+
test-quick: test-26
105102

106103
test-24:
107104
PYTHON_BINARIES=$(PYTHON24) $(MAKE) test-bash
108105

106+
test-25:
107+
PYTHON_BINARIES=$(PYTHON25) $(MAKE) test-bash
108+
109+
test-26:
110+
PYTHON_BINARIES=$(PYTHON26) $(MAKE) test-bash
111+
112+
test-27:
113+
PYTHON_BINARIES=$(PYTHON27) $(MAKE) test-bash
114+
109115
test-install:
110116
bash ./tests/manual_test_install.sh `pwd`/dist "$(VERSION)"

docs/en/history.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Dev
77
- Switched hook loader execution to a form that works with Python
88
2.4 to resolve `issue 43
99
<http://bitbucket.org/dhellmann/virtualenvwrapper/issue/43/>`__.
10+
- Tested under Python 2.7b1. See `issue 44
11+
<http://bitbucket.org/dhellmann/virtualenvwrapper/issue/44/>`__.
1012

1113
2.1.1
1214

0 commit comments

Comments
 (0)