Use recently-released xdis

Author: rocky

.github/workflows/macos.yml

@@ -23,7 +23,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         # Until the next xdis release
-        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
+        # pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         # Until the next pytracer release
         pip install git+https://github.com/rocky/pytracer#egg=tracer
         # Until the next pyficache release

.github/workflows/ubuntu-prompt-toolkit.yml

@@ -22,7 +22,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         # Until the next xdis release
-        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
+        # pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         # Until the next pytracer release
         # pip install git+https://github.com/rocky/pytracer#egg=tracer
         # Until the next pyficache release

.github/workflows/ubuntu.yml

@@ -22,7 +22,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         # Until the next xdis release
-        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
+        # pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         # Until the next pytracer release
         # pip install git+https://github.com/rocky/pytracer#egg=tracer
         # Until the next pyficache release

.github/workflows/windows.yml

@@ -23,7 +23,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         # Until the next xdis release
-        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
+        # pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         # Until the next pytracer release
         pip install git+https://github.com/rocky/pytracer#egg=tracer
         # Until the next pyficache release

pyproject.toml

@@ -15,7 +15,7 @@ description = "GDB-like Python Debugger in the Trepan family"
 dependencies = [
     "columnize >= 0.3.10",
     "pyficache > 2.3.5",
-    "xdis >= 6.1.1,<6.2.0",
+    "xdis >= 6.1.5,<6.2.0",
     "Pygments >= 2.2.0",
     "spark_parser >= 1.8.9, <1.9.2",
     "tracer > 1.9.0",

test/unit/lib/test_lib_bytecode.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 """Unit test for trepan.lib.bytecode"""
 import inspect
+import platform
+import pytest
 
 from trepan.lib.bytecode import is_def_stmt, op_at_frame, stmt_contains_opcode
 
@@ -13,6 +15,8 @@ def test_contains_make_function():
     return
 
 
+@pytest.mark.skipif(platform.python_implementation() == "GraalVM",
+                    reason="op_at_frame() doesn't work for Graal (JVM) bytecode")
 def test_op_at_frame():
     frame = inspect.currentframe()
     call_opcode = "CALL"

test/unit/lib/test_lib_stack.py

@@ -1,5 +1,7 @@
 """Unit test for "trepan.frame" """
 import inspect
+import pytest
+import platform
 
 from trepan.lib.stack import count_frames, is_eval_or_exec_stmt
 
@@ -13,6 +15,8 @@ def test_count_frames():
     return
 
 
+@pytest.mark.skipif(platform.python_implementation() == "GraalVM",
+                    reason="exec/eval detection doesn't work for Graal (JVM) bytecode")
 def test_stack_misc():
     f = inspect.currentframe()
     # assert "test_stack_misc" == get_call_function_name(f))