Skip to content

Commit 078fb69

Browse files
filmorfilmor
authored
Merge branch 'master' into 2574-StackOverFlowExceptionOnSuperMethodCallFix
2 parents 3ba30c4 + 39c575e commit 078fb69

8 files changed

Lines changed: 598 additions & 74 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,29 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v6
10+
- name: Set up Python
11+
uses: astral-sh/setup-uv@v7
12+
with:
13+
python-version: "3.12"
14+
cache-python: true
15+
activate-environment: true
16+
enable-cache: true
17+
1018
- name: Doxygen Action
1119
uses: mattnotmitt/doxygen-action@1.12.0
1220
with:
1321
working-directory: "doc/"
1422

23+
- name: Synchronize the virtual environment
24+
run: uv sync --managed-python --no-dev --group doc
25+
1526
- name: Build Sphinx documentation
1627
run: |
17-
pip install -r doc/requirements.txt
18-
sphinx-build doc/source/ ./doc/build/html/
28+
uv run sphinx-build doc/source/ ./doc/build/html/
1929
2030
- name: Upload artifact
2131
# Automatically uploads an artifact from the './_site' directory by default
22-
uses: actions/upload-pages-artifact@v4
32+
uses: actions/upload-pages-artifact@v5
2333
with:
2434
path: doc/build/html/
2535

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
<AssemblyProduct>Python.NET</AssemblyProduct>
77
<LangVersion>12.0</LangVersion>
88
<IsPackable>false</IsPackable>
9+
<DeterministicSourcePaths>true</DeterministicSourcePaths>
910
<FullVersion>$([System.IO.File]::ReadAllText("$(MSBuildThisFileDirectory)version.txt").Trim())</FullVersion>
1011
<VersionPrefix>$(FullVersion.Split('-', 2)[0])</VersionPrefix>
1112
<VersionSuffix Condition="$(FullVersion.Contains('-'))">$(FullVersion.Split('-', 2)[1])</VersionSuffix>
1213
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
1314
</PropertyGroup>
15+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
16+
<DebugSymbols>False</DebugSymbols>
17+
<DebugType>None</DebugType>
18+
</PropertyGroup>
1419
<ItemGroup>
1520
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
1621
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="5.*">

‎doc/Makefile‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎doc/make.bat‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎doc/requirements.txt‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎pyproject.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ dev = [
3939
"numpy >=2 ; python_version >= '3.10'",
4040
"numpy <2 ; python_version < '3.10'",
4141
]
42+
doc = [
43+
"sphinx",
44+
"furo>=2025.12.19",
45+
"pygments>=2.20",
46+
"breathe",
47+
"sphinx-csharp @ git+https://github.com/rogerbarton/sphinx-csharp.git",
48+
]
4249

4350
[[project.authors]]
4451
name = "The Contributors of the Python.NET Project"

‎tests/test_method.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,8 +1025,8 @@ def test_getting_overloaded_method_binding_does_not_leak_memory(memory_usage_tra
10251025
bytesAllocatedPerIteration = pow(2, 20) # 1MB
10261026
bytesLeakedPerIteration = processBytesDelta / iterations
10271027

1028-
# Allow 50% threshold - this shows the original issue is fixed, which leaks the full allocated bytes per iteration
1029-
failThresholdBytesLeakedPerIteration = bytesAllocatedPerIteration / 2
1028+
# Allow 90% threshold - this shows the original issue is fixed, which leaks the full allocated bytes per iteration
1029+
failThresholdBytesLeakedPerIteration = bytesAllocatedPerIteration * 0.9
10301030

10311031
assert bytesLeakedPerIteration < failThresholdBytesLeakedPerIteration
10321032

‎uv.lock‎

Lines changed: 571 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)