Skip to content

Commit 3ba30c4

Browse files
filmorfilmor
authored
Merge branch 'master' into 2574-StackOverFlowExceptionOnSuperMethodCallFix
2 parents 9831bb9 + a67d1a0 commit 3ba30c4

7 files changed

Lines changed: 264 additions & 361 deletions

File tree

‎.github/actions/install-mono/action.yml‎

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

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
steps:
3838
- name: Deploy to GitHub Pages
3939
id: deployment
40-
uses: actions/deploy-pages@v4
40+
uses: actions/deploy-pages@v5

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,6 @@ jobs:
5555
platform: x86
5656
python: "3.10"
5757

58-
# Broken ctypes find_library
59-
- os:
60-
category: macos
61-
platform: arm64
62-
python: '3.10'
63-
- os:
64-
category: macos
65-
platform: arm64
66-
python: '3.11'
67-
- os:
68-
category: macos
69-
platform: arm64
70-
python: '3.12'
71-
7258
# Fails to find pytest
7359
- os:
7460
category: windows
@@ -97,7 +83,7 @@ jobs:
9783
- run: dotnet restore
9884

9985
- name: Install Mono
100-
uses: ./.github/actions/install-mono
86+
uses: pythonnet/clr-loader/.github/actions/install-mono@main
10187
with:
10288
arch: ${{ matrix.os.platform }}
10389

‎pyproject.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "MIT"
1010
readme = "README.rst"
1111

1212
dependencies = [
13-
"clr_loader>=0.3.0,<0.4.0"
13+
"clr_loader>=0.3.1,<0.4.0"
1414
]
1515

1616
requires-python = ">=3.10, <3.15"
@@ -38,7 +38,6 @@ dev = [
3838
"find_libpython >= 0.3",
3939
"numpy >=2 ; python_version >= '3.10'",
4040
"numpy <2 ; python_version < '3.10'",
41-
"psutil"
4241
]
4342

4443
[[project.authors]]

‎src/runtime/Python.Runtime.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
<ItemGroup>
6262
<PackageReference Include="Lost.Compat.NullabilityAttributes" Version="0.0.4" PrivateAssets="All" />
6363
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.*" PrivateAssets="All" />
64-
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
64+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
6565
</ItemGroup>
6666
</Project>

0 commit comments

Comments
 (0)