Skip to content

Commit f2b9ec8

Browse files
committed
PYTHON-1200 - Test CPython 2.6, 2.7, and 3.2 on Windows
1 parent 7702c46 commit f2b9ec8

File tree

1 file changed

+18
-45
lines changed

1 file changed

+18
-45
lines changed

.evergreen/config.yml

Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -844,22 +844,6 @@ axes:
844844
display_name: InMemory
845845
variables:
846846
STORAGE_ENGINE: "inmemory"
847-
848-
#- id: windows-vs2008-python-version
849-
# display_name: "Windows Visual Studio 2008 Python"
850-
# values:
851-
# - id: "2.6"
852-
# display_name: "Python 2.6"
853-
# variables:
854-
# PYTHON_BINARY: "/cygdrive/c/python/Python26/python.exe"
855-
# - id: "2.7"
856-
# display_name: "Python 2.7"
857-
# variables:
858-
# PYTHON_BINARY: "/cygdrive/c/python/Python27/python.exe"
859-
# - id: "3.2"
860-
# display_name: "Python 3.2"
861-
# variables:
862-
# PYTHON_BINARY: "/cygdrive/c/python/Python32/python.exe"
863847
- id: windows-vs2010-python-version
864848
display_name: "Windows Visual Studio 2010 Python"
865849
values:
@@ -874,6 +858,21 @@ axes:
874858
- id: windows-vs2015-python-version
875859
display_name: "Windows Visual Studio 2015 Python"
876860
values:
861+
# There is (currently) no vs2008 distro. The Microsoft Visual
862+
# C++ Compiler for Python 2.7 has been installed, with CPython
863+
# 2.6, 2.7, and 3.2, on the vs2015 distro.
864+
- id: "2.6"
865+
display_name: "Python 2.6"
866+
variables:
867+
PYTHON_BINARY: "/cygdrive/c/python/Python26/python.exe"
868+
- id: "2.7"
869+
display_name: "Python 2.7"
870+
variables:
871+
PYTHON_BINARY: "/cygdrive/c/python/Python27/python.exe"
872+
- id: "3.2"
873+
display_name: "Python 3.2"
874+
variables:
875+
PYTHON_BINARY: "/cygdrive/c/python/Python32/python.exe"
877876
- id: "3.5"
878877
display_name: "Python 3.5"
879878
variables:
@@ -1072,33 +1071,7 @@ buildvariants:
10721071

10731072
# TODO: Figure out SSL on Windows.
10741073

1075-
# Test Python 2.6, 2.7, and 3.2 against all versions on MongoDB >= 2.4
1076-
# on Windows with Visual Studio 2008.
1077-
#- matrix_name: "tests-windows-vs2008-python-version-nossl"
1078-
# matrix_spec: {"windows-vs2008-python-version": "*", auth: "*", ssl: "nossl" }
1079-
# display_name: "Windows 64 Visual Studio 2008 ${windows-vs2008-python-version} ${auth} ${ssl}"
1080-
# run_on: windows-64-vs2008-test
1081-
# tasks:
1082-
# - name: "test-latest-replica_set"
1083-
# - name: "test-latest-sharded_cluster"
1084-
# - name: "test-latest-standalone"
1085-
# - name: "test-3.4-replica_set"
1086-
# - name: "test-3.4-sharded_cluster"
1087-
# - name: "test-3.4-standalone"
1088-
# - name: "test-3.2-replica_set"
1089-
# - name: "test-3.2-sharded_cluster"
1090-
# - name: "test-3.2-standalone"
1091-
# - name: "test-3.0-replica_set"
1092-
# - name: "test-3.0-sharded_cluster"
1093-
# - name: "test-3.0-standalone"
1094-
# - name: "test-2.6-replica_set"
1095-
# - name: "test-2.6-sharded_cluster"
1096-
# - name: "test-2.6-standalone"
1097-
# - name: "test-2.4-replica_set"
1098-
# - name: "test-2.4-sharded_cluster"
1099-
# - name: "test-2.4-standalone"
1100-
1101-
# Test Python 3.3 and 3.4 against all versions on MongoDB >= 2.4
1074+
# Test CPython 3.3 and 3.4 against all versions on MongoDB >= 2.4
11021075
# on Windows with Visual Studio 2010.
11031076
- matrix_name: "tests-windows-vs2010-python-version-nossl"
11041077
matrix_spec: {"windows-vs2010-python-version": "*", auth: "*", ssl: "nossl" }
@@ -1124,8 +1097,8 @@ buildvariants:
11241097
- name: "test-2.4-sharded_cluster"
11251098
- name: "test-2.4-standalone"
11261099

1127-
# Test Python 3.5 and 3.6 against all versions on MongoDB >= 2.4
1128-
# on Windows with Visual Studio 2015.
1100+
# Test CPython 2.6, 2.7, 3.2, 3.5 and 3.6 against all versions on MongoDB >= 2.4
1101+
# on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
11291102
- matrix_name: "tests-windows-vs2015-python-version-nossl"
11301103
matrix_spec: {"windows-vs2015-python-version": "*", auth: "*", ssl: "nossl" }
11311104
display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth} ${ssl}"

0 commit comments

Comments
 (0)