Skip to content

Modernisation #1015

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

Closed
filmor wants to merge 22 commits into from
Closed

Modernisation #1015

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5a45156
Drop monoclr and clrmodule
filmor Nov 9, 2019
2f07774
Add stub module
filmor Nov 26, 2019
a5e6aca
Move projects around and add clean project/solution files
filmor Nov 26, 2019
95f07f0
Drop nuget config
filmor Nov 26, 2019
04ab475
Adjust embed test project
filmor Nov 26, 2019
627c4c4
Add test helper project
filmor Nov 26, 2019
c0415be
Readd benchmark project
filmor Nov 26, 2019
3031e96
Update setup.py
filmor Nov 26, 2019
8aba5fc
Drop PYTHON3 flag (default now)
filmor Dec 14, 2019
e933e79
Remove unneeded additional interop files
filmor Dec 14, 2019
f27d7be
Make NETSTANDARD the default
filmor Dec 15, 2019
52caf17
Add very simple initial load in pythonnet
filmor Dec 15, 2019
ca99b17
Remove Runtime._UCS dependency from CustomMarshaler
filmor Dec 15, 2019
146e6ac
Stop using Runtime.IsPython2/3
filmor Dec 15, 2019
e61dd72
Start implementing interface ILibPython
filmor Dec 16, 2019
0185bcb
Make the code compile with ILibPython
filmor Dec 16, 2019
908f0f0
Move interface to separate DLL for simpler dynamic loading
filmor Dec 16, 2019
946b9a0
Add template to generate PInvoke-based implementation
filmor Dec 17, 2019
60d15cd
Make setup.py work again
filmor Dec 17, 2019
5753d38
Drop InitializePlatformData
filmor Dec 18, 2019
41577fc
Fix define for interop2, add comment on interop3
filmor Dec 18, 2019
22a24a4
First try on loading the correct 'DLL' on .NET Core
filmor Dec 18, 2019
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
Next Next commit
Make setup.py work again
  • Loading branch information
@filmor
filmor committed Dec 17, 2019
commit 60d15cdcf1c8fd67b3138d58da19ef4bcf83a651
15 changes: 6 additions & 9 deletions Python.Runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ public static partial class Runtime

public static int MainManagedThreadId { get; private set; }

#if UCS2 && PYTHON2
static int _UCS = 2;
#else
static int _UCS = 4;
#endif

/// <summary>
/// Encoding to use to convert Unicode to/from Managed to Native
/// </summary>
Expand Down Expand Up @@ -223,18 +229,9 @@ internal static void Initialize(bool initSigs = false)
IntPtr dllLocal = IntPtr.Zero;
var loader = LibraryLoader.Get(OperatingSystem);

if (_PythonDll != "__Internal")
{
dllLocal = loader.Load(_PythonDll);
}
_PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");
PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");

if (dllLocal != IntPtr.Zero)
{
loader.Free(dllLocal);
}

// Initialize modules that depend on the runtime class.
AssemblyManager.Initialize();
PyCLRMetaType = MetaType.Initialize();
Expand Down
5 changes: 5 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,10 @@ def finalize_options(self):
"Python.Runtime/",
output="pythonnet/dlls",
),
DotnetLib(
"python-runtime-native",
"Python.Runtime.Native/",
output="pythonnet/dlls",
),
},
)