From d519c1a2eade0c0a57f59e55c63d0cf61766a751 Mon Sep 17 00:00:00 2001 From: anjakefala Date: Sat, 7 Oct 2023 23:09:06 -0700 Subject: [PATCH 1/2] [dev] check motd before publishing visidata to pypi --- dev/checklists/release.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/checklists/release.md b/dev/checklists/release.md index 11fb94128..f90d03200 100644 --- a/dev/checklists/release.md +++ b/dev/checklists/release.md @@ -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 @@ -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 From 8c4cbb7250c86094ce4ef024c24d336d4d30a6f1 Mon Sep 17 00:00:00 2001 From: anjakefala Date: Sun, 8 Oct 2023 12:49:11 -0700 Subject: [PATCH 2/2] [batch-] sync should not wait for outputProgress Thread --- visidata/main.py | 2 +- visidata/threads.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/visidata/main.py b/visidata/main.py index 3c99fbe6f..fa65e14dc 100755 --- a/visidata/main.py +++ b/visidata/main.py @@ -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 diff --git a/visidata/threads.py b/visidata/threads.py index 13a3b0f84..6fdc39f64 100644 --- a/visidata/threads.py +++ b/visidata/threads.py @@ -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: