fix #676 and test GUI compat better along the way

Author: Christopher Doris

CondaPkg.toml

@@ -1,12 +1,17 @@
-[deps.libstdcxx]
+
+[deps.openssl]
 version = "<=julia"
 
-[deps.libstdcxx-ng]
+[deps.libstdcxx]
 version = "<=julia"
 
-[deps.openssl]
+[deps.libstdcxx-ng]
 version = "<=julia"
 
 [deps.python]
 build = "**cpython**"
 version = ">=3.9,<4"
+
+[dev.deps]
+matplotlib = ""
+pyside6 = ""

Project.toml

@@ -17,7 +17,7 @@ UnsafePointers = "e17b2a0c-0bdf-430a-bd0c-3a23cae4ff39"
 [compat]
 Aqua = "0 - 999"
 CategoricalArrays = "0.10, 1"
-CondaPkg = "0.2.30"
+CondaPkg = "0.2.33"
 Dates = "1"
 Libdl = "1"
 MacroTools = "0.5"

src/Compat/gui.jl

@@ -159,7 +159,7 @@ function init_gui()
 
         # add a hook to automatically call fix_qt_plugin_path()
         fixqthook =
-            Py(() -> (Core.CONFIG.auto_fix_qt_plugin_path && fix_qt_plugin_path(); nothing))
+            Py(() -> (PythonCall.CONFIG.auto_fix_qt_plugin_path && fix_qt_plugin_path(); nothing))
         pymodulehooks.add_hook("PyQt4", fixqthook)
         pymodulehooks.add_hook("PyQt5", fixqthook)
         pymodulehooks.add_hook("PySide", fixqthook)

src/Core/stdlib.jl

@@ -40,7 +40,8 @@ function init_stdlib()
      class JuliaCompatHooks:
          def __init__(self):
              self.hooks = {}
-         def find_module(self, name, path=None):
+         def find_spec(self, name, path=None, target=None):
+             print("find_spec:", name)
              hs = self.hooks.get(name)
              if hs is not None:
                  for h in hs:

test/Compat.jl

@@ -5,13 +5,22 @@
         @test PythonCall.fix_qt_plugin_path() === false
     end
     @testset "event_loop_on/off" begin
-        for g in [:pyqt4, :pyqt5, :pyside, :pyside2, :pyside6, :gtk, :gtk3, :wx]
+        @testset "$g" for g in [:pyqt4, :pyqt5, :pyside, :pyside2, :pyside6, :gtk, :gtk3, :wx]
             # TODO: actually test the various GUIs somehow?
-            @show g
-            @test_throws PyException PythonCall.event_loop_on(g)
+            if g == :pyside6
+                # pyside6 is installed as a dev dependency
+                # AND it's a dependency of matplotlib, which is also a dev dependency
+                @test PythonCall.event_loop_on(g) isa Timer
+            else
+                @test_throws PyException PythonCall.event_loop_on(g)
+            end
             @test PythonCall.event_loop_off(g) === nothing
         end
     end
+    @testset "matplotlib issue 676" begin
+        plt = pyimport("matplotlib.pyplot")
+        @test plt.get_backend() isa Py
+    end
 end
 
 @testitem "ipython" begin