Update pythonnet (#13)

Merge changes from pythonnet 3.03
 - support python 3.12

Author: koubaa

.github/workflows/ARM.yml

@@ -29,25 +29,25 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install -r requirements.txt
-          pip install pytest numpy # for tests
+          pip3.8 install -r requirements.txt
+          pip3.8 install pytest numpy # for tests
 
       - name: Build and Install
         run: |
-          pip install -v .
+          pip3.8 install -v .
 
       - name: Set Python DLL path (non Windows)
         run: |
-          echo PYTHONNET_PYDLL=$(python -m find_libpython) >> $GITHUB_ENV
+          echo PYTHONNET_PYDLL=$(python3.8 -m find_libpython) >> $GITHUB_ENV
 
       - name: Embedding tests
         run: dotnet test --logger "console;verbosity=detailed" src/embed_tests/
 
       - name: Python Tests (Mono)
-        run: python -m pytest --runtime mono
+        run: python3.8 -m pytest --runtime mono
 
       - name: Python Tests (.NET Core)
-        run: python -m pytest --runtime coreclr
+        run: python3.8 -m pytest --runtime coreclr
 
       - name: Python tests run from .NET
         run: dotnet test src/python_tests_runner/

.github/workflows/ci_cd.yml

@@ -48,8 +48,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows, ubuntu]
-        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        os: [windows, ubuntu, macos]
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         platform: [x64, x86]
         exclude:
           - os: ubuntu

CHANGELOG.md

@@ -7,13 +7,16 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 ## [Unreleased][]
 
+
+## [3.0.3](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.3) - 2023-10-11
+
 ### Added
 
-- use enum name in repr
+-   Support for Python 3.12
 
 ### Changed
 
-### Fixed
+-   Use enum name in `repr`
 
 ## [3.0.2](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.2) - 2023-08-29
 
@@ -833,7 +836,7 @@ This version improves performance on benchmarks significantly compared to 2.3.
 
 [semantic versioning]: http://semver.org/
 
-[unreleased]: ../../compare/v2.3.0...HEAD
+[unreleased]: ../../compare/v3.0.1...HEAD
 
 [2.3.0]: ../../compare/v2.2.2...v2.3.0
 

README.rst

@@ -3,5 +3,5 @@ Ansys fork of `pythonnet <https://github.com/pythonnet/pythonnet>`_.
 We will try to keep this up-to-date with pythonnet and upstream changes that might benefit the pythonnet community
 
 Changes relative to pythonnet:
-- Revert of `#1240 <https://github.com/pythonnet/pythonnet/pull/1240>`_.
-- Enum REPR `#2239 <https://github.com/pythonnet/pythonnet/pull/2239>` is included in this release of version 3.0.2, but is unreleased in pythonnet
+
+- Revert of `#1240 <https://github.com/pythonnet/pythonnet/pull/1240>`_.

doc/source/dotnet.rst

@@ -110,7 +110,7 @@ Code executed from the scope will have access to the variable:
    using (Py.GIL())
    {
        // create a Python scope
-       using (PyScope scope = Py.CreateScope())
+       using (PyModule scope = Py.CreateScope())
        {
            // convert the Person object to a PyObject
            PyObject pyPerson = person.ToPython();

pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "clr_loader>=0.2.6,<0.3.0"
 ]
 
-requires-python = ">=3.7, <3.12"
+requires-python = ">=3.7, <3.13"
 
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -26,6 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",

src/embed_tests/Codecs.cs

@@ -371,11 +371,23 @@ public void FloatDerivedDecoded()
         [Test]
         public void ExceptionDecodedNoInstance()
         {
-            PyObjectConversions.RegisterDecoder(new InstancelessExceptionDecoder());
-            using var scope = Py.CreateScope();
-            var error = Assert.Throws<ValueErrorWrapper>(() => PythonEngine.Exec(
-                $"[].__iter__().__next__()"));
-            Assert.AreEqual(TestExceptionMessage, error.Message);
+            if (Runtime.PyVersion < new Version(3, 12))
+            {
+                PyObjectConversions.RegisterDecoder(new InstancelessExceptionDecoder());
+                using var scope = Py.CreateScope();
+
+                var error = Assert.Throws<ValueErrorWrapper>(() =>
+                    PythonEngine.Exec($"[].__iter__().__next__()")
+                );
+                Assert.AreEqual(TestExceptionMessage, error.Message);
+            }
+            else
+            {
+                Assert.Ignore(
+                    "This test does not work for Python 3.12, see " +
+                    "https://github.com/python/cpython/issues/101578"
+                );
+            }
         }
 
         public static void AcceptsDateTime(DateTime v) {}

src/embed_tests/Modules.cs

@@ -51,7 +51,7 @@ public void TestEval()
                 ps.Set("a", 1);
                 var result = ps.Eval<int>("a + 2");
                 Assert.AreEqual(3, result);
-            }                
+            }
         }
 
         /// <summary>
@@ -169,6 +169,62 @@ public void TestScopeClass()
             }
         }
 
+        /// <summary>
+        /// Create a class in the scope, the class can read variables in the scope.
+        /// Its methods can write the variables with the help of 'global' keyword.
+        /// </summary>
+        [Test]
+        public void TestCreateVirtualPackageStructure()
+        {
+            using (Py.GIL())
+            {
+                using var _p1 = PyModule.FromString("test", "");
+                // Sub-module
+                using var _p2 = PyModule.FromString("test.scope",
+                    "class Class1():\n" +
+                    "    def __init__(self, value):\n" +
+                    "        self.value = value\n" +
+                    "    def call(self, arg):\n" +
+                    "        return self.value + bb + arg\n" + // use scope variables
+                    "    def update(self, arg):\n" +
+                    "        global bb\n" +
+                    "        bb = self.value + arg\n",  // update scope variable
+                    "test"
+                );
+
+                dynamic ps2 = Py.Import("test.scope");
+                ps2.bb = 100;
+
+                dynamic obj1 = ps2.Class1(20);
+                var result = obj1.call(10).As<int>();
+                Assert.AreEqual(130, result);
+
+                obj1.update(10);
+                result = ps2.Get<int>("bb");
+                Assert.AreEqual(30, result);
+            }
+        }
+
+        /// <summary>
+        /// Test setting the file attribute via a FromString parameter
+        /// </summary>
+        [Test]
+        public void TestCreateModuleWithFilename()
+        {
+            using var _gil = Py.GIL();
+
+            using var mod = PyModule.FromString("mod", "");
+            using var modWithoutName = PyModule.FromString("mod_without_name", "", " ");
+            using var modNullName = PyModule.FromString("mod_null_name", "", null);
+
+            using var modWithName = PyModule.FromString("mod_with_name", "", "some_filename");
+
+            Assert.AreEqual("none", mod.Get<string>("__file__"));
+            Assert.AreEqual("none", modWithoutName.Get<string>("__file__"));
+            Assert.AreEqual("none", modNullName.Get<string>("__file__"));
+            Assert.AreEqual("some_filename", modWithName.Get<string>("__file__"));
+        }
+
         /// <summary>
         /// Import a python module into the session.
         /// Equivalent to the Python "import" statement.
@@ -194,7 +250,7 @@ public void TestImportModule()
         }
 
         /// <summary>
-        /// Create a scope and import variables from a scope, 
+        /// Create a scope and import variables from a scope,
         /// exec Python statements in the scope then discard it.
         /// </summary>
         [Test]
@@ -218,7 +274,7 @@ public void TestImportScope()
         }
 
         /// <summary>
-        /// Create a scope and import variables from a scope, 
+        /// Create a scope and import variables from a scope,
         /// exec Python statements in the scope then discard it.
         /// </summary>
         [Test]
@@ -241,7 +297,7 @@ public void TestImportAllFromScope()
         }
 
         /// <summary>
-        /// Create a scope and import variables from a scope, 
+        /// Create a scope and import variables from a scope,
         /// call the function imported.
         /// </summary>
         [Test]
@@ -286,7 +342,7 @@ public void TestImportScopeFunction()
         public void TestVariables()
         {
             using (Py.GIL())
-            { 
+            {
                 (ps.Variables() as dynamic)["ee"] = new PyInt(200);
                 var a0 = ps.Get<int>("ee");
                 Assert.AreEqual(200, a0);
@@ -326,8 +382,8 @@ public void TestThread()
                     _ps.res = 0;
                     _ps.bb = 100;
                     _ps.th_cnt = 0;
-                    //add function to the scope 
-                    //can be call many times, more efficient than ast 
+                    //add function to the scope
+                    //can be call many times, more efficient than ast
                     ps.Exec(
                         "import threading\n"+
                         "lock = threading.Lock()\n"+

src/runtime/Converter.cs

@@ -680,10 +680,8 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec
                         {
                             if (Runtime.PyUnicode_GetLength(value) == 1)
                             {
-                                IntPtr unicodePtr = Runtime.PyUnicode_AsUnicode(value);
-                                Char[] buff = new Char[1];
-                                Marshal.Copy(unicodePtr, buff, 0, 1);
-                                result = buff[0];
+                                int chr = Runtime.PyUnicode_ReadChar(value, 0);
+                                result = (Char)chr;
                                 return true;
                             }
                             goto type_error;