Skip to content
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

[batch-] sync should not wait for outputProgress Thread #2049

Merged
merged 2 commits into from
Oct 8, 2023
+7 −3
Merged

[batch-] sync should not wait for outputProgress Thread #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d519c1a
[dev] check motd before publishing visidata to pypi
anjakefala Oct 8, 2023
8c4cbb7
[batch-] sync should not wait for outputProgress Thread
anjakefala Oct 8, 2023
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
6 changes: 5 additions & 1 deletion dev/checklists/release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@

7. Merge `develop` to stable

14. motd
a. Upload new motd for new version.
b. Test that VisiData downloads motd.


8. Merge `stable` back into other branches

a. if the branch works with minimal conflicts, keep the branch
Expand Down Expand Up @@ -91,7 +96,6 @@ git push --tags

13. Write up the release notes and add it to `www/releases.md`. Add it to index.md.

14. Upload new motd

15. Update the website by pushing to master. Update with new manpage. Update redirect to point to new manpage.
- release notes
Expand Down
2 changes: 1 addition & 1 deletion visidata/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def main_vd():
vs = eval_vd(vdfile, *fmtargs, **fmtkwargs)
vd.sync(vs.reload())
if args.batch:
visidata.VisiData.execAsync(vd, vd.outputProgressEvery, vs, seconds=0.5, sheet=BaseSheet()) #1182
vd.outputProgressThread = visidata.VisiData.execAsync(vd, vd.outputProgressEvery, vs, seconds=0.5, sheet=BaseSheet()) #1182
if vd.replay_sync(vs): # error
return 1

Expand Down
2 changes: 1 addition & 1 deletion visidata/threads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def sync(self, *joiningThreads):
while True:
deads = set() # dead threads
threads = joiningThreads or set(self.unfinishedThreads)
threads -= set([threading.current_thread(), getattr(vd, 'drawThread', None)])
threads -= set([threading.current_thread(), getattr(vd, 'drawThread', None), getattr(vd, 'outputProgressThread', None)])
threads -= deads
threads -= set([None])
for t in threads:
Expand Down
Loading