Remove v1

Author: hermansje

pythonwhat/checks/check_object.py

@@ -12,7 +12,6 @@
     isDefinedCollInProcess,
 )
 from pythonwhat.checks.check_funcs import part_to_child
-from pythonwhat.utils import v2_only
 import pandas as pd
 import ast
 
@@ -155,11 +154,8 @@ def __init__(self, n):
         and seeing if the result of running this expression in both student and solution process match.
 
     """
-
-    # Only do the assertion if PYTHONWHAT_V2_ONLY is set to '1'
-    if v2_only():
-        extra_msg = "If you want to check the value of an object in e.g. a for loop, use `has_equal_value(name = 'my_obj')` instead."
-        state.assert_execution_root("check_object", extra_msg=extra_msg)
+    extra_msg = "If you want to check the value of an object in e.g. a for loop, use `has_equal_value(name = 'my_obj')` instead."
+    state.assert_execution_root("check_object", extra_msg=extra_msg)
 
     if missing_msg is None:
         missing_msg = "Did you define the {{typestr}} `{{index}}` without errors?"

pythonwhat/checks/has_funcs.py

@@ -152,9 +152,8 @@ def has_equal_ast(state, incorrect_msg=None, code=None, exact=True, append=None)
             Ex().check_function('numpy.mean').check_args('a').has_equal_ast()
 
     """
-    if utils.v2_only():
-        state.assert_is_not(["object_assignments"], "has_equal_ast", ["check_object"])
-        state.assert_is_not(["function_calls"], "has_equal_ast", ["check_function"])
+    state.assert_is_not(["object_assignments"], "has_equal_ast", ["check_object"])
+    state.assert_is_not(["function_calls"], "has_equal_ast", ["check_function"])
 
     if code and incorrect_msg is None:
         raise InstructorError.from_message(

pythonwhat/probe.py

@@ -1,32 +1,10 @@
 from protowhat.sct_syntax import EagerChain, ExGen, LazyChainStart, state_dec_gen, LazyChain
 from pythonwhat.checks.check_wrappers import scts
 from pythonwhat.State import State
-from pythonwhat.probe import Node, Probe, TEST_NAMES
-from pythonwhat.utils import include_v1
-from pythonwhat import test_funcs
-from functools import wraps
 
 # TODO: could define scts for check_wrappers at the module level
 sct_dict = scts.copy()
 
-
-def multi_dec(f):
-    """Decorator for multi to remove nodes for original test functions from root node"""
-
-    @wraps(f)
-    def wrapper(*args, **kwargs):
-        args = (
-            args[0] if len(args) == 1 and isinstance(args[0], (list, tuple)) else args
-        )
-        for arg in args:
-            if isinstance(arg, Node) and arg.parent.name is "root":
-                arg.parent.remove_child(arg)
-                arg.update_child_calls()
-        return f(*args, **kwargs)
-
-    return wrapper
-
-
 state_dec = state_dec_gen(sct_dict)
 
 # todo: __all__?
@@ -49,22 +27,5 @@ def get_chains():
     }
 
 
-if include_v1():
-    # Prepare SCTs that may be chained attributes ----------------------
-    # decorate functions that may try to run test_* function nodes as subtests
-    # so they remove those nodes from the tree
-    for k in ["multi", "with_context"]:
-        sct_dict[k] = multi_dec(sct_dict[k])
-
-    # allow test_* functions as chained attributes
-    for k in TEST_NAMES:
-        sct_dict[k] = Probe(tree=None, f=getattr(test_funcs, k), eval_on_call=True)
-
-    # original logical test_* functions behave like multi
-    # this is necessary to allow them to take check_* funcs as args
-    # since probe behavior will try to call all SCTs passed (assuming they're also probes)
-    for k in ["test_or", "test_correct"]:
-        sct_dict[k] = multi_dec(getattr(test_funcs, k))
-
 # Prepare check_funcs to be used alone (e.g. test = check_with().check_body())
 v2_check_functions = {k: state_dec(v) for k, v in scts.items()}

pythonwhat/sct_syntax.py

@@ -4,7 +4,6 @@
 from pythonwhat.utils import check_str, check_process
 from protowhat.Reporter import Reporter
 from protowhat.failure import Failure, InstructorError
-from pythonwhat.utils import include_v1
 
 
 def test_exercise(
@@ -51,16 +50,11 @@ def test_exercise(
         )
 
         State.root_state = state
-        tree, sct_cntxt = prep_context()
+        sct_cntxt = prep_context()
 
         # Actually execute SCTs
         exec(sct, sct_cntxt)
 
-        # Run remaining nodes on tree (v1 only)
-        if tree:
-            for test in tree.crnt_node:
-                test(state)
-
     except Failure as e:
         if isinstance(e, InstructorError):
             # TODO: decide based on context
@@ -88,7 +82,6 @@ def allow_errors():
 def prep_context():
     cntxt = {"success_msg": success_msg}
     from pythonwhat.sct_syntax import v2_check_functions
-    from pythonwhat.probe import build_probe_context
 
     imports = [
         "from inspect import Parameter as param",
@@ -98,17 +91,9 @@ def prep_context():
     ]
     [exec(line, None, cntxt) for line in imports]
 
-    # only if PYTHONWHAT_V2_ONLY is not set, support v1
-    if include_v1():
-        tree, probe_cntxt = build_probe_context()
-        cntxt.update(probe_cntxt)
-    else:
-        tree = None
-
     cntxt.update(v2_check_functions)
     # TODO: ChainStart instances cause errors when dill tries to pass manual converter functions
     # cntxt.update(get_chains())
-    return tree, cntxt
 
 
 def setup_state(stu_code="", sol_code="", pec="", **kwargs):