Branch 2

.travis.yml

@@ -2,6 +2,8 @@ dist: xenial
 sudo: false
 language: python
 python:
+    - 3.10
+    - 3.9
     - 3.8
     - 3.7
     - 3.6

AUTHORS.md

@@ -73,4 +73,5 @@
 -   ([@rmadsen-ks](https://github.com/rmadsen-ks))
 -   ([@stonebig](https://github.com/stonebig))
 -   ([@testrunner123](https://github.com/testrunner123))
+-   ([@DanBarzilian](https://github.com/DanBarzilian))
 

CHANGELOG.md

@@ -5,14 +5,22 @@ project adheres to [Semantic Versioning][].
 
 This document follows the conventions laid out in [Keep a CHANGELOG][].
 
-## [Unreleased][]
 
-### Added
+## Unreleased
 
-### Changed
+### Fixed
+-   Fix `object[]` parameters taking precedence when should not in overload resolution
+-   Empty parameter names (as can be generated from F#) do not cause crashes
+
+## [2.5.1][] - 2020-06-18
+
+Bugfix release.
 
 ### 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.

appveyor.yml

@@ -3,7 +3,7 @@ build: off
 
 image:
   - Visual Studio 2017
-  
+
 platform:
   - x86
   - x64
@@ -15,6 +15,10 @@ environment:
     CODECOV_ENV: PYTHON_VERSION, PLATFORM
 
   matrix:
+    - PYTHON_VERSION: 3.10
+      BUILD_OPTS: --xplat
+    - PYTHON_VERSION: 3.9
+      BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.8
       BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.7
@@ -23,14 +27,15 @@ environment:
       BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.5
       BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 2.7 
+    - PYTHON_VERSION: 2.7
       BUILD_OPTS: --xplat
+    - PYTHON_VERSION: 3.10
+    - PYTHON_VERSION: 3.9
     - PYTHON_VERSION: 3.8
     - PYTHON_VERSION: 3.7
     - PYTHON_VERSION: 3.6
     - PYTHON_VERSION: 3.5
     - PYTHON_VERSION: 2.7
-
 init:
   # Update Environment Variables based on matrix/platform
   - set PY_VER=%PYTHON_VERSION:.=%

requirements.txt

@@ -1,12 +1,11 @@
 # Requirements for both Travis and AppVeyor
-pytest==3.2.5
+pytest
 coverage
 psutil
 
 # Coverage upload
 codecov
 
 # Platform specific requirements
-# pip; sys_platform == 'win32'
-wheel; sys_platform == 'win32'
-pycparser; sys_platform != 'win32'
+wheel
+pycparser

setup.py

@@ -629,7 +629,7 @@ def run(self):
 
 setup(
     name="pythonnet",
-    version="2.5.0",
+    version="2.5.2",
     description=".Net and Mono integration for Python",
     url="https://pythonnet.github.io/",
     license="MIT",
@@ -652,6 +652,7 @@ def run(self):
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS :: MacOS X",

src/SharedAssemblyInfo.cs

@@ -25,4 +25,4 @@
 // Version Information. Keeping it simple. May need to revisit for Nuget
 // See: https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/
 // AssemblyVersion can only be numeric
-[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyVersion("2.5.2")]

src/clrmodule/ClrModule.cs

@@ -53,7 +53,7 @@ public static void initclr()
         {
 #if USE_PYTHON_RUNTIME_VERSION
             // Has no effect until SNK works. Keep updated anyways.
-            Version = new Version("2.5.0"),
+            Version = new Version("2.5.2"),
 #endif
             CultureInfo = CultureInfo.InvariantCulture
         };

src/clrmodule/clrmodule.15.csproj

@@ -9,7 +9,7 @@
     <RootNamespace>clrmodule</RootNamespace>
     <AssemblyName>clrmodule</AssemblyName>
     <PackageId>clrmodule</PackageId>
-    <VersionPrefix>2.5.0</VersionPrefix>
+    <VersionPrefix>2.5.2</VersionPrefix>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

src/console/Console.15.csproj

@@ -8,7 +8,7 @@
     <AssemblyName>nPython</AssemblyName>
     <RootNamespace>Python.Runtime</RootNamespace>
     <PackageId>nPython</PackageId>
-    <VersionPrefix>2.5.0</VersionPrefix>
+    <VersionPrefix>2.5.2</VersionPrefix>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

src/embed_tests/Python.EmbeddingTest.15.csproj

@@ -10,7 +10,7 @@
     <AssemblyName>Python.EmbeddingTest</AssemblyName>
     <RootNamespace>Python.EmbeddingTest</RootNamespace>
     <PackageId>Python.EmbeddingTest</PackageId>
-    <VersionPrefix>2.5.0</VersionPrefix>
+    <VersionPrefix>2.5.2</VersionPrefix>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

src/runtime/Python.Runtime.15.csproj

@@ -8,7 +8,7 @@
     <RootNamespace>Python.Runtime</RootNamespace>
     <AssemblyName>Python.Runtime</AssemblyName>
     <PackageId>pythonnet</PackageId>
-    <VersionPrefix>2.5.0</VersionPrefix>
+    <VersionPrefix>2.5.2</VersionPrefix>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Title>Python.NET</Title>

src/runtime/Python.Runtime.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -165,6 +165,7 @@
     <Compile Include="interop36.cs" />
     <Compile Include="interop37.cs" />
     <Compile Include="interop38.cs" />
+    <Compile Include="interop39.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\pythonnet.snk" />

src/runtime/classbase.cs

@@ -266,6 +266,7 @@ public static IntPtr tp_repr(IntPtr ob)
 
                 //otherwise use the standard object.__repr__(inst)
                 IntPtr args = Runtime.PyTuple_New(1);
+                Runtime.XIncref(ob);
                 Runtime.PyTuple_SetItem(args, 0, ob);
                 IntPtr reprFunc = Runtime.PyObject_GetAttrString(Runtime.PyBaseObjectType, "__repr__");
                 var output =  Runtime.PyObject_Call(reprFunc, args, IntPtr.Zero);

src/runtime/interop310.cs

@@ -0,0 +1,152 @@
+
+// Auto-generated by geninterop.py.
+// DO NOT MODIFY BY HAND.
+
+
+#if PYTHON310
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Runtime.InteropServices;
+using System.Reflection;
+using System.Text;
+
+namespace Python.Runtime
+{
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    internal class TypeOffset
+    {
+        static TypeOffset()
+        {
+            Type type = typeof(TypeOffset);
+            FieldInfo[] fi = type.GetFields();
+            int size = IntPtr.Size;
+            for (int i = 0; i < fi.Length; i++)
+            {
+                fi[i].SetValue(null, i * size);
+            }
+        }
+
+        public static int magic()
+        {
+            return ob_size;
+        }
+
+        // Auto-generated from PyHeapTypeObject in Python.h
+        public static int ob_refcnt = 0;
+        public static int ob_type = 0;
+        public static int ob_size = 0;
+        public static int tp_name = 0;
+        public static int tp_basicsize = 0;
+        public static int tp_itemsize = 0;
+        public static int tp_dealloc = 0;
+        public static int tp_vectorcall_offset = 0;
+        public static int tp_getattr = 0;
+        public static int tp_setattr = 0;
+        public static int tp_as_async = 0;
+        public static int tp_repr = 0;
+        public static int tp_as_number = 0;
+        public static int tp_as_sequence = 0;
+        public static int tp_as_mapping = 0;
+        public static int tp_hash = 0;
+        public static int tp_call = 0;
+        public static int tp_str = 0;
+        public static int tp_getattro = 0;
+        public static int tp_setattro = 0;
+        public static int tp_as_buffer = 0;
+        public static int tp_flags = 0;
+        public static int tp_doc = 0;
+        public static int tp_traverse = 0;
+        public static int tp_clear = 0;
+        public static int tp_richcompare = 0;
+        public static int tp_weaklistoffset = 0;
+        public static int tp_iter = 0;
+        public static int tp_iternext = 0;
+        public static int tp_methods = 0;
+        public static int tp_members = 0;
+        public static int tp_getset = 0;
+        public static int tp_base = 0;
+        public static int tp_dict = 0;
+        public static int tp_descr_get = 0;
+        public static int tp_descr_set = 0;
+        public static int tp_dictoffset = 0;
+        public static int tp_init = 0;
+        public static int tp_alloc = 0;
+        public static int tp_new = 0;
+        public static int tp_free = 0;
+        public static int tp_is_gc = 0;
+        public static int tp_bases = 0;
+        public static int tp_mro = 0;
+        public static int tp_cache = 0;
+        public static int tp_subclasses = 0;
+        public static int tp_weaklist = 0;
+        public static int tp_del = 0;
+        public static int tp_version_tag = 0;
+        public static int tp_finalize = 0;
+        public static int tp_vectorcall = 0;
+        public static int tp_print = 0;
+        public static int am_await = 0;
+        public static int am_aiter = 0;
+        public static int am_anext = 0;
+        public static int nb_add = 0;
+        public static int nb_subtract = 0;
+        public static int nb_multiply = 0;
+        public static int nb_remainder = 0;
+        public static int nb_divmod = 0;
+        public static int nb_power = 0;
+        public static int nb_negative = 0;
+        public static int nb_positive = 0;
+        public static int nb_absolute = 0;
+        public static int nb_bool = 0;
+        public static int nb_invert = 0;
+        public static int nb_lshift = 0;
+        public static int nb_rshift = 0;
+        public static int nb_and = 0;
+        public static int nb_xor = 0;
+        public static int nb_or = 0;
+        public static int nb_int = 0;
+        public static int nb_reserved = 0;
+        public static int nb_float = 0;
+        public static int nb_inplace_add = 0;
+        public static int nb_inplace_subtract = 0;
+        public static int nb_inplace_multiply = 0;
+        public static int nb_inplace_remainder = 0;
+        public static int nb_inplace_power = 0;
+        public static int nb_inplace_lshift = 0;
+        public static int nb_inplace_rshift = 0;
+        public static int nb_inplace_and = 0;
+        public static int nb_inplace_xor = 0;
+        public static int nb_inplace_or = 0;
+        public static int nb_floor_divide = 0;
+        public static int nb_true_divide = 0;
+        public static int nb_inplace_floor_divide = 0;
+        public static int nb_inplace_true_divide = 0;
+        public static int nb_index = 0;
+        public static int nb_matrix_multiply = 0;
+        public static int nb_inplace_matrix_multiply = 0;
+        public static int mp_length = 0;
+        public static int mp_subscript = 0;
+        public static int mp_ass_subscript = 0;
+        public static int sq_length = 0;
+        public static int sq_concat = 0;
+        public static int sq_repeat = 0;
+        public static int sq_item = 0;
+        public static int was_sq_slice = 0;
+        public static int sq_ass_item = 0;
+        public static int was_sq_ass_slice = 0;
+        public static int sq_contains = 0;
+        public static int sq_inplace_concat = 0;
+        public static int sq_inplace_repeat = 0;
+        public static int bf_getbuffer = 0;
+        public static int bf_releasebuffer = 0;
+        public static int name = 0;
+        public static int ht_slots = 0;
+        public static int qualname = 0;
+        public static int ht_cached_keys = 0;
+
+        /* here are optional user slots, followed by the members. */
+        public static int members = 0;
+    }
+}
+
+#endif