From 3625286add793e9bc582b51c4b730dc33b438cee Mon Sep 17 00:00:00 2001 From: Benoit Hudson Date: Fri, 12 Oct 2018 09:50:20 -0400 Subject: [PATCH] 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. --- appveyor.yml | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6bebef490..b371a2696 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,6 +28,12 @@ environment: - PYTHON_VERSION: 3.5 - PYTHON_VERSION: 3.6 +matrix: + allow_failures: + - PYTHON_VERSION: 3.4 + BUILD_OPTS: --xplat + - PYTHON_VERSION: 3.4 + init: # Update Environment Variables based on matrix/platform - set PY_VER=%PYTHON_VERSION:.=% diff --git a/setup.py b/setup.py index 4ec2a2113..183ba4c3a 100644 --- a/setup.py +++ b/setup.py @@ -329,7 +329,7 @@ def _install_packages(self): self.debug_print("Updating NuGet: {0}".format(cmd)) subprocess.check_call(cmd, shell=use_shell) - cmd = "{0} restore pythonnet.sln -o packages".format(nuget) + cmd = "{0} restore pythonnet.sln -MSBuildVersion 14 -o packages".format(nuget) self.debug_print("Installing packages: {0}".format(cmd)) subprocess.check_call(cmd, shell=use_shell)