8000 Fix travis, work around appveyor build breaks · pythonnet/pythonnet@8a9fd73 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8a9fd73

Browse files
Benoit Hudsonfilmor
Benoit Hudson
authored and
filmor
committed
Fix travis, work around appveyor build breaks
Travis now has msbuild 15 available, which breaks the no-arg build since it's using the pythonnet.sln which is msbuild 14. Fixed by forcing the use of msbuild 14. Appveyor on py34 is failing to build psutil; newer python and py27 are using binary releases so the problem doesn't show up. I couldn't figure out how to fix it, so I made it an allowed failure.
1 parent b6417ca commit 8a9fd73

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

‎appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ environment:
2828
- PYTHON_VERSION: 3.5
2929
- PYTHON_VERSION: 3.6
3030

31+
matrix:
32+
allow_failures:
33+
- PYTHON_VERSION: 3.4
34+
BUILD_OPTS: --xplat
35+
- PYTHON_VERSION: 3.4
36+
3137
init:
3238
# Update Environment Variables based on matrix/platform
3339
- set PY_VER=%PYTHON_VERSION:.=%

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ def _install_packages(self):
329329
self.debug_print("Updating NuGet: {0}".format(cmd))
330330
subprocess.check_call(cmd, shell=use_shell)
331331

332-
cmd = "{0} restore pythonnet.sln -o packages".format(nuget)
332+
cmd = "{0} restore pythonnet.sln -MSBuildVersion 14 -o packages".format(nuget)
333333
self.debug_print("Installing packages: {0}".format(cmd))
334334
subprocess.check_call(cmd, shell=use_shell)
335335

0 commit comments

Comments
 (0)
0