Skip to content

New loading based on clr_loader #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 14, 2021
Merged

New loading based on clr_loader #1373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b92d929
Replace clr module by loading through clr_loader
filmor Feb 13, 2021
fdb7144
Add Changelog entry
filmor Feb 14, 2021
f01a78c
Fix domain reload tests and activate them on macOS
filmor Feb 13, 2021
0d7e43a
Run tests on .NET Core
filmor Feb 13, 2021
67032ea
Vendor System.Drawing.Point for testing on .NET Core
filmor Feb 14, 2021
8bc458b
Use approximate comparison for single max/min value comparison
filmor Feb 14, 2021
d46fa1e
Adjust the import tests to use only commonly available deps
filmor Feb 14, 2021
f0011a5
Fix PythonTestRunner to work with new pytest setup
filmor Feb 14, 2021
c1a01b7
Drop references to the obsolete call
filmor Feb 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Drop references to the obsolete call
  • Loading branch information
@filmor
filmor committed Feb 14, 2021
commit c1a01b72fad0f54e87edb2432ad00c135728150c
1 change: 0 additions & 1 deletion pythonnet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.PythonTestsRunner",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{142A6752-C2C2-4F95-B982-193418001B65}"
ProjectSection(SolutionItems) = preProject
configured.props = configured.props
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/native/ABI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ internal static void Initialize(Version version, BorrowedReference pyType)
if (typeOffsetsClass is null)
{
var types = thisAssembly.GetTypes().Select(type => type.Name).Where(name => name.StartsWith("TypeOffset"));
string message = $"Searching for {className}, found {string.Join(",", types)}. " +
"If you are building Python.NET from source, make sure you have run 'python setup.py configure' to fill in configured.props";
string message = $"Searching for {className}, found {string.Join(",", types)}.";
throw new NotSupportedException($"Python ABI v{version} is not supported: {message}");
}
var typeOffsets = (ITypeOffsets)Activator.CreateInstance(typeOffsetsClass);
Expand Down