Skip to content
Snippets Groups Projects
Commit 456685427e86 authored by Bob Ippolito's avatar Bob Ippolito
Browse files

Merge branch 'master' into travis-py37

Branches
No related tags found
No related merge requests found
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- PYTHON: "C:\\Python35" - PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.0" PYTHON_VERSION: "3.5.6"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
...@@ -24,7 +24,11 @@ ...@@ -24,7 +24,11 @@
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- PYTHON: "C:\\Python35" - PYTHON: "C:\\Python36"
PYTHON_VERSION: "3.6.3" PYTHON_VERSION: "3.6.6"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python37"
PYTHON_VERSION: "3.7.0"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python27-x64"
...@@ -40,7 +44,7 @@ ...@@ -40,7 +44,7 @@
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
- PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.0" PYTHON_VERSION: "3.5.6"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
- PYTHON: "C:\\Python36-x64" - PYTHON: "C:\\Python36-x64"
...@@ -44,7 +48,11 @@ ...@@ -44,7 +48,11 @@
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
- PYTHON: "C:\\Python36-x64" - PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6.3" PYTHON_VERSION: "3.6.6"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.0"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
clone_depth: 25 clone_depth: 25
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment