Commit 160cfed
committed
Keep galaxy.webapps imports local in operations.py
CI on PR galaxyproject#22625 caught this -- packages/test.sh installs galaxy-app on
its own and runs pytest with --doctest-modules, which imports every
source file at collection time. The earlier "Hoist agent-operations
local imports to module level" commit moved
InvocationIndexPayload/WorkflowIndexPayload up alongside the rest, but
galaxy.webapps lives in galaxy-webapps and isn't a galaxy-app
dependency, so those two imports blow up collection with
ModuleNotFoundError.
Restoring just those two as method-local imports (with a comment so we
don't try to hoist them again) gets the package test back to green
without dragging the rest of the cleanup back down.1 parent efbf5e1 commit 160cfed
1 file changed
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
39 | 41 | | |
40 | 42 | | |
41 | 43 | | |
| |||
443 | 445 | | |
444 | 446 | | |
445 | 447 | | |
| 448 | + | |
| 449 | + | |
446 | 450 | | |
447 | 451 | | |
448 | 452 | | |
| |||
528 | 532 | | |
529 | 533 | | |
530 | 534 | | |
| 535 | + | |
| 536 | + | |
531 | 537 | | |
532 | 538 | | |
533 | 539 | | |
| |||
0 commit comments