Unity-Technologies · BadSingleton · May 5, 2020 · Feb 25, 2020 · May 5, 2020 · May 5, 2020
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,13 +6,13 @@ jobs:
   build-test:
     name: Build and Test
     runs-on: ${{ matrix.os }}-latest
-    timeout-minutes: 5
+    timeout-minutes: 7
 
     strategy:
       fail-fast: false
       matrix:
         os: [windows, ubuntu, macos]
-        python: [3.6, 3.7, 3.8, 3.9]
+        python: ["3.6", "3.7", "3.8", "3.9"]
         platform: [x64]
         shutdown_mode: [Normal, Soft]
 
@@ -44,19 +44,34 @@ jobs:
 
       - name: Build and Install
         run: |
-          python setup.py configure
           pip install -v .
 
-      - name: Python Tests
-        run: pytest
+      - name: Set Python DLL path (non Windows)
+        if: ${{ matrix.os != 'windows' }}
+        run: |
+          python -m pythonnet.find_libpython --export >> $GITHUB_ENV
+
+      - name: Set Python DLL path (Windows)
+        if: ${{ matrix.os == 'windows' }}
+        run: |
+          python -m pythonnet.find_libpython --export | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Embedding tests
         run: dotnet test --runtime any-${{ matrix.platform }} src/embed_tests/
-        if: ${{ matrix.os != 'macos' }} # Not working right now, doesn't find libpython
+
+      - name: Python Tests (Mono)
+        if: ${{ matrix.os != 'windows' }}
+        run: pytest --runtime mono
+
+      - name: Python Tests (.NET Core)
+        run: pytest --runtime netcore
+
+      - name: Python Tests (.NET Framework)
+        if: ${{ matrix.os == 'windows' }}
+        run: pytest --runtime netfx
 
       - name: Python tests run from .NET
         run: dotnet test --runtime any-${{ matrix.platform }} src/python_tests_runner/
-        if: ${{ matrix.os == 'windows' }} # Not working for others right now
 
       # TODO: Run perf tests
       # TODO: Run mono tests on Windows?
diff --git a/.github/workflows/nuget-preview.yml b/.github/workflows/nuget-preview.yml
@@ -0,0 +1,60 @@
+name: NuGet Preview Release
+
+on:
+  schedule:
+  - cron: "5 4 3 */1 *" # once a month, at 4:05 on 3rd
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release Preview
+    runs-on: ubuntu-latest
+    environment: NuGet
+    timeout-minutes: 10
+
+    env:
+      PYTHONNET_SHUTDOWN_MODE: Normal
+
+    steps:
+      - name: Get Date
+        run: |
+          echo "DATE_VER=$(date "+%Y-%m-%d")" >> $GITHUB_ENV
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+          architecture: x64
+
+      - name: Install dependencies
+        run: |
+          pip install --upgrade -r requirements.txt
+
+      - name: Build and Install
+        run: |
+          pip install -v .
+
+      - name: Python Tests
+        run: pytest
+        env:
+          PYTHONNET_PYDLL: libpython3.8.so
+
+      - name: Embedding tests
+        run: dotnet test --runtime any-ubuntu src/embed_tests/
+        env:
+          PYTHONNET_PYDLL: libpython3.8.so
+
+      - name: Pack
+        run: dotnet pack --configuration Release --version-suffix preview${{env.DATE_VER}} --output "Release-Preview"
+
+      - name: Publish NuGet
+        run: dotnet nuget push --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_MONTHLY }} Release-Preview/*.nupkg
+
+      # TODO: Run perf tests
+      # TODO: Run mono tests on Windows?
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
 /src/runtime/interopNative.cs
 
-# Configuration data
-configured.props
-
 # General binaries and Build results
 *.dll
 *.exe

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -55,6 +55,7 @@
 -   Meinrad Recheis ([@henon](https://github.com/henon))
 -   Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
 -   Patrick Stewart ([@patstew](https://github.com/patstew))
+-   Peter Kese ([@pkese](https://github.com/pkese))
 -   Raphael Nestler ([@rnestler](https://github.com/rnestler))
 -   Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))
 -   Sam Winstanley ([@swinstanley](https://github.com/swinstanley))
@@ -66,10 +67,10 @@
 -   Ville M. Vainio ([@vivainio](https://github.com/vivainio))
 -   Virgil Dupras ([@hsoft](https://github.com/hsoft))
 -   Wenguang Yang ([@yagweb](https://github.com/yagweb))
--   William Sardar ([@williamsardar])(https://github.com/williamsardar)
+-   William Sardar ([@williamsardar](https://github.com/williamsardar))
 -   Xavier Dupré ([@sdpython](https://github.com/sdpython))
 -   Zane Purvis ([@zanedp](https://github.com/zanedp))
--   ([@amos402]https://github.com/amos402)
+-   ([@amos402](https://github.com/amos402))
 -   ([@bltribble](https://github.com/bltribble))
 -   ([@civilx64](https://github.com/civilx64))
 -   ([@GSPP](https://github.com/GSPP))
@@ -82,3 +83,4 @@
 -   ([@testrunner123](https://github.com/testrunner123))
 -   ([@DanBarzilian](https://github.com/DanBarzilian))
 -   ([@alxnull](https://github.com/alxnull))
+-   ([@gpetrou](https://github.com/gpetrou))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 -   Ability to instantiate new .NET arrays using `Array[T](dim1, dim2, ...)` syntax
 -   Python operator method will call C# operator method for supported binary and unary operators ([#1324][p1324]).
+-   Add GetPythonThreadID and Interrupt methods in PythonEngine
+-   Ability to implement delegates with `ref` and `out` parameters in Python, by returning the modified parameter values in a tuple. ([#1355][i1355])
+-   `PyType` - a wrapper for Python type objects, that also permits creating new heap types from `TypeSpec`
+-    Improved exception handling:
+  -  exceptions can now be converted with codecs
+  -  `InnerException` and `__cause__` are propagated properly
 
 ### Changed
 -   Drop support for Python 2, 3.4, and 3.5
@@ -28,28 +34,52 @@ details about the cause of the failure
      to the regular method return value (unless they are passed with `ref` or `out` keyword).
 -   BREAKING: Drop support for the long-deprecated CLR.* prefix.
 -   `PyObject` now implements `IEnumerable<PyObject>` in addition to `IEnumerable`
+-   floating point values passed from Python are no longer silently truncated
+when .NET expects an integer [#1342][i1342]
+-   More specific error messages for method argument mismatch
+-   BREAKING: Methods with `ref` or `out` parameters and void return type return a tuple of only the `ref` and `out` parameters.
+-   BREAKING: to call Python from .NET `Runtime.PythonDLL` property must be set to Python DLL name
+or the DLL must be loaded in advance. This must be done before calling any other Python.NET functions.
+-   BREAKING: `PyObject.Length()` now raises a `PythonException` when object does not support a concept of length.
+-   BREAKING: disabled implicit conversion from C# enums to Python `int` and back.
+One must now either use enum members (e.g. `MyEnum.Option`), or use enum constructor
+(e.g. `MyEnum(42)` or `MyEnum(42, True)` when `MyEnum` does not have a member with value 42).
+-   Sign Runtime DLL with a strong name
+-   Implement loading through `clr_loader` instead of the included `ClrModule`, enables
+    support for .NET Core
+-   .NET and Python exceptions are preserved when crossing Python/.NET boundary
+-   BREAKING: custom encoders are no longer called for instances of `System.Type`
+-   `PythonException.Restore` no longer clears `PythonException` instance.
+-   Replaced the old `__import__` hook hack with a PEP302-style Meta Path Loader
 
 ### Fixed
 
--    Fix incorrect dereference of wrapper object in `tp_repr`, which may result in a program crash
--    Fix incorrect dereference in params array handling
--    Fixes issue with function resolution when calling overloaded function with keyword arguments from python ([#1097][i1097])
--    Fix `object[]` parameters taking precedence when should not in overload resolution
--    Fixed a bug where all .NET class instances were considered Iterable
--    Fix incorrect choice of method to invoke when using keyword arguments.
--    Fix non-delegate types incorrectly appearing as callable.
--    Indexers can now be used with interface objects
--    Fixed a bug where indexers could not be used if they were inherited
--    Made it possible to use `__len__` also on `ICollection<>` interface objects
--    Fixed issue when calling PythonException.Format where another exception would be raise for unnormalized exceptions
--    Made it possible to call `ToString`, `GetHashCode`, and `GetType` on inteface objects
--    Fixed objects returned by enumerating `PyObject` being disposed too soon
--    Incorrectly using a non-generic type with type parameters now produces a helpful Python error instead of throwing NullReferenceException
+-   Fix incorrect dereference of wrapper object in `tp_repr`, which may result in a program crash
+-   Fix incorrect dereference in params array handling
+-   Fixes issue with function resolution when calling overloaded function with keyword arguments from python ([#1097][i1097])
+-   Fix `object[]` parameters taking precedence when should not in overload resolution
+-   Fixed a bug where all .NET class instances were considered Iterable
+-   Fix incorrect choice of method to invoke when using keyword arguments.
+-   Fix non-delegate types incorrectly appearing as callable.
+-   Indexers can now be used with interface objects
+-   Fixed a bug where indexers could not be used if they were inherited
+-   Made it possible to use `__len__` also on `ICollection<>` interface objects
+-   Fixed issue when calling PythonException.Format where another exception would be raise for unnormalized exceptions
+-   Made it possible to call `ToString`, `GetHashCode`, and `GetType` on inteface objects
+-   Fixed objects returned by enumerating `PyObject` being disposed too soon
+-   Incorrectly using a non-generic type with type parameters now produces a helpful Python error instead of throwing NullReferenceException
 -   `import` may now raise errors with more detail than "No module named X"
+-   Exception stacktraces on `PythonException.StackTrace` are now properly formatted
+-   Providing an invalid type parameter to a generic type or method produces a helpful Python error
+-   Empty parameter names (as can be generated from F#) do not cause crashes
+-   Unicode strings with surrogates were truncated when converting from Python
 
 ### Removed
 
 -   implicit assembly loading (you have to explicitly `clr.AddReference` before doing import)
+-   messages in `PythonException` no longer start with exception type
+-   support for .NET Framework 4.0-4.6; Mono before 5.4. Python.NET now requires .NET Standard 2.0
+(see [the matrix](https://docs.microsoft.com/en-us/dotnet/standard/net-standard#net-implementation-support))
 
 ## [2.5.0][] - 2020-06-14
 
@@ -809,3 +839,4 @@ This version improves performance on benchmarks significantly compared to 2.3.
 [i755]: https://github.com/pythonnet/pythonnet/pull/755
 [p534]: https://github.com/pythonnet/pythonnet/pull/534
 [i449]: https://github.com/pythonnet/pythonnet/issues/449
+[i1342]: https://github.com/pythonnet/pythonnet/issues/1342
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,14 +4,18 @@
     <AssemblyCopyright>Copyright (c) 2006-2020 The Contributors of the Python.NET Project</AssemblyCopyright>
     <AssemblyCompany>pythonnet</AssemblyCompany>
     <AssemblyProduct>Python.NET</AssemblyProduct>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>9.0</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="NonCopyableAnalyzer" Version="0.6.0">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.9.0-3.final">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Lost.NonCopyableAnalyzer" Version="0.7.0-m04">
       <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/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2006-2020 the contributors of the Python.NET project
+Copyright (c) 2006-2021 the contributors of the Python.NET project
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

diff --git a/README.rst b/README.rst
@@ -5,7 +5,11 @@ pythonnet - Python.NET
 
 |gh shield| |appveyor shield|
 
-|license shield| |pypi package version| |conda-forge version| |python supported shield|
+|license shield|
+
+|pypi package version| |conda-forge version| |python supported shield|
+
+|nuget preview shield| |nuget release shield|
 
 Python.NET is a package that gives Python programmers nearly
 seamless integration with the .NET Common Language Runtime (CLR) and
@@ -41,6 +45,10 @@ module:
 Embedding Python in .NET
 ------------------------
 
+-  You must set `Runtime.PythonDLL` property or `PYTHONNET_PYDLL` environment variable
+   starting with version 3.0, otherwise you will receive `TypeInitializationException`.
+   Typical values are `python38.dll` (Windows), `libpython3.8.dylib` (Mac),
+   `libpython3.8.so` (most other *nix).
 -  All calls to python should be inside a
    ``using (Py.GIL()) {/* Your code here */}`` block.
 -  Import python modules using ``dynamic mod = Py.Import("mod")``, then
@@ -130,5 +138,9 @@ This project is supported by the `.NET Foundation <https://dotnetfoundation.org>
    :target: http://stackoverflow.com/questions/tagged/python.net
 .. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pythonnet.svg
    :target: https://anaconda.org/conda-forge/pythonnet
+.. |nuget preview shield| image:: https://img.shields.io/nuget/vpre/pythonnet
+   :target: https://www.nuget.org/packages/pythonnet/
+.. |nuget release shield| image:: https://img.shields.io/nuget/v/pythonnet
+   :target: https://www.nuget.org/packages/pythonnet/
 .. |gh shield| image:: https://github.com/pythonnet/pythonnet/workflows/GitHub%20Actions/badge.svg
    :target: https://github.com/pythonnet/pythonnet/actions?query=branch%3Amaster
diff --git a/appveyor.yml b/appveyor.yml
@@ -32,6 +32,7 @@ init:
   - set PY_VER=%PYTHON_VERSION:.=%
   - set PYTHON=C:\PYTHON%PY_VER%
   - if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64)
+  - set PYTHONNET_PYDLL=%PYTHON%\python%PY_VER%.dll
 
   # Put desired Python version first in PATH
   - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
@@ -41,7 +42,6 @@ install:
   - pip install --upgrade -r requirements.txt --quiet
 
 build_script:
-  - python setup.py configure
   # Create clean `sdist`. Only used for releases
   - python setup.py --quiet sdist
   - python setup.py bdist_wheel

diff --git a/clr.py b/clr.py
@@ -2,40 +2,5 @@
 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()
+from pythonnet import load
+load()
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,9 @@
 [build-system]
 requires = ["setuptools>=42", "wheel", "pycparser"]
 build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+xfail_strict = true
+testpaths = [
+    "tests"
+]