rmadsen-ks · rmadsen-ks · Sep 18, 2022 · Oct 24, 2022 · Oct 24, 2022 · Oct 28, 2022
diff --git a/.github/workflows/ARM.yml b/.github/workflows/ARM.yml
@@ -27,25 +27,25 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade -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/

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,25 +9,41 @@ on:
 jobs:
   build-test:
     name: Build and Test
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os.instance }}
     timeout-minutes: 15
 
     strategy:
       fail-fast: false
       matrix:
-        os: [windows, ubuntu, macos]
-        python: ["3.7", "3.8", "3.9", "3.10"]
-        platform: [x64, x86]
-        exclude:
-          - os: ubuntu
-            platform: x86
-          - os: macos
+        os:
+          - category: windows
             platform: x86
+            instance: windows-latest
+
+          - category: windows
+            platform: x64
+            instance: windows-latest
+
+          - category: ubuntu
+            platform: x64
+            instance: ubuntu-22.04
+
+          - category: macos
+            platform: x64
+            instance: macos-13
+
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+
+        # This fails in pytest with:
+        # CSC : error CS4023: /platform:anycpu32bitpreferred can only be used with /t:exe, /t:winexe and /t:appcontainerexe [D:\a\pythonnet\pythonnet\src\runtime\Python.Runtime.csproj]
+        exclude:
+          - os: { category: windows, platform: x86 }
+            python: ["3.13"]
 
     steps:
       - name: Set Environment on macOS
         uses: maxim-lobanov/setup-xamarin@v1
-        if: ${{ matrix.os == 'macos' }}
+        if: ${{ matrix.os.category == 'macos' }}
         with:
           mono-version: latest
 
@@ -43,7 +59,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
-          architecture: ${{ matrix.platform }}
+          architecture: ${{ matrix.os.platform }}
 
       - name: Install dependencies
         run: |
@@ -54,41 +70,45 @@ jobs:
         run: |
           pip install -v .
 
-      - name: Set Python DLL path (non Windows)
-        if: ${{ matrix.os != 'windows' }}
+      - name: Set Python DLL path and PYTHONHOME (non Windows)
+        if: ${{ matrix.os.category != 'windows' }}
         run: |
           echo PYTHONNET_PYDLL=$(python -m find_libpython) >> $GITHUB_ENV
+          echo PYTHONHOME=$(python -c 'import sys; print(sys.prefix)') >> $GITHUB_ENV
 
-      - name: Set Python DLL path (Windows)
-        if: ${{ matrix.os == 'windows' }}
+      - name: Set Python DLL path and PYTHONHOME (Windows)
+        if: ${{ matrix.os.category == 'windows' }}
         run: |
           Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONNET_PYDLL=$(python -m find_libpython)"
+          Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONHOME=$(python -c 'import sys; print(sys.prefix)')"
 
       - name: Embedding tests
-        run: dotnet test --runtime any-${{ matrix.platform }} --logger "console;verbosity=detailed" src/embed_tests/
+        if: ${{ matrix.python != '3.13' }}
+        run: dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
         env:
           MONO_THREADS_SUSPEND: preemptive # https://github.com/mono/mono/issues/21466
 
       - name: Python Tests (Mono)
-        if: ${{ matrix.os != 'windows' }}
+        if: ${{ matrix.os.category != 'windows' }}
         run: pytest --runtime mono
 
       # TODO: Run these tests on Windows x86
       - name: Python Tests (.NET Core)
-        if: ${{ matrix.platform == 'x64' }}
+        if: ${{ matrix.os.platform == 'x64' }}
         run: pytest --runtime coreclr
 
       - name: Python Tests (.NET Framework)
-        if: ${{ matrix.os == 'windows' }}
+        if: ${{ matrix.os.category == 'windows' }}
         run: pytest --runtime netfx
 
       - name: Python tests run from .NET
-        run: dotnet test --runtime any-${{ matrix.platform }} src/python_tests_runner/
+        if: ${{ matrix.python != '3.13' }}
+        run: dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/
 
       - name: Perf tests
-        if: ${{ (matrix.python == '3.8') && (matrix.platform == 'x64') }}
+        if: ${{ (matrix.python == '3.8') && (matrix.os.platform == 'x64') }}
         run: |
           pip install --force --no-deps --target src/perf_tests/baseline/ pythonnet==2.5.2
-          dotnet test --configuration Release --runtime any-${{ matrix.platform }} --logger "console;verbosity=detailed" src/perf_tests/
+          dotnet test --configuration Release --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/perf_tests/
 
       # TODO: Run mono tests on Windows?
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -38,6 +38,7 @@
 -   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
 -   Félix Bourbonnais ([@BadSingleton](https://github.com/BadSingleton))
 -   Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
+-   Frank Witscher ([@Frawak](https://github.com/Frawak))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
 -   Inna Wiesel ([@inna-w](https://github.com/inna-w))
 -   Ivan Cronyn ([@cronan](https://github.com/cronan))
@@ -85,3 +86,5 @@
 -   ([@alxnull](https://github.com/alxnull))
 -   ([@gpetrou](https://github.com/gpetrou))
 -   Ehsan Iran-Nejad ([@eirannejad](https://github.com/eirannejad))
+-   ([@legomanww](https://github.com/legomanww))
+-   ([@gertdreyer](https://github.com/gertdreyer))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,15 +5,74 @@ project adheres to [Semantic Versioning][].
 
 This document follows the conventions laid out in [Keep a CHANGELOG][].
 
-## [Unreleased][]
+## [3.0.5](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.5) - 2024-12-13
 
 ### Added
 
+-  Support for Python 3.13 (#2454)
+
+
+## [3.0.4](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.4) - 2024-09-19
+
+### Added
+
+-   Added `ToPythonAs<T>()` extension method to allow for explicit conversion
+    using a specific type. ([#2311][i2311])
+-   Added `IComparable` and `IEquatable` implementations to `PyInt`, `PyFloat`,
+    and `PyString` to compare with primitive .NET types like `long`.
+
+### Changed
+
+-   Added a `FormatterFactory` member in RuntimeData to create formatters with
+    parameters. For compatibility, the `FormatterType` member is still present
+    and has precedence when defining both `FormatterFactory` and `FormatterType`
+-   Added a post-serialization and a pre-deserialization step callbacks to
+    extend (de)serialization process
+-   Added an API to stash serialized data on Python capsules
+
+### Fixed
+
+-   Fixed RecursionError for reverse operators on C# operable types from python. See #2240
+-   Fixed crash when .NET event has no `AddMethod`
+-   Fixed probing for assemblies in `sys.path` failing when a path in `sys.path`
+    has invalid characters. See #2376
+-   Fixed possible access violation exception on shutdown. See ([#1977][i1977])
+
+## [3.0.3](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.3) - 2023-10-11
+
+### Added
+
+-   Support for Python 3.12
+
+### Changed
+
+-   Use enum name in `repr`
+
+## [3.0.2](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.2) - 2023-08-29
+
+### Fixed
+
+-   Fixed error occuring when inheriting a class containing a virtual generic method
+-   Make a second call to `pythonnet.load` a no-op, as it was intended
+-   Added support for multiple inheritance when inheriting from a class and/or multiple interfaces
+-   Fixed error occuring when calling `GetBuffer` for anything other than `PyBUF.SIMPLE`
+-   Bumped `clr_loader` dependency to incorporate patches
+
+## [3.0.1](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.1) - 2022-11-03
+
+### Added
+
+-   Support for Python 3.11
+
 ### Changed
 
+-   Allow decoders to override conversion of types derived from primitive types
+
 ### Fixed
 
 -   Fixed objects leaking when Python attached event handlers to them even if they were later removed
+-   Fixed `PyInt` conversion to `BigInteger` and `System.String` produced incorrect result for values between 128 and 255.
+-   Fixed implementing a generic interface with a Python class
 
 
 ## [3.0.0](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.0) - 2022-09-29
@@ -807,7 +866,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
 
@@ -924,3 +983,5 @@ This version improves performance on benchmarks significantly compared to 2.3.
 [i238]: https://github.com/pythonnet/pythonnet/issues/238
 [i1481]: https://github.com/pythonnet/pythonnet/issues/1481
 [i1672]: https://github.com/pythonnet/pythonnet/pull/1672
+[i2311]: https://github.com/pythonnet/pythonnet/issues/2311
+[i1977]: https://github.com/pythonnet/pythonnet/issues/1977
diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -7,3 +7,6 @@ pygments>=2.7
 # C# via doxygen
 breathe
 git+https://github.com/rogerbarton/sphinx-csharp.git
+
+# Dependency of pythonnet, needed for autodocs
+clr_loader
diff --git a/doc/source/dotnet.rst b/doc/source/dotnet.rst
@@ -17,7 +17,7 @@ to:
 
 -  Reference ``Python.Runtime.dll`` (e.g. via a ``PackageReference``)
 -  Call ``PythonEngine.Initialize()`` to initialize Python
--  Call ``PythonEngine.ImportModule(name)`` to import a module
+-  Call ``var mod = PyModule.Import(name)`` to import a module as ``mod``
 
 The module you import can either start working with your managed app
 environment at the time its imported, or you can explicitly lookup and
@@ -42,28 +42,39 @@ application.
 
 Before interacting with any of the objects or APIs provided by the
 ``Python.Runtime`` namespace, calling code must have acquired the Python
-global interpreter lock by calling the ``PythonEngine.AcquireLock``
-method. The only exception to this rule is the
-``PythonEngine.Initialize`` method, which may be called at startup
-without having acquired the GIL.
-
-When finished using Python APIs, managed code must call a corresponding
-``PythonEngine.ReleaseLock`` to release the GIL and allow other threads
-to use Python.
-
-A ``using`` statement may be used to acquire and release the GIL:
+global interpreter lock by ``using'' ``Py.GIL()``. The only exception to
+this rule is the ``PythonEngine.Initialize`` method, which may be called
+at startup without having acquired the GIL. The GIL is released again
+by disposing the return value of `Py.GIL()`:
 
 .. code:: csharp
 
    using (Py.GIL())
    {
        PythonEngine.Exec("doStuff()");
    }
+
+   // or
+   {
+       using var _ = Py.GIL()
+       PythonEngine.Exec("doStuff()");
+   }
+
+   // or
+   var gil = Py.GIL();
+   try
+   {
+       PythonEngine.Exec("doStuff()");
+   }
+   finally
+   {
+       gil.Dispose();
+   }
 
-The AcquireLock and ReleaseLock methods are thin wrappers over the
-unmanaged ``PyGILState_Ensure`` and ``PyGILState_Release`` functions
-from the Python API, and the documentation for those APIs applies to the
-managed versions.
+The ``Py.GIL()'' object is a thin wrapper over the unmanaged
+``PyGILState_Ensure`` (on construction) and ``PyGILState_Release`` (on
+disposal) functions from the Python API, and the documentation for those
+APIs applies to the managed versions.
 
 Passing C# Objects to the Python Engine
 ---------------------------------------
@@ -99,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();

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,10 +10,10 @@ license = {text = "MIT"}
 readme = "README.rst"
 
 dependencies = [
-    "clr_loader>=0.2.2,<0.3.0"
+    "clr_loader>=0.2.7,<0.3.0"
 ]
 
-requires-python = ">=3.7, <3.11"
+requires-python = ">=3.7, <3.14"
 
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -25,13 +25,25 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",
 ]
 
 dynamic = ["version"]
 
+[dependency-groups]
+dev = [
+    "pytest >= 6",
+    "find_libpython >= 0.3.0",
+    "numpy >=2 ; python_version >= '3.10'",
+    "numpy <2 ; python_version < '3.10'",
+    "psutil"
+]
+
 [[project.authors]]
 name = "The Contributors of the Python.NET Project"
 email = "pythonnet@python.org"
@@ -43,12 +55,14 @@ Sources = "https://github.com/pythonnet/pythonnet"
 [tool.setuptools]
 zip-safe = false
 py-modules = ["clr"]
+license-files = []
 
 [tool.setuptools.dynamic.version]
 file = "version.txt"
 
 [tool.setuptools.packages.find]
 include = ["pythonnet*"]
+exclude = [".gitignore"]
 
 [tool.pytest.ini_options]
 xfail_strict = true

diff --git a/pythonnet.sln b/pythonnet.sln
@@ -4,8 +4,6 @@ VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "src\console\Console.csproj", "{E6B01706-00BA-4144-9029-186AC42FBE9A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{819E089B-4770-400E-93C6-4F7A35F0EA12}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Test", "src\testing\Python.Test.csproj", "{14EF9518-5BB7-4F83-8686-015BD2CC788E}"