backout #518, wrong merge !

pythonnet · dmitriyse · Nov 16, 2017 · Jul 28, 2017 · Aug 18, 2017 · Aug 18, 2017
commit 1c794261ada5217833a9d23d3f7bfb399e60fe09
diff --git a/.travis.yml b/.travis.yml
@@ -1,145 +1,18 @@
-dist: trusty
 sudo: false
+
 language: python
-
-matrix:
-  include:
-    - python: 2.7
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons:
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-            key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
-            - dotnet-hostfxr-2.0.0
-            - dotnet-runtime-2.0.0
-            - dotnet-sdk-2.0.0
-    - python: 3.3
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons:
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-            key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
-            - dotnet-hostfxr-2.0.0
-            - dotnet-runtime-2.0.0
-            - dotnet-sdk-2.0.0
-    - python: 3.4
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons:
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-            key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
-            - dotnet-hostfxr-2.0.0
-            - dotnet-runtime-2.0.0
-            - dotnet-sdk-2.0.0
-    - python: 3.5
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons:
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-            key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
-            - dotnet-hostfxr-2.0.0
-            - dotnet-runtime-2.0.0
-            - dotnet-sdk-2.0.0
-    - python: 3.6
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons:
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-            key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
-            - dotnet-hostfxr-2.0.0
-            - dotnet-runtime-2.0.0
-            - dotnet-sdk-2.0.0
-    - python: "3.7-dev"
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons:
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-            key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
-            - dotnet-hostfxr-2.0.0
-            - dotnet-runtime-2.0.0
-            - dotnet-sdk-2.0.0
+python:
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
+  - 3.7-dev
 
-    - python: 2.7
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-    - python: 3.3
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-    - python: 3.4
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-    - python: 3.5
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-    - python: 3.6
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-    - python: "3.7-dev"
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
+matrix:
   allow_failures:
-    - python: "3.7-dev"
-      env: 
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-    - python: "3.7-dev"
-      env: 
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
+    - python: 3.7-dev
+
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -150,8 +23,8 @@ env:
 addons:
   apt:
     sources:
-      - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
-        key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
+      - mono
+      - mono-libtiff-compat
     packages:
       - mono-devel
       - ca-certificates-mono
@@ -164,11 +37,11 @@ before_install:
 install:
   - pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
   - pip install --upgrade -r requirements.txt
-  - coverage run setup.py install $BUILD_OPTS
+  - coverage run setup.py install
 
 script:
   - python -m pytest
-  - mono $NUNIT_PATH src/embed_tests/bin/Python.EmbeddingTest.dll
+  - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
 
 after_script:
   # Uncomment if need to geninterop, ie. py37 final

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,6 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 ## [unreleased][]
 
 ### Added
--   Added new build system (pythonnet.15.sln) based on dotnetcore-sdk/xplat(crossplatform msbuild).
-    Currently there two side-by-side build systems that produces the same output (net40) from the same sources.
-    After a some transition time, current (mono/ msbuild 14.0) build system will be removed.
--   NUnit upgraded to 3.7 (eliminates travis-ci random bug)
 -   Added `clr.GetClrType` (#432, #433)
 -   Allowed passing `None` for nullable args (#460)
 -   Added keyword arguments based on C# syntax for calling CPython methods (#461)

diff --git a/NuGet.config b/NuGet.config
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,6 @@
 version: '{branch}-{build}'
 build: off
 
-image:
-  - Visual Studio 2017
-
 platform:
   - x86
   - x64
@@ -15,16 +12,6 @@ environment:
     CODECOV_ENV: PYTHON_VERSION, PLATFORM
 
   matrix:
-    - PYTHON_VERSION: 2.7 
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.3
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.4
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.5
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.6
-      BUILD_OPTS: --xplat
     - PYTHON_VERSION: 2.7
     - PYTHON_VERSION: 3.3
     - PYTHON_VERSION: 3.4
@@ -42,7 +29,6 @@ init:
 
 install:
   - pip install --upgrade -r requirements.txt --quiet
-  - choco install vswhere -y
 
   # Install OpenCover. Can't put on `packages.config`, not Mono compatible
   - .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages -Verbosity quiet
@@ -51,7 +37,7 @@ build_script:
   # Create clean `sdist`. Only used for releases
   - python setup.py --quiet sdist
   # Build `wheel` with coverage of `setup.py`
-  - coverage run setup.py bdist_wheel %BUILD_OPTS%
+  - coverage run setup.py bdist_wheel
 
 test_script:
   - pip install --no-index --find-links=.\dist\ pythonnet

diff --git a/ci/appveyor_run_tests.ps1 b/ci/appveyor_run_tests.ps1
@@ -11,12 +11,7 @@ if ($FALSE -and $env:PLATFORM -eq "x86"){
 # Executable paths for OpenCover
 # Note if OpenCover fails, it won't affect the exit codes.
 $OPENCOVER = Resolve-Path .\packages\OpenCover.*\tools\OpenCover.Console.exe
-if ($env:BUILD_OPTS -eq "--xplat"){
-    $CS_RUNNER = Resolve-Path $env:USERPROFILE\.nuget\packages\nunit.consolerunner\*\tools\"$CS_RUNNER".exe
-}
-else{
-    $CS_RUNNER = Resolve-Path .\packages\NUnit.*\tools\"$CS_RUNNER".exe
-}
+$CS_RUNNER = Resolve-Path .\packages\NUnit.*\tools\"$CS_RUNNER".exe
 $PY = Get-Command python
 
 # Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files.