Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:

- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v7
with:
path: doc/build/html/
path: doc/build/html/**

deploy:
if: github.ref == 'refs/heads/master'
Expand Down
9 changes: 8 additions & 1 deletion src/runtime/McNeel.PythonEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,19 @@ public PythonEngineWrapper(string pythonHome, int major, int minor)
// setup the darwin loader manually so it can find the native python shared lib
// this is so less code changes are done the pythonnet source
string pythonLib;
string pythonLibDir = pythonHome;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
pythonLib = $"python{major}{minor}.dll";
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
// python-build-standalone layout: libpython lives under <home>/lib/
pythonLib = $"libpython{major}.{minor}.so.1.0";
pythonLibDir = Path.Combine(pythonHome, "lib");
}
else
pythonLib = $"libpython{major}.{minor}.dylib";

string pythonLibPath = Path.Combine(pythonHome, pythonLib);
string pythonLibPath = Path.Combine(pythonLibDir, pythonLib);
LibraryLoader.Instance.Load(pythonLibPath);
PythonEngine.PythonHome = pythonHome;
Debug.WriteLine($"Library loader set to: {pythonLibPath}");
Expand Down
Loading