Skip to content

Commit f73d2a9

Browse files
committed
Gigger CI builds
1 parent 9a2ee2e commit f73d2a9

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
python -m pip install --upgrade pip
2525
# Until the next xdis release
2626
pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
27-
pip install --local -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
27+
pip install --local --no-build-isolation -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
2828
pip install --local -e git+https://github.com/rocky/python-uncompyle6.git#egg=uncompyle6
2929
pip install --local -e git+https://github.com/rocky/python-decompile3.git#egg=decompyle3
3030
# Until the next pytracer release

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
python -m pip install --upgrade pip
2424
# Until the next xdis release
2525
pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
26-
pip install --local -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
26+
pip install --local --no-build-isolation -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
2727
pip install --local -e git+https://github.com/rocky/python-uncompyle6.git#egg=uncompyle6
2828
pip install --local -e git+https://github.com/rocky/python-decompile3.git#egg=decompyle3
2929
# Until the next pytracer release

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
python -m pip install --upgrade pip
2424
# Until the next xdis release
2525
pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
26-
pip install --local -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
26+
pip install --local --no-build-isolation -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
2727
pip install --local -e git+https://github.com/rocky/python-uncompyle6.git#egg=uncompyle6
2828
pip install --local -e git+https://github.com/rocky/python-decompile3.git#egg=decompyle3
2929
# Until the next pytracer release

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
python -m pip install --upgrade pip
2525
# Until the next xdis release
2626
pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
27-
pip install --local -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
27+
pip install --local --no-build-isolation -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
2828
pip install --local -e git+https://github.com/rocky/python-uncompyle6.git#egg=uncompyle6
2929
pip install --local -e git+https://github.com/rocky/python-decompile3.git#egg=decompyle3
3030
# Until the next pytracer release

docs/commands/running.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ program, when a call or return occurs, or when an exception is raised.
2626
The overhead in running these callbacks slows down your
2727
program. Currently, the overhead can be greater than the overhead in
2828
``pdb``. This is because the debugger tries to be more precise and
29-
careful in its tracing, and the features it provides are more powerful. In
30-
most cases, we can do this without a significant slowdown in the
29+
careful it tracing, and the features it provides are more powerful. In
30+
most cases, we can do this without a significant slow down in the
3131
debugged program.
3232

3333
But in certain situations, the overhead in running debugged code can

trepan/debugger.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
import pyficache
3737
import tracer
38-
from tracer.tracefilter import TraceFilter
3938
from xdis.load import check_object_path, load_module
4039

4140
from trepan.exception import DebuggerQuit, DebuggerRestart
@@ -48,6 +47,14 @@
4847
from trepan.lib.sighandler import SignalManager
4948
from trepan.misc import option_set
5049

50+
try:
51+
from tracer.tracefilter import TraceFilter
52+
except ImportError:
53+
# This is a hack to allow debugging TraceFilter.
54+
# The problem is that tracer we have tracer and
55+
# tracer.tracer and the two can get confused.
56+
from tracefilter import TraceFilter
57+
5158
try:
5259
from readline import get_line_buffer
5360
except ImportError:
@@ -368,7 +375,9 @@ def restart_argv(self):
368375
# DEFAULT_INIT_OPTS which includes references to these.
369376

370377
# Note: has to come after functions listed in ignore_filter.
371-
ignore_items = [tracer, tracer.tracer, TrepanCore]
378+
ignore_items = [tracer, TrepanCore]
379+
if hasattr(tracer, "tracer"):
380+
ignore_items.append(tracer.tracer)
372381
trepan_debugger = sys.modules.get("trepan.debugger")
373382
if trepan_debugger is not None:
374383
ignore_items.append(trepan_debugger)

0 commit comments

Comments
 (0)