Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2017-04-18 12:33:19 +02:00
commit b152360c5b
2 files changed
+7 -10

No files matched your search

+4 -10
View File
@@ -1,26 +1,20 @@
version: '{build}-{branch}'
# Do not build feature branch with open Pull Requests
skip_branch_with_pr: true
image: Visual Studio 2015
platform: x64
shallow_clone: true
environment:
matrix:
- PYTHON: "C:\\Python36-x64"
DISTUTILS_USE_SDK: "1"
- PYTHON: "C:\\Python35-x64"
DISTUTILS_USE_SDK: "1"
PYTHON: "C:\\Python36-x64"
DISTUTILS_USE_SDK: "1"
install:
- "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
- "%PYTHON%\\python.exe -m pip install -r win-requirements.txt"
build: off
test_script:
- "%PYTHON%\\python.exe -m py.test"
- "%PYTHON%\\python.exe -m pytest"
+3
View File
@@ -0,0 +1,3 @@
-rrequirements.txt
pypiwin32 # pyup: ignore