Skip to content

Added --force command line option to force rerun a named list of sessions. #193

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

Open
ralphieraccoon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added --force command line option to force rerun a named list of sessions. #193

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
c389fcb
Added --force option to force rerun a named list of sessions.
ralphieraccoon Jan 24, 2022
3b7e9e3
Merge branch 'gpoore:master' into master
ralphieraccoon Mar 12, 2024
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
9 changes: 8 additions & 1 deletion pythontex/pythontex2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ def process_argv(data, temp_data):
parser.add_argument('-v', '--verbose', default=False, action='store_true',
help='verbose output')
parser.add_argument('--interpreter', default=None, help='set a custom interpreter; argument should be in the form "<interpreter>:<command>, <interp>:<cmd>, ..." where <interpreter> is "python", "ruby", etc., and <command> is the command for invoking the interpreter; argument may also be in the form of a Python dictionary')
parser.add_argument('--force', default=None,
metavar='<family>:<session>:<restart>;[<family>:<session>:<restart>;...]',
type=lambda s: [i for i in s.split(';')],
help='force listed session(s) to be rerun, regardless of rerun option condition')
group_debug = parser.add_mutually_exclusive_group()
group_debug.add_argument('--debug', nargs='?', default=None,
const='default',
Expand Down Expand Up @@ -201,6 +205,7 @@ def process_argv(data, temp_data):
temp_data['verbose'] = args.verbose
temp_data['debug'] = args.debug
temp_data['interactive'] = args.interactive
temp_data['force'] = args.force
# Update interpreter_dict based on interpreter
set_python_interpreter = False
if args.interpreter is not None:
Expand Down Expand Up @@ -677,7 +682,9 @@ def modified_dependencies(key, data, old_data, temp_data):

def should_rerun(hash, old_hash, old_exit_status, key, rerun, data, old_data, temp_data):
# #### Need to clean up arg passing here
if rerun == 'never':
if temp_data['force'] is not None and key.replace('#', ':') in temp_data['force']:
return True # Don't check rerun if session has been forced to rerun
elif rerun == 'never':
if (hash != old_hash or modified_dependencies(key, data, old_data, temp_data)):
print('* PythonTeX warning')
print(' Session ' + key.replace('#', ':') + ' has rerun=never')
Expand Down
9 changes: 8 additions & 1 deletion pythontex/pythontex3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ def process_argv(data, temp_data):
parser.add_argument('-v', '--verbose', default=False, action='store_true',
help='verbose output')
parser.add_argument('--interpreter', default=None, help='set a custom interpreter; argument should be in the form "<interpreter>:<command>, <interp>:<cmd>, ..." where <interpreter> is "python", "ruby", etc., and <command> is the command for invoking the interpreter; argument may also be in the form of a Python dictionary')
parser.add_argument('--force', default=None,
type=lambda s: [i for i in s.split(';')],
metavar='<family>:<session>:<restart>;[<family>:<session>:<restart>;...]',
help='force listed session(s) to be rerun, regardless of rerun option condition')
group_debug = parser.add_mutually_exclusive_group()
group_debug.add_argument('--debug', nargs='?', default=None,
const='default',
Expand Down Expand Up @@ -201,6 +205,7 @@ def process_argv(data, temp_data):
temp_data['verbose'] = args.verbose
temp_data['debug'] = args.debug
temp_data['interactive'] = args.interactive
temp_data['force'] = args.force
# Update interpreter_dict based on interpreter
set_python_interpreter = False
if args.interpreter is not None:
Expand Down Expand Up @@ -677,7 +682,9 @@ def modified_dependencies(key, data, old_data, temp_data):

def should_rerun(hash, old_hash, old_exit_status, key, rerun, data, old_data, temp_data):
# #### Need to clean up arg passing here
if rerun == 'never':
if temp_data['force'] is not None and key.replace('#', ':') in temp_data['force']:
return True # Don't check rerun if session has been forced to rerun
elif rerun == 'never':
if (hash != old_hash or modified_dependencies(key, data, old_data, temp_data)):
print('* PythonTeX warning')
print(' Session ' + key.replace('#', ':') + ' has rerun=never')
Expand Down