Catch Up Upstream

.editorconfig

@@ -19,6 +19,17 @@ indent_size = 2
 [*.{csproj,pyproj,config}]
 indent_size = 2
 
+# .NET formatting settings
+[*.{cs,vb}]
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = true
+
+[*.cs]
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+
 # Solution
 [*.sln]
 indent_style = tab

.gitignore

@@ -57,3 +57,10 @@ UpgradeLog*.htm
 
 # Coverity
 cov-int/
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json

.travis.yml

@@ -1,87 +1,17 @@
-dist: trusty
+dist: xenial
 sudo: false
 language: python
-
-matrix:
-  include:
-# --------------------- XPLAT builds ------------------------
-    - python: 2.7
-      env: &xplat-env
-        - BUILD_OPTS=--xplat
-        - NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
-      addons: &xplat-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: *xplat-env
-      addons: *xplat-addons
-
-    - python: 3.5
-      env: *xplat-env
-      addons: *xplat-addons
-
-    - python: 3.6
-      env: *xplat-env
-      addons: *xplat-addons
-
-    - python: 3.7
-      env: *xplat-env
-      dist: xenial
-      sudo: true
-      addons: &xplat-addons-xenial
-        apt:
-          sources:
-          - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main
-            key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb https://download.mono-project.com/repo/ubuntu stable-xenial 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
-
-# --------------------- Classic builds ------------------------
-    - python: 2.7
-      env: &classic-env
-        - BUILD_OPTS=
-        - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
-
-    - python: 3.4
-      env: *classic-env
-
-    - python: 3.5
-      env: *classic-env
-
-    - python: 3.6
-      env: *classic-env
-
-    - python: 3.7
-      env: *classic-env
-      dist: xenial
-      sudo: true
-      addons:
-        apt:
-          sources:
-            - sourceline: deb http://download.mono-project.com/repo/ubuntu xenial main
-              key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
-          packages:
-            - mono-devel
-            - ca-certificates-mono
+python:
+    - 3.8
+    - 3.7
+    - 3.6
+    - 3.5
 
 env:
+  matrix:
+    - BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/
+    - BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""
+
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
@@ -91,11 +21,16 @@ env:
 addons:
   apt:
     sources:
-      - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
+      - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main
+        key_url: https://packages.microsoft.com/keys/microsoft.asc
+      - sourceline: deb http://download.mono-project.com/repo/ubuntu stable-xenial/snapshots/5.20 main
         key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
     packages:
       - mono-devel
       - ca-certificates-mono
+      - dotnet-hostfxr-2.2
+      - dotnet-runtime-2.2
+      - dotnet-sdk-2.2
 
 before_install:
   # Set-up dll path for embedded tests
@@ -109,13 +44,11 @@ install:
 
 script:
   - python -m pytest
-  - mono $NUNIT_PATH src/embed_tests/bin/Python.EmbeddingTest.dll
-  - if [[ $BUILD_OPTS == --xplat ]]; then dotnet src/embed_tests/bin/netcoreapp2.0_publish/Python.EmbeddingTest.dll; fi
+  - $RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll --labels=All
+  # does not work on Linux, because NuGet package for 2.3 is Windows only
+  # - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' && $PERF_TESTS_PATH != '' ]]; then mono $NUNIT_PATH src/perf_tests/bin/$PERF_TESTS_PATH/Python.PerformanceTests.dll; fi"
 
 after_script:
-  # Uncomment if need to geninterop, ie. py37 final
-  # - python tools/geninterop/geninterop.py
-
   # Waiting on mono-coverage, SharpCover or xr.Baboon
   - coverage xml -i
   - codecov --file coverage.xml --flags setup_linux

AUTHORS.md

@@ -2,8 +2,11 @@
 
 ## Development Lead
 
--   Barton Cline ([@BartonCline](https://github.com/BartonCline))
 -   Benedikt Reinartz ([@filmor](https://github.com/filmor))
+-   Victor Milovanov ([@lostmsu](https://github.com/lostmsu))
+
+## Former Development Leads
+-   Barton Cline ([@BartonCline](https://github.com/BartonCline))
 -   Brian Lloyd ([@brianlloyd](https://github.com/brianlloyd))
 -   David Anthoff ([@davidanthoff](https://github.com/davidanthoff))
 -   Denis Akhiyarov ([@denfromufa](https://github.com/denfromufa))
@@ -12,30 +15,41 @@
 
 ## Contributors
 
+-   Alex Earl ([@slide](https://github.com/slide))
+-   Alex Helms ([@alexhelms](https://github.com/alexhelms))
 -   Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))
+-   Andrey Sant'Anna ([@andreydani](https://github.com/andreydani))
 -   Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
 -   Benoît Hudson ([@benoithudson](https://github.com/benoithudson))
 -   Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
 -   Callum Noble ([@callumnoble](https://github.com/callumnoble))
 -   Christian Heimes ([@tiran](https://github.com/tiran))
 -   Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
+-   Christopher Bremner ([@chrisjbremner](https://github.com/chrisjbremner))
 -   Christopher Pow ([@christopherpow](https://github.com/christopherpow))
 -   Daniel Fernandez ([@fdanny](https://github.com/fdanny))
 -   Daniel Santana ([@dgsantana](https://github.com/dgsantana))
 -   Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))
 -   David Lassonde ([@lassond](https://github.com/lassond))
 -   David Lechner ([@dlech](https://github.com/dlech))
 -   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
+-   Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
--   Ivan Cronyn ([@cronan](https://github.com/cronan))
+-   Inna Wiesel ([@inna-w](https://github.com/inna-w))
+-   Ivan Cronyn ([@cronan](https://github.com/cronan))
 -   Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
--   Jeff Reback ([@jreback](https://github.com/jreback))
+-   Jeff Reback ([@jreback](https://github.com/jreback))
+-   Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
 -   Joe Frayne ([@jfrayne](https://github.com/jfrayne))
+-   Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
+-   Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
 -   John Burnett ([@johnburnett](https://github.com/johnburnett))
 -   John Wilkes ([@jbw3](https://github.com/jbw3))
 -   Luke Stratman ([@lstratman](https://github.com/lstratman))
 -   Konstantin Posudevskiy ([@konstantin-posudevskiy](https://github.com/konstantin-posudevskiy))
 -   Matthias Dittrich ([@matthid](https://github.com/matthid))
+-   Meinrad Recheis ([@henon](https://github.com/henon))
+-   Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
 -   Patrick Stewart ([@patstew](https://github.com/patstew))
 -   Raphael Nestler ([@rnestler](https://github.com/rnestler))
 -   Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))
@@ -54,8 +68,10 @@
 -   ([@civilx64](https://github.com/civilx64))
 -   ([@GSPP](https://github.com/GSPP))
 -   ([@omnicognate](https://github.com/omnicognate))
+-   ([@OneBlue](https://github.com/OneBlue))
 -   ([@rico-chet](https://github.com/rico-chet))
 -   ([@rmadsen-ks](https://github.com/rmadsen-ks))
 -   ([@stonebig](https://github.com/stonebig))
 -   ([@testrunner123](https://github.com/testrunner123))
+-   ([@DanBarzilian](https://github.com/DanBarzilian))
 

CHANGELOG.md

@@ -1,11 +1,75 @@
 # Changelog
 
-All notable changes to Python for .NET will be documented in this file.
-This project adheres to [Semantic Versioning][].
+All notable changes to Python.NET will be documented in this file. This
+project adheres to [Semantic Versioning][].
 
 This document follows the conventions laid out in [Keep a CHANGELOG][].
 
-## [unreleased][]
+## [Unreleased][]
+
+### Added
+
+### Changed
+-   Drop support for Python 2
+
+### Fixed
+
+-    Fix incorrect dereference of wrapper object in `tp_repr`, which may result in a program crash
+-    Fix incorrect dereference in params array handling
+
+## [2.5.0][] - 2020-06-14
+
+This version improves performance on benchmarks significantly compared to 2.3.
+
+### Added
+
+-   Automatic NuGet package generation in appveyor and local builds
+-   Function that sets `Py_NoSiteFlag` to 1.
+-   Support for Jetson Nano.
+-   Support for `__len__` for .NET classes that implement ICollection
+-   `PyExport` attribute to hide .NET types from Python
+-   `PythonException.Format` method to format exceptions the same as
+    `traceback.format_exception`
+-   `Runtime.None` to be able to pass `None` as parameter into Python from .NET
+-   `PyObject.IsNone()` to check if a Python object is None in .NET.
+-   Support for Python 3.8
+-   Codecs as the designated way to handle automatic conversions between
+    .NET and Python types
+
+### Changed
+
+-   Added argument types information to "No method matches given arguments" message
+-   Moved wheel import in setup.py inside of a try/except to prevent pip collection failures
+-   Removes `PyLong_GetMax` and `PyClass_New` when targetting Python3
+-   Improved performance of calls from Python to C#
+-   Added support for converting python iterators to C# arrays
+-   Changed usage of the obsolete function
+    `GetDelegateForFunctionPointer(IntPtr, Type)` to
+    `GetDelegateForFunctionPointer<TDelegate>(IntPtr)`
+-   When calling C# from Python, enable passing argument of any type to a
+    parameter of C# type `object` by wrapping it into `PyObject` instance.
+    ([#881][i881])
+-   Added support for kwarg parameters when calling .NET methods from Python
+-   Changed method for finding MSBuild using vswhere
+-   Reworked `Finalizer`. Now objects drop into its queue upon finalization,
+    which is periodically drained when new objects are created.
+-   Marked `Runtime.OperatingSystemName` and `Runtime.MachineName` as
+    `Obsolete`, should never have been `public` in the first place. They also
+    don't necessarily return a result that matches the `platform` module's.
+-   Unconditionally depend on `pycparser` for the interop module generation
+
+### Fixed
+
+-   Fixed runtime that fails loading when using pythonnet in an environment
+    together with Nuitka
+-   Fixes bug where delegates get casts (dotnetcore)
+-   Determine size of interpreter longs at runtime
+-   Handling exceptions ocurred in ModuleObject's getattribute
+-   Fill `__classcell__` correctly for Python subclasses of .NET types
+-   Fixed issue with params methods that are not passed an array.
+-   Use UTF8 to encode strings passed to `PyRun_String` on Python 3
+
+## [2.4.0][] - 2019-05-15
 
 ### Added
 
@@ -21,13 +85,19 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Catches exceptions thrown in C# iterators (yield returns) and rethrows them in python ([#475][i475])([#693][p693])
 -   Implemented GetDynamicMemberNames() for PyObject to allow dynamic object members to be visible in the debugger ([#443][i443])([#690][p690])
 -   Incorporated reference-style links to issues and pull requests in the CHANGELOG ([#608][i608])
+-   Added PyObject finalizer support, Python objects referred by C# can be auto collect now ([#692][p692]).
 -   Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
 -   Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
+-   Added support for C# types to provide `__repr__` ([#680][p680])
 
 ### Changed
 
+-   PythonException included C# call stack
 -   Reattach python exception traceback information (#545)
 -   PythonEngine.Intialize will now call `Py_InitializeEx` with a default value of 0, so signals will not be configured by default on embedding. This is different from the previous behaviour, where `Py_Initialize` was called instead, which sets initSigs to 1. ([#449][i449])
+-   Refactored MethodBinder.Bind in preparation to make it extensible (#829)
+-   Look for installed Windows 10 sdk's during installation instead of relying on specific versions.
+-   improved performance of calls from Python to C#
 
 ### Fixed
 
@@ -43,7 +113,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed conversion of 'float' and 'double' values ([#486][i486])
 -   Fixed 'clrmethod' for python 2 ([#492][i492])
 -   Fixed double calling of constructor when deriving from .NET class ([#495][i495])
--   Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607]) 
+-   Fixed `clr.GetClrType` when iterating over `System` members ([#607][p607])
 -   Fixed `LockRecursionException` when loading assemblies ([#627][i627])
 -   Fixed errors breaking .NET Remoting on method invoke ([#276][i276])
 -   Fixed PyObject.GetHashCode ([#676][i676])

CONTRIBUTING.md

@@ -1,11 +1,15 @@
 # How to contribute
 
-PythonNet is developed and maintained by unpaid community members so well
+Python.NET is developed and maintained by unpaid community members so well
 written, documented and tested pull requests are encouraged.
 
 By submitting a pull request for this project, you agree to license your
 contribution under the MIT license to this project.
 
+This project has adopted the code of conduct defined by the Contributor
+Covenant to clarify expected behavior in our community. For more information
+see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
+
 ## Getting Started
 
 -   Make sure you have a [GitHub account](https://github.com/signup/free)
@@ -41,3 +45,4 @@ contribution under the MIT license to this project.
 
 -   [General GitHub documentation](https://help.github.com/)
 -   [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
+-   [.NET Foundation Code of Conduct](https://dotnetfoundation.org/about/code-of-conduct)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2006-2017 the contributors of the "Python for .NET" project
+Copyright (c) 2006-2020 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"),