Skip to content

This fixes an issue causing Python to load plugins from the wrong dir… #150

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

This fixes an issue causing Python to load plugins from the wrong dir… #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions OpenTap.Python/PythonInstallAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class PythonInstallAction : ICustomPackageAction
public bool Execute(PackageDef package, CustomPackageActionArgs customActionArgs)
{
if (PythonInitializer.LoadPython() == false)
{
log.Debug("Unable to load python. Skipping python install actions.");
return true;
}
using (Py.GIL())
{
var opentap = Py.Import("opentap");
Expand Down
3 changes: 2 additions & 1 deletion OpenTap.Python/PythonSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.IO;
using System.Linq;
using System.Reflection;
using OpenTap.Package;

namespace OpenTap.Python
{
Expand Down Expand Up @@ -43,7 +44,7 @@ public class PythonSettings : ComponentSettings<PythonSettings>
public string[] GetSearchList()
{
var lst = new List<string>();
var dir = Path.GetDirectoryName(typeof(TestPlan).Assembly.Location);
var dir = Installation.Current.Directory;
lst.Add(dir);
var dir2 = Path.Combine(dir, "Packages", "Python");
if (Directory.Exists(dir2))
Expand Down