Merge remote-tracking branch 'upstream/master' into domain-reload-tes…

…t-cases-fixes
pythonnet · lostmsu · Jan 7, 2021 · Nov 9, 2020 · Nov 9, 2020 · Nov 18, 2020
commit 421f665e8ab7d6e9822ec4e0ad6dc034cc39f6e9
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,65 +5,53 @@ on: [ pull_request, push ]
 jobs:
   build-test:
     name: Build and Test
-    runs-on: ubuntu-16.04
+    runs-on: ${{ matrix.os }}-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        python: [3.6,3.7,3.8,3.9]
-        shutdown_mode: [Normal,Soft]
-        toolset: [Mono,.NET]
-        include:
-          - toolset: .NET
-            BUILD_OPTS: --xplat
-            RUN_TESTS: dotnet
-            EMBED_TESTS_PATH: netcoreapp3.1_publish/
-            PERF_TESTS_PATH: net461/
-          - toolset: Mono
-            BUILD_OPTS: ""
-            RUN_TESTS: "mono ./packages/NUnit.*/tools/nunit3-console.exe"
-            EMBED_TESTS_PATH: ""
-            PERF_TESTS_PATH: ""
-
+        os: [windows, ubuntu, macos]
+        python: [3.6, 3.7, 3.8, 3.9]
+        platform: [x64]
+        shutdown_mode: [Normal, Soft]
+
     env:
-      BUILD_OPTS: ${{ matrix.BUILD_OPTS }}
-      RUN_TESTS: ${{ matrix.RUN_TESTS }}
-      EMBED_TESTS_PATH: ${{ matrix.EMBED_TESTS_PATH }}
-      PERF_TESTS_PATH: ${{ matrix.PERF_TESTS_PATH }}
       PYTHONNET_SHUTDOWN_MODE: ${{ matrix.SHUTDOWN_MODE }}
 
     steps:
+      - name: Set Environment on macOS
+        uses: maxim-lobanov/setup-xamarin@v1
+        if: ${{ matrix.os == 'macos' }}
+        with:
+          mono-version: latest
+
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Install Mono
-        if: ${{ matrix.toolset == 'Mono' }}
-        run: |
-          sudo apt update
-          sudo apt install mono-devel ca-certificates-mono -y
-
-      - name: Install .NET
-        if: ${{ matrix.toolset == '.NET' }}
+      - name: Setup .NET
         uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.x
 
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+          architecture: ${{ matrix.platform }}
 
       - name: Install dependencies
         run: |
-          pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
           pip install --upgrade -r requirements.txt
 
-      - name: Install
+      - name: Build and Install
         run: |
-          echo $BUILD_OPTS
-          python setup.py install $BUILD_OPTS
+          python setup.py configure
+          pip install -v .
 
       - name: Python Tests
         run: pytest
 
-      - name: .NET Tests
-        run: $RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll --labels=All
+      - name: Run Embedding tests
+        run: dotnet test --runtime any-${{ matrix.platform }} src/embed_tests/
+        if: ${{ matrix.os != 'macos' }} # Not working right now, doesn't find libpython
+
+      # TODO: Run perf tests
+      # TODO: Run mono tests on Windows?
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 /src/runtime/interopNative.cs
 
+# Configuration data
+configured.props
+
 # General binaries and Build results
 *.dll
 *.exe
@@ -17,6 +20,7 @@ __pycache__/
 build/
 dist/
 *.egg-info/
+.eggs/
 
 # Unit test / coverage reports
 htmlcov/

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>3.0.0</VersionPrefix>
+    <AssemblyCopyright>Copyright (c) 2006-2020 The Contributors of the Python.NET Project</AssemblyCopyright>
+    <AssemblyCompany>pythonnet</AssemblyCompany>
+    <AssemblyProduct>Python.NET</AssemblyProduct>
+    <LangVersion>7.3</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="NonCopyableAnalyzer" Version="0.6.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)configured.props" Condition="Exists('$(MSBuildThisFileDirectory)configured.props')" />
+</Project>
diff --git a/NuGet.config b/NuGet.config
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,19 +10,11 @@ platform:
 
 environment:
   global:
-    PYTHONUNBUFFERED: True
+    PYTHONUNBUFFERED: 'True'
     PYTHONWARNINGS: 'ignore:::wheel.pep425tags:'
     CODECOV_ENV: PYTHON_VERSION, PLATFORM
 
   matrix:
-    - PYTHON_VERSION: 3.9
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.8
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.7
-      BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.6
-      BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.9
     - PYTHON_VERSION: 3.8
     - PYTHON_VERSION: 3.7
@@ -47,35 +39,18 @@ init:
 install:
   - python -m pip install -U pip
   - pip install --upgrade -r requirements.txt --quiet
-  - pip install pycparser --quiet
-
-  # Install OpenCover. Can't put on `packages.config`, not Mono compatible
-  - .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages -Verbosity quiet
 
 build_script:
+  - python setup.py configure
   # 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%
+  - python setup.py bdist_wheel
 
 test_script:
   - pip install --no-index --find-links=.\dist\ pythonnet
-  - ps: .\ci\appveyor_run_tests.ps1
-
-on_finish:
-  # Temporary disable multiple upload due to codecov limit of 20 per commit.
-  # https://docs.codecov.io/blog/week-8-2017
-  - coverage xml -i
-  # - codecov --file coverage.xml --flags setup_windows
-  # - codecov --file py.coverage --flags python_tests
-  # - codecov --file cs.coverage --flags embedded_tests
-  - codecov --file py.coverage cs.coverage coverage.xml --flags setup_windows
+  #- ps: .\ci\appveyor_run_tests.ps1
+  - pytest
+  - dotnet test src/embed_tests/
 
 artifacts:
   - path: dist\*
-  - path: '.\src\runtime\bin\*.nupkg'
-
-notifications:
-  - provider: Slack
-    incoming_webhook:
-      secure: 2S/t6rGHdbwoxehnvn5KgfsHrBFEtwnPD7M5olGErmz70oWFVpqoWd/EvDwh7rKZGdOTjDmpwcukc2xi5VRaGHbBAqFYS3tAdgAMrcaTNWs=
diff --git a/clr.py b/clr.py
@@ -0,0 +1,41 @@
+"""
+Legacy Python.NET loader for backwards compatibility
+"""
+
+def _get_netfx_path():
+    import os, sys
+
+    if sys.maxsize > 2 ** 32:
+        arch = "amd64"
+    else:
+        arch = "x86"
+
+    return os.path.join(os.path.dirname(__file__), "pythonnet", "netfx", arch, "clr.pyd")
+
+
+def _get_mono_path():
+    import os, glob
+
+    paths = glob.glob(os.path.join(os.path.dirname(__file__), "pythonnet", "mono", "clr.*so"))
+    return paths[0]
+
+
+def _load_clr():
+    import sys
+    from importlib import util
+
+    if sys.platform == "win32":
+        path = _get_netfx_path()
+    else:
+        path = _get_mono_path()
+
+    del sys.modules[__name__]
+
+    spec = util.spec_from_file_location("clr", path)
+    clr = util.module_from_spec(spec)
+    spec.loader.exec_module(clr)
+
+    sys.modules[__name__] = clr
+
+
+_load_clr()
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4", "pycparser"]
+build-backend = "setuptools.build_meta"