From ef54243b09165d87cfa40807ce186687097df495 Mon Sep 17 00:00:00 2001 From: Evan Hubinger Date: Sat, 14 Oct 2023 17:59:56 -0700 Subject: [PATCH] Fix lots of tests --- coconut/constants.py | 16 +++++++++------- coconut/root.py | 2 +- coconut/tests/main_test.py | 4 ++-- coconut/tests/src/extras.coco | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/coconut/constants.py b/coconut/constants.py index f765fe26b..c2ad6eea1 100644 --- a/coconut/constants.py +++ b/coconut/constants.py @@ -961,8 +961,8 @@ def get_path_env_var(env_var, default): "pydata-sphinx-theme", ), "numpy": ( - ("numpy", "py34"), ("numpy", "py<3;cpy"), + ("numpy", "py34;py<39"), ("pandas", "py36"), ), "tests": ( @@ -985,8 +985,7 @@ def get_path_env_var(env_var, default): "pexpect": (4,), ("trollius", "py<3;cpy"): (2, 2), "requests": (2, 31), - ("numpy", "py34"): (1,), - ("numpy", "py<3;cpy"): (1,), + ("numpy", "py39"): (1, 26), ("dataclasses", "py==36"): (0, 8), ("aenum", "py<34"): (3, 1, 15), "pydata-sphinx-theme": (0, 14), @@ -1003,16 +1002,18 @@ def get_path_env_var(env_var, default): ("pytest", "py36"): (7,), ("async_generator", "py35"): (1, 10), ("exceptiongroup", "py37;py<311"): (1,), - ("ipython", "py>=39"): (8, 15), + ("ipython", "py>=39"): (8, 16), } pinned_min_versions = { - # don't upgrade these; they breaks on Python 3.8 + # don't upgrade these; they break on Python 3.9 + ("numpy", "py34;py<39"): (1, 18), + # don't upgrade these; they break on Python 3.8 ("ipython", "py==38"): (8, 12), - # don't upgrade these; they breaks on Python 3.7 + # don't upgrade these; they break on Python 3.7 ("ipython", "py==37"): (7, 34), ("typing_extensions", "py==37"): (4, 7), - # don't upgrade these; they breaks on Python 3.6 + # don't upgrade these; they break on Python 3.6 ("xonsh", "py>=36;py<38"): (0, 11), ("pandas", "py36"): (1,), ("jupyter-client", "py36"): (7, 1, 2), @@ -1043,6 +1044,7 @@ def get_path_env_var(env_var, default): ("prompt_toolkit", "py<3"): (1,), "watchdog": (0, 10), "papermill": (1, 2), + ("numpy", "py<3;cpy"): (1, 16), # don't upgrade this; it breaks with old IPython versions ("jedi", "py<39"): (0, 17), # Coconut requires pyparsing 2 diff --git a/coconut/root.py b/coconut/root.py index 3800eda59..3f47c749a 100644 --- a/coconut/root.py +++ b/coconut/root.py @@ -26,7 +26,7 @@ VERSION = "3.0.3" VERSION_NAME = None # False for release, int >= 1 for develop -DEVELOP = 9 +DEVELOP = 10 ALPHA = False # for pre releases rather than post releases assert DEVELOP is False or DEVELOP >= 1, "DEVELOP must be False or an int >= 1" diff --git a/coconut/tests/main_test.py b/coconut/tests/main_test.py index bd094f15f..edc424bc5 100644 --- a/coconut/tests/main_test.py +++ b/coconut/tests/main_test.py @@ -89,8 +89,8 @@ # ----------------------------------------------------------------------------------------------------------------------- -default_recursion_limit = "6144" -default_stack_size = "6144" +default_recursion_limit = "7168" +default_stack_size = "7168" jupyter_timeout = 120 diff --git a/coconut/tests/src/extras.coco b/coconut/tests/src/extras.coco index fed27375d..4b08eb743 100644 --- a/coconut/tests/src/extras.coco +++ b/coconut/tests/src/extras.coco @@ -241,7 +241,7 @@ def f() = assert_raises(-> parse('"a" 10'), CoconutParseError, err_has=" \\~~~^") assert_raises(-> parse("A. ."), CoconutParseError, err_has=" \\~~^") assert_raises(-> parse('''f"""{ -}"""'''), CoconutSyntaxError, err_has=(" ~~~~|", "\n ^~~/")) +}"""'''), CoconutSyntaxError, err_has="parsing failed for format string expression") assert_raises(-> parse("f([] {})"), CoconutParseError, err_has=" \\~~~~^") assert_raises(-> parse("return = 1"), CoconutParseError, err_has='invalid use of the keyword "return"')