Workaround to get ipytest play nicely with 3.11

jerry-git · jerry-git · commit 5befce8e92c0 · 2023-04-20T10:13:38.000+03:00
See chmp/ipytest#93
diff --git a/notebooks/beginner/notebooks/08_testing1.ipynb b/notebooks/beginner/notebooks/08_testing1.ipynb
@@ -78,7 +78,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# This would be in your e.g. implementation.py\n",
     "def sum_of_three_numbers(num1, num2, num3):\n",
     "    return num1 + num2 + num3"
    ]
@@ -102,11 +101,7 @@
    "outputs": [],
    "source": [
     "%%ipytest\n",
-    "# Mention this at the top of cells which contain test(s)\n",
-    "# This is only required for running pytest in Jupyter notebooks\n",
     "\n",
-    "\n",
-    "# This would be in your test_implementation.py\n",
     "def test_sum_of_three_numbers():\n",
     "    # 1. Setup the variables used in the test\n",
     "    num1 = 2\n",
@@ -144,7 +139,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.3"
+   "version": "3.11.0"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/beginner/notebooks/16_testing2.ipynb b/notebooks/beginner/notebooks/16_testing2.ipynb
@@ -40,7 +40,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# This would be e.g. in person.py\n",
     "class Person:\n",
     "    def __init__(self, first_name, last_name, age):\n",
     "        self.first_name = first_name\n",
@@ -74,7 +73,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# This would be in either conftest.py or test_person.py\n",
     "import pytest\n",
     "\n",
     "\n",
@@ -99,7 +97,7 @@
    "source": [
     "%%ipytest\n",
     "\n",
-    "# These would be in test_person.py\n",
+    "\n",
     "def test_full_name(default_person): # Note: we use fixture as an argument of the test case\n",
     "    result = default_person.full_name\n",
     "    assert result == 'John Doe'\n",
@@ -147,7 +145,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# This would be e.g. in string_manipulate.py\n",
     "def replace_names(original_str, new_name):\n",
     "    \"\"\"Replaces names (uppercase words) of original_str by new_name\"\"\"\n",
     "    words = original_str.split()\n",
@@ -170,7 +167,7 @@
    "source": [
     "%%ipytest\n",
     "\n",
-    "# This would be in your test module\n",
+    "\n",
     "@pytest.mark.parametrize(\"original,new_name,expected\", [\n",
     "        ('this is Lisa', 'John Doe', 'this is John Doe'),\n",
     "        ('how about Frank and Amy', 'John', 'how about John and John'),\n",
@@ -180,13 +177,6 @@
     "    result = replace_names(original, new_name)\n",
     "    assert result == expected"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -205,7 +195,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.3"
+   "version": "3.11.0"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/intermediate/notebooks/01_pytest_fixtures.ipynb b/notebooks/intermediate/notebooks/01_pytest_fixtures.ipynb
@@ -83,23 +83,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "%%ipytest -s\n",
+    "\n",
+    "\n",
     "@pytest.fixture\n",
     "def my_fixture():\n",
     "    print(\"\\nmy_fixture is used\")\n",
-    "\n",
+    "  \n",
     "\n",
     "@pytest.fixture\n",
     "def other_fixture():\n",
-    "    return \"FOO\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%%ipytest -s\n",
+    "    return \"FOO\"\n",
+    "\n",
     "\n",
     "@pytest.mark.usefixtures('my_fixture')\n",
     "class TestMyStuff:\n",
@@ -258,7 +253,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# scope is function also by default\n",
     "@pytest.fixture(scope=\"function\")\n",
     "def func_fixture():\n",
     "    print(\"\\nfunc\")\n",
@@ -373,7 +367,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.3"
+   "version": "3.11.0"
   }
  },
  "nbformat": 4,
