diff --git a/Exercise_notebooks/Basic/basic1_use_jupyter/sources/Running code.ipynb b/Exercise_notebooks/Basic/basic1_use_jupyter/sources/Running code.ipynb index ca9b23f..f2973d9 100644 --- a/Exercise_notebooks/Basic/basic1_use_jupyter/sources/Running code.ipynb +++ b/Exercise_notebooks/Basic/basic1_use_jupyter/sources/Running code.ipynb @@ -241,11 +241,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/Basic/basic2_basics_plotting/py_exploratory_comp_2.ipynb b/Exercise_notebooks/Basic/basic2_basics_plotting/py_exploratory_comp_2.ipynb index a1b458c..713e50e 100644 --- a/Exercise_notebooks/Basic/basic2_basics_plotting/py_exploratory_comp_2.ipynb +++ b/Exercise_notebooks/Basic/basic2_basics_plotting/py_exploratory_comp_2.ipynb @@ -871,11 +871,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/Basic/basic3_arrays/py_exploratory_comp_3.ipynb b/Exercise_notebooks/Basic/basic3_arrays/py_exploratory_comp_3.ipynb index 11bb336..49e5b2b 100644 --- a/Exercise_notebooks/Basic/basic3_arrays/py_exploratory_comp_3.ipynb +++ b/Exercise_notebooks/Basic/basic3_arrays/py_exploratory_comp_3.ipynb @@ -897,11 +897,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/Basic/basic4_for_and_if/py_exploratory_comp_4.ipynb b/Exercise_notebooks/Basic/basic4_for_and_if/py_exploratory_comp_4.ipynb index 4082b41..9c2c760 100644 --- a/Exercise_notebooks/Basic/basic4_for_and_if/py_exploratory_comp_4.ipynb +++ b/Exercise_notebooks/Basic/basic4_for_and_if/py_exploratory_comp_4.ipynb @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], "source": [ @@ -41,9 +41,21 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 4, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Hello world, the value of i is 0\n", + "Hello world, the value of i is 1\n", + "Hello world, the value of i is 2\n", + "Hello world, the value of i is 3\n", + "Hello world, the value of i is 4\n" + ] + } + ], "source": [ "for i in [0, 1, 2, 3, 4]:\n", " print('Hello world, the value of i is', i)" @@ -58,9 +70,21 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 5, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "x, xsquare 0 0\n", + "x, xsquare 1 1\n", + "x, xsquare 2 4\n", + "x, xsquare 3 9\n", + "We are done with the loop\n" + ] + } + ], "source": [ "for x in [0, 1, 2, 3]: \n", " xsquared = x ** 2\n", @@ -77,9 +101,19 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "the value of data is: 20\n", + "the value of data is: mark\n", + "the value of data is: 3.1622776601683795\n" + ] + } + ], "source": [ "for data in [20, 'mark', np.sqrt(10)]:\n", " print('the value of data is:', data)" @@ -94,9 +128,26 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 7, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "the value of i is: 0\n", + "the value of i is: 1\n", + "the value of i is: 2\n", + "the value of i is: 3\n", + "the value of i is: 4\n", + "the value of i is: 5\n", + "the value of i is: 6\n", + "the value of i is: 7\n", + "the value of i is: 8\n", + "the value of i is: 9\n" + ] + } + ], "source": [ "for i in range(10):\n", " print('the value of i is:', i)" @@ -111,9 +162,19 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "a range with 10 values: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]\n", + "a range from 10 till 20 [10, 11, 12, 13, 14, 15, 16, 17, 18, 19]\n", + "a range from 10 till 20 with steps of 2: [10, 12, 14, 16, 18]\n" + ] + } + ], "source": [ "print('a range with 10 values:', list(range(10)))\n", "print('a range from 10 till 20', list(range(10, 20)))\n", @@ -129,9 +190,22 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 9, + "metadata": {}, + "outputs": [ + { + "data": { + "image/png": "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\n", + "text/plain": [ + "
" + ] + }, + "metadata": { + "needs_background": "light" + }, + "output_type": "display_data" + } + ], "source": [ "x = np.linspace(0, 2 * np.pi, 100)\n", "y = np.zeros_like(x) # similar to zeros(shape(x))\n", @@ -183,9 +257,20 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 10, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "starting value: 4\n", + "changing data in the first if-statement\n", + "value after the first if-statement: 6\n", + "value after the second if-statement: 6\n" + ] + } + ], "source": [ "data = 4\n", "print('starting value:', data)\n", @@ -216,9 +301,17 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 11, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "a is not smaller than 3\n" + ] + } + ], "source": [ "a = 4\n", "if a < 3:\n", @@ -236,9 +329,17 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 12, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "a is equal to 4\n" + ] + } + ], "source": [ "a = 4\n", "if a < 4:\n", @@ -258,9 +359,22 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 13, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Enter a value: 1\n", + "the entered value is smaller than 4\n", + "Enter a value: 1\n", + "the entered value is smaller than 4\n", + "Enter a value: 1\n", + "the entered value is smaller than 4\n" + ] + } + ], "source": [ "for i in range(3):\n", " a = float(input('Enter a value: '))\n", @@ -333,9 +447,25 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 14, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "i, datasum: 0 1\n", + "i, datasum: 1 4\n", + "i, datasum: 2 6\n", + "i, datasum: 3 11\n", + "i, datasum: 4 18\n", + "i, datasum: 5 21\n", + "i, datasum: 6 25\n", + "i, datasum: 7 27\n", + "total sum of data: 27\n" + ] + } + ], "source": [ "data = np.array([1, 3, 2, 5, 7, 3, 4, 2])\n", "datasum = 0\n", @@ -392,9 +522,18 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 15, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "the maximum value is 7\n", + "the index of the maximum value is 4\n" + ] + } + ], "source": [ "maxvalue = -1e8\n", "maxindex = None\n", @@ -415,9 +554,18 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 16, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "the maximum value is 7\n", + "the index of the maximum value is 4\n" + ] + } + ], "source": [ "print('the maximum value is ', np.max(data))\n", "print('the index of the maximum value is ', np.argmax(data))" @@ -455,9 +603,17 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 17, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[11. 22. 18.]\n" + ] + } + ], "source": [ "data = np.array([[1, 2, 3, 5],\n", " [4, 8, 6, 4],\n", @@ -482,9 +638,41 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 19, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "array([[1, 2, 3, 5],\n", + " [4, 8, 6, 4],\n", + " [3, 5, 4, 6]])" + ] + }, + "execution_count": 19, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "data" + ] + }, + { + "cell_type": "code", + "execution_count": 18, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "sum of entire array: 51\n", + "sum the rows (axis=0): [ 8 15 13 15]\n", + "sum the columns (axis=1): [11 22 18]\n" + ] + } + ], "source": [ "print('sum of entire array:', np.sum(data))\n", "print('sum the rows (axis=0):', np.sum(data, axis=0))\n", diff --git a/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Notebook Basics.ipynb b/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Notebook Basics.ipynb index 45638eb..95ef0cc 100644 --- a/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Notebook Basics.ipynb +++ b/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Notebook Basics.ipynb @@ -230,11 +230,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Running code.ipynb b/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Running code.ipynb index ca9b23f..f2973d9 100644 --- a/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Running code.ipynb +++ b/Exercise_notebooks/Basic/zz_alternative_basic/basic1_use_jupyter/sources/Running code.ipynb @@ -241,11 +241,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/Basic/zz_alternative_basic/basic2_numbers/01_numbers.ipynb b/Exercise_notebooks/Basic/zz_alternative_basic/basic2_numbers/01_numbers.ipynb index 5f416d1..01f2a79 100644 --- a/Exercise_notebooks/Basic/zz_alternative_basic/basic2_numbers/01_numbers.ipynb +++ b/Exercise_notebooks/Basic/zz_alternative_basic/basic2_numbers/01_numbers.ipynb @@ -168,11 +168,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/Basic/zz_alternative_basic/basic3_strings/02_strings.ipynb b/Exercise_notebooks/Basic/zz_alternative_basic/basic3_strings/02_strings.ipynb index 3fd0c0a..5a55d81 100644 --- a/Exercise_notebooks/Basic/zz_alternative_basic/basic3_strings/02_strings.ipynb +++ b/Exercise_notebooks/Basic/zz_alternative_basic/basic3_strings/02_strings.ipynb @@ -362,11 +362,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/03_lists.ipynb b/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/03_lists.ipynb index f0d936a..1ed4ae9 100644 --- a/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/03_lists.ipynb +++ b/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/03_lists.ipynb @@ -294,11 +294,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/04_dictionaries.ipynb b/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/04_dictionaries.ipynb index 85d1832..8252831 100644 --- a/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/04_dictionaries.ipynb +++ b/Exercise_notebooks/Basic/zz_alternative_basic/basic4_collections/04_dictionaries.ipynb @@ -296,11 +296,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/01_Pandas/02_py_exploratory_comp_8.ipynb b/Exercise_notebooks/On_topic/01_Pandas/02_py_exploratory_comp_8.ipynb index e7fe09f..6f98dd2 100644 --- a/Exercise_notebooks/On_topic/01_Pandas/02_py_exploratory_comp_8.ipynb +++ b/Exercise_notebooks/On_topic/01_Pandas/02_py_exploratory_comp_8.ipynb @@ -812,11 +812,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/01_Pandas/03_pandas_methods_vs_functions.ipynb b/Exercise_notebooks/On_topic/01_Pandas/03_pandas_methods_vs_functions.ipynb index 8be90ca..6f0067f 100644 --- a/Exercise_notebooks/On_topic/01_Pandas/03_pandas_methods_vs_functions.ipynb +++ b/Exercise_notebooks/On_topic/01_Pandas/03_pandas_methods_vs_functions.ipynb @@ -105,11 +105,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/02_matplotlib/01_matplotlib.ipynb b/Exercise_notebooks/On_topic/02_matplotlib/01_matplotlib.ipynb index a5d6a7b..c53da88 100644 --- a/Exercise_notebooks/On_topic/02_matplotlib/01_matplotlib.ipynb +++ b/Exercise_notebooks/On_topic/02_matplotlib/01_matplotlib.ipynb @@ -63,7 +63,7 @@ "metadata": {}, "source": [ "## 2. [Basic plot](#top)\n", - "A basic plot can be made with the `plt.plot()` function. This function returns a `matplotlib.lines.Line2D` object." + "A basic plot can be made with the `plt.plot()` function. This function returns a `matplotlib.lines.Line2D` object as can be seen in the example below." ] }, { @@ -72,7 +72,7 @@ "metadata": {}, "outputs": [], "source": [ - "l, = plt.plot([1,2,3],[3,7,5])" + "plt.plot([1,2,3],[3,7,5])" ] }, { @@ -91,10 +91,12 @@ "outputs": [], "source": [ "# method 1\n", + "\n", + "fig, ax = plt.subplots()\n", + "\n", "x = np.linspace(0, 10, 500)\n", "dashes = [10, 5, 100, 5] # 10 points on, 5 off, 100 on, 5 off\n", "\n", - "fig, ax = plt.subplots()\n", "line1, = ax.plot(x, np.sin(x), '--', linewidth=2,\n", " label='Dashes set retroactively')\n", "line1.set_dashes(dashes)\n", @@ -140,11 +142,11 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Maybe you ask yourself: What is the difference between these methods? Which one should I use?\n", + "Maybe you ask yourself: Why are there different methods that do the same thing? Which one should I use?\n", "\n", "The first method (`fig, ax = plt.subplots()`) is an **explicit** method. You create a figure with axes explicitly and then you add the plot to the axes. The second method (with `plt.plot()`) is an **implicit** method. When you call `plt.plot()` is looks for an active figure and adds the plot to this figure. If there is no active figure it will create one.\n", "\n", - "The image below shows the different building elements of a plot figure. Notice the difference between 'axes' and 'axis'. One figure can have multiple plots (or axes) and axes can have multiple axis (usually an x-axis and an y-axis).\n", + "The image below shows the different building elements of a plot figure. Notice the difference between 'axes' and 'axis'. One figure can have multiple axes and axes can have multiple axis (usually an x-axis and an y-axis).\n", "\n", "" ] @@ -237,11 +239,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/02_matplotlib/02_py_exploratory_comp_1.ipynb b/Exercise_notebooks/On_topic/02_matplotlib/02_py_exploratory_comp_1.ipynb index 0b92af4..6484481 100644 --- a/Exercise_notebooks/On_topic/02_matplotlib/02_py_exploratory_comp_1.ipynb +++ b/Exercise_notebooks/On_topic/02_matplotlib/02_py_exploratory_comp_1.ipynb @@ -638,11 +638,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/03_for_loops/01_for-loops_basic.ipynb b/Exercise_notebooks/On_topic/03_for_loops/01_for-loops_basic.ipynb index 939303a..de80ed9 100644 --- a/Exercise_notebooks/On_topic/03_for_loops/01_for-loops_basic.ipynb +++ b/Exercise_notebooks/On_topic/03_for_loops/01_for-loops_basic.ipynb @@ -638,11 +638,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/03_for_loops/02_for_loops.ipynb b/Exercise_notebooks/On_topic/03_for_loops/02_for_loops.ipynb index 6eff982..2da68a0 100644 --- a/Exercise_notebooks/On_topic/03_for_loops/02_for_loops.ipynb +++ b/Exercise_notebooks/On_topic/03_for_loops/02_for_loops.ipynb @@ -149,11 +149,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/04_if_statements/01_conditionals.ipynb b/Exercise_notebooks/On_topic/04_if_statements/01_conditionals.ipynb index 19f2015..dd860cc 100644 --- a/Exercise_notebooks/On_topic/04_if_statements/01_conditionals.ipynb +++ b/Exercise_notebooks/On_topic/04_if_statements/01_conditionals.ipynb @@ -269,11 +269,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/05_Numpy/01-numpy.ipynb b/Exercise_notebooks/On_topic/05_Numpy/01-numpy.ipynb index 202adeb..102fe25 100644 --- a/Exercise_notebooks/On_topic/05_Numpy/01-numpy.ipynb +++ b/Exercise_notebooks/On_topic/05_Numpy/01-numpy.ipynb @@ -885,11 +885,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 0 } diff --git a/Exercise_notebooks/On_topic/05_Numpy/02-linear_equations_mb6.ipynb b/Exercise_notebooks/On_topic/05_Numpy/02-linear_equations_mb6.ipynb index 0b275f0..9913087 100644 --- a/Exercise_notebooks/On_topic/05_Numpy/02-linear_equations_mb6.ipynb +++ b/Exercise_notebooks/On_topic/05_Numpy/02-linear_equations_mb6.ipynb @@ -964,11 +964,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/06_Functions/01_functions.ipynb b/Exercise_notebooks/On_topic/06_Functions/01_functions.ipynb index 07cd559..078fc16 100644 --- a/Exercise_notebooks/On_topic/06_Functions/01_functions.ipynb +++ b/Exercise_notebooks/On_topic/06_Functions/01_functions.ipynb @@ -228,11 +228,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/07_Object_oriented/00 - theorievoorbeeld.ipynb b/Exercise_notebooks/On_topic/07_Object_oriented/00 - theorievoorbeeld.ipynb index 7713802..fc60c31 100644 --- a/Exercise_notebooks/On_topic/07_Object_oriented/00 - theorievoorbeeld.ipynb +++ b/Exercise_notebooks/On_topic/07_Object_oriented/00 - theorievoorbeeld.ipynb @@ -154,11 +154,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/07_Object_oriented/01_py_exploratory_comp_12_sol.ipynb b/Exercise_notebooks/On_topic/07_Object_oriented/01_py_exploratory_comp_12_sol.ipynb index 7ed08ea..6df6c90 100644 --- a/Exercise_notebooks/On_topic/07_Object_oriented/01_py_exploratory_comp_12_sol.ipynb +++ b/Exercise_notebooks/On_topic/07_Object_oriented/01_py_exploratory_comp_12_sol.ipynb @@ -659,11 +659,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 0 } diff --git a/Exercise_notebooks/On_topic/07_Object_oriented/02_classes.ipynb b/Exercise_notebooks/On_topic/07_Object_oriented/02_classes.ipynb index 0b91719..8171bd2 100644 --- a/Exercise_notebooks/On_topic/07_Object_oriented/02_classes.ipynb +++ b/Exercise_notebooks/On_topic/07_Object_oriented/02_classes.ipynb @@ -308,11 +308,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/08_GIS/GIS_pyshp.ipynb b/Exercise_notebooks/On_topic/08_GIS/GIS_pyshp.ipynb index 0c94ae5..58b6906 100644 --- a/Exercise_notebooks/On_topic/08_GIS/GIS_pyshp.ipynb +++ b/Exercise_notebooks/On_topic/08_GIS/GIS_pyshp.ipynb @@ -271,11 +271,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/08_GIS/Geopandas.ipynb b/Exercise_notebooks/On_topic/08_GIS/Geopandas.ipynb index 64bbe60..e4fbe4b 100644 --- a/Exercise_notebooks/On_topic/08_GIS/Geopandas.ipynb +++ b/Exercise_notebooks/On_topic/08_GIS/Geopandas.ipynb @@ -622,11 +622,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/08_GIS/introduction_raster_IO.ipynb b/Exercise_notebooks/On_topic/08_GIS/introduction_raster_IO.ipynb index f184d6f..1830abd 100644 --- a/Exercise_notebooks/On_topic/08_GIS/introduction_raster_IO.ipynb +++ b/Exercise_notebooks/On_topic/08_GIS/introduction_raster_IO.ipynb @@ -472,11 +472,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_resized.dbf b/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_resized.dbf index 469480c..2f4317e 100644 Binary files a/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_resized.dbf and b/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_resized.dbf differ diff --git a/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_v2.dbf b/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_v2.dbf index 469480c..2f4317e 100644 Binary files a/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_v2.dbf and b/Exercise_notebooks/On_topic/08_GIS/shapefiles/Rotterdam_centraal_v2.dbf differ diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/01_best_practices.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/01_best_practices.ipynb index 8ba23d5..94f0e4c 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/01_best_practices.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/01_best_practices.ipynb @@ -514,11 +514,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/03_Quality_ZEN_of_Python.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/03_Quality_ZEN_of_Python.ipynb index 1a7e012..1553428 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/03_Quality_ZEN_of_Python.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/03_Quality_ZEN_of_Python.ipynb @@ -123,7 +123,7 @@ "[1.0, 4.0]" ] }, - "execution_count": 1, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -151,7 +151,7 @@ "[1.0, 4.0]" ] }, - "execution_count": 1, + "execution_count": 4, "metadata": {}, "output_type": "execute_result" } @@ -491,7 +491,7 @@ "False" ] }, - "execution_count": 1, + "execution_count": 15, "metadata": {}, "output_type": "execute_result" } @@ -533,7 +533,7 @@ "True" ] }, - "execution_count": 1, + "execution_count": 16, "metadata": {}, "output_type": "execute_result" } diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_dicts.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_dicts.ipynb index ea8854a..8822a81 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_dicts.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_dicts.ipynb @@ -316,11 +316,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_loops.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_loops.ipynb index df01907..273284a 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_loops.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_loops.ipynb @@ -360,11 +360,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc1.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc1.ipynb index 70101c3..79bfa0d 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc1.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc1.ipynb @@ -590,11 +590,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc2.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc2.ipynb index d864bf9..91d6a8a 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc2.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_misc2.ipynb @@ -525,11 +525,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_python_exercise.ipynb b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_python_exercise.ipynb index 83d2aa4..6155ccd 100644 --- a/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_python_exercise.ipynb +++ b/Exercise_notebooks/On_topic/09_Code_Quality/04_idiomatic/idiomatic_python_exercise.ipynb @@ -306,11 +306,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/10_data_types/collections/03_lists.ipynb b/Exercise_notebooks/On_topic/10_data_types/collections/03_lists.ipynb index f0d936a..1ed4ae9 100644 --- a/Exercise_notebooks/On_topic/10_data_types/collections/03_lists.ipynb +++ b/Exercise_notebooks/On_topic/10_data_types/collections/03_lists.ipynb @@ -294,11 +294,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/10_data_types/collections/04_dictionaries.ipynb b/Exercise_notebooks/On_topic/10_data_types/collections/04_dictionaries.ipynb index 85d1832..8252831 100644 --- a/Exercise_notebooks/On_topic/10_data_types/collections/04_dictionaries.ipynb +++ b/Exercise_notebooks/On_topic/10_data_types/collections/04_dictionaries.ipynb @@ -296,11 +296,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/10_data_types/numbers/01_numbers.ipynb b/Exercise_notebooks/On_topic/10_data_types/numbers/01_numbers.ipynb index 5f416d1..01f2a79 100644 --- a/Exercise_notebooks/On_topic/10_data_types/numbers/01_numbers.ipynb +++ b/Exercise_notebooks/On_topic/10_data_types/numbers/01_numbers.ipynb @@ -168,11 +168,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/10_data_types/strings/02_strings.ipynb b/Exercise_notebooks/On_topic/10_data_types/strings/02_strings.ipynb index 3fd0c0a..5a55d81 100644 --- a/Exercise_notebooks/On_topic/10_data_types/strings/02_strings.ipynb +++ b/Exercise_notebooks/On_topic/10_data_types/strings/02_strings.ipynb @@ -362,11 +362,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/11_read_write_text_files/02_file_io.ipynb b/Exercise_notebooks/On_topic/11_read_write_text_files/02_file_io.ipynb index 7ce71e0..52b2ed8 100644 --- a/Exercise_notebooks/On_topic/11_read_write_text_files/02_file_io.ipynb +++ b/Exercise_notebooks/On_topic/11_read_write_text_files/02_file_io.ipynb @@ -150,11 +150,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/11_read_write_text_files/03-files.ipynb b/Exercise_notebooks/On_topic/11_read_write_text_files/03-files.ipynb index f390e6a..8aa41dc 100644 --- a/Exercise_notebooks/On_topic/11_read_write_text_files/03-files.ipynb +++ b/Exercise_notebooks/On_topic/11_read_write_text_files/03-files.ipynb @@ -106,11 +106,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/11_read_write_text_files/05-input-output.ipynb b/Exercise_notebooks/On_topic/11_read_write_text_files/05-input-output.ipynb index c52d083..9e440a6 100644 --- a/Exercise_notebooks/On_topic/11_read_write_text_files/05-input-output.ipynb +++ b/Exercise_notebooks/On_topic/11_read_write_text_files/05-input-output.ipynb @@ -782,11 +782,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/12_Databases/02-IntroSQLJoins.ipynb b/Exercise_notebooks/On_topic/12_Databases/02-IntroSQLJoins.ipynb index 6b1a9d2..3ea6fbf 100644 --- a/Exercise_notebooks/On_topic/12_Databases/02-IntroSQLJoins.ipynb +++ b/Exercise_notebooks/On_topic/12_Databases/02-IntroSQLJoins.ipynb @@ -212,11 +212,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5.ipynb b/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5.ipynb index 9d9255b..517ab86 100644 --- a/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5.ipynb +++ b/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5.ipynb @@ -513,11 +513,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5_sol.ipynb b/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5_sol.ipynb index 8ceea32..10cff42 100644 --- a/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5_sol.ipynb +++ b/Exercise_notebooks/On_topic/13_scipy_optimize/scipy_optimize_mb5_sol.ipynb @@ -513,11 +513,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 0 } diff --git a/Exercise_notebooks/On_topic/14_Errors/02_exceptions.ipynb b/Exercise_notebooks/On_topic/14_Errors/02_exceptions.ipynb index 93d6b33..1a1c7fe 100644 --- a/Exercise_notebooks/On_topic/14_Errors/02_exceptions.ipynb +++ b/Exercise_notebooks/On_topic/14_Errors/02_exceptions.ipynb @@ -136,11 +136,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/15_datetime/01_datetime.ipynb b/Exercise_notebooks/On_topic/15_datetime/01_datetime.ipynb index 3b438dc..7b35be6 100644 --- a/Exercise_notebooks/On_topic/15_datetime/01_datetime.ipynb +++ b/Exercise_notebooks/On_topic/15_datetime/01_datetime.ipynb @@ -164,11 +164,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/16_creating_programs/01-cmdline.ipynb b/Exercise_notebooks/On_topic/16_creating_programs/01-cmdline.ipynb index 8bfe6ed..e50ea73 100644 --- a/Exercise_notebooks/On_topic/16_creating_programs/01-cmdline.ipynb +++ b/Exercise_notebooks/On_topic/16_creating_programs/01-cmdline.ipynb @@ -691,11 +691,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 0 } diff --git a/Exercise_notebooks/On_topic/17_debugging/01-debugging.ipynb b/Exercise_notebooks/On_topic/17_debugging/01-debugging.ipynb index 7abede9..f02c613 100644 --- a/Exercise_notebooks/On_topic/17_debugging/01-debugging.ipynb +++ b/Exercise_notebooks/On_topic/17_debugging/01-debugging.ipynb @@ -87,11 +87,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/17_debugging/02-debugging.ipynb b/Exercise_notebooks/On_topic/17_debugging/02-debugging.ipynb index 76cab63..f1d02e5 100644 --- a/Exercise_notebooks/On_topic/17_debugging/02-debugging.ipynb +++ b/Exercise_notebooks/On_topic/17_debugging/02-debugging.ipynb @@ -276,11 +276,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/18_modules_and_packages/01_modules_and_packages.ipynb b/Exercise_notebooks/On_topic/18_modules_and_packages/01_modules_and_packages.ipynb index 44ebaa1..cb1beba 100644 --- a/Exercise_notebooks/On_topic/18_modules_and_packages/01_modules_and_packages.ipynb +++ b/Exercise_notebooks/On_topic/18_modules_and_packages/01_modules_and_packages.ipynb @@ -110,11 +110,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/00 - Introduction and Setup.ipynb b/Exercise_notebooks/On_topic/19_bokeh/00 - Introduction and Setup.ipynb index 54906f6..56f0b8d 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/00 - Introduction and Setup.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/00 - Introduction and Setup.ipynb @@ -216,11 +216,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/01 - Basic Plotting.ipynb b/Exercise_notebooks/On_topic/19_bokeh/01 - Basic Plotting.ipynb index 15cc4e7..dd6ef26 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/01 - Basic Plotting.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/01 - Basic Plotting.ipynb @@ -564,11 +564,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/02 - Styling and Theming.ipynb b/Exercise_notebooks/On_topic/19_bokeh/02 - Styling and Theming.ipynb index 6280b23..4e16feb 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/02 - Styling and Theming.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/02 - Styling and Theming.ipynb @@ -577,11 +577,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/03 - Data Sources and Transformations.ipynb b/Exercise_notebooks/On_topic/19_bokeh/03 - Data Sources and Transformations.ipynb index a3360b0..cbe6816 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/03 - Data Sources and Transformations.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/03 - Data Sources and Transformations.ipynb @@ -338,11 +338,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/04 - Adding Annotations.ipynb b/Exercise_notebooks/On_topic/19_bokeh/04 - Adding Annotations.ipynb index b038709..a8cf7c7 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/04 - Adding Annotations.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/04 - Adding Annotations.ipynb @@ -451,11 +451,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/05 - Presentation Layouts.ipynb b/Exercise_notebooks/On_topic/19_bokeh/05 - Presentation Layouts.ipynb index e9afa20..a6b34db 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/05 - Presentation Layouts.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/05 - Presentation Layouts.ipynb @@ -165,11 +165,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/06 - Linking and Interactions.ipynb b/Exercise_notebooks/On_topic/19_bokeh/06 - Linking and Interactions.ipynb index 695e3c2..334d4d3 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/06 - Linking and Interactions.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/06 - Linking and Interactions.ipynb @@ -494,11 +494,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/07 - Bar and Categorical Data Plots.ipynb b/Exercise_notebooks/On_topic/19_bokeh/07 - Bar and Categorical Data Plots.ipynb index 8ce72ef..8a372fa 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/07 - Bar and Categorical Data Plots.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/07 - Bar and Categorical Data Plots.ipynb @@ -535,11 +535,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/08 - Graph and Network Plots.ipynb b/Exercise_notebooks/On_topic/19_bokeh/08 - Graph and Network Plots.ipynb index 37b5fb0..4f22427 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/08 - Graph and Network Plots.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/08 - Graph and Network Plots.ipynb @@ -219,11 +219,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/19_bokeh/11 - Running Bokeh Applications.ipynb b/Exercise_notebooks/On_topic/19_bokeh/11 - Running Bokeh Applications.ipynb index ff39a52..252fb08 100644 --- a/Exercise_notebooks/On_topic/19_bokeh/11 - Running Bokeh Applications.ipynb +++ b/Exercise_notebooks/On_topic/19_bokeh/11 - Running Bokeh Applications.ipynb @@ -369,11 +369,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium01_and_mplleaflet.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium01_and_mplleaflet.ipynb index d0eaacd..0a99909 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium01_and_mplleaflet.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium01_and_mplleaflet.ipynb @@ -217,11 +217,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium02_CheckZorder.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium02_CheckZorder.ipynb index b88952b..bb744fa 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium02_CheckZorder.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium02_CheckZorder.ipynb @@ -67,11 +67,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium03_Colormaps.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium03_Colormaps.ipynb index f92acf4..038ebf2 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium03_Colormaps.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium03_Colormaps.ipynb @@ -386,11 +386,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium04_ContinuousWorld.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium04_ContinuousWorld.ipynb index 89c645c..feb80fb 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium04_ContinuousWorld.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium04_ContinuousWorld.ipynb @@ -104,11 +104,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium05_ControlScale.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium05_ControlScale.ipynb index 2fbbaab..1a13c7c 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium05_ControlScale.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium05_ControlScale.ipynb @@ -35,11 +35,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium06_FloatImage.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium06_FloatImage.ipynb index b035873..b3d5de5 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium06_FloatImage.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium06_FloatImage.ipynb @@ -40,11 +40,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/20_folium/Folium07_WMS_and_WMTS.ipynb b/Exercise_notebooks/On_topic/20_folium/Folium07_WMS_and_WMTS.ipynb index 81f0628..dc9bf41 100644 --- a/Exercise_notebooks/On_topic/20_folium/Folium07_WMS_and_WMTS.ipynb +++ b/Exercise_notebooks/On_topic/20_folium/Folium07_WMS_and_WMTS.ipynb @@ -78,11 +78,7 @@ "source": [] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 1 } diff --git a/Exercise_notebooks/On_topic/24_pastas/1_basic_pastas_model.ipynb b/Exercise_notebooks/On_topic/24_pastas/1_basic_pastas_model.ipynb index 0eeed15..6046152 100644 --- a/Exercise_notebooks/On_topic/24_pastas/1_basic_pastas_model.ipynb +++ b/Exercise_notebooks/On_topic/24_pastas/1_basic_pastas_model.ipynb @@ -711,11 +711,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/24_pastas/2_external_stresses.ipynb b/Exercise_notebooks/On_topic/24_pastas/2_external_stresses.ipynb index 95e35f7..851d240 100644 --- a/Exercise_notebooks/On_topic/24_pastas/2_external_stresses.ipynb +++ b/Exercise_notebooks/On_topic/24_pastas/2_external_stresses.ipynb @@ -817,11 +817,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/24_pastas/3_stressmodels.ipynb b/Exercise_notebooks/On_topic/24_pastas/3_stressmodels.ipynb index 34342ec..a7adc17 100644 --- a/Exercise_notebooks/On_topic/24_pastas/3_stressmodels.ipynb +++ b/Exercise_notebooks/On_topic/24_pastas/3_stressmodels.ipynb @@ -758,11 +758,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 4 } diff --git a/Exercise_notebooks/On_topic/24_pastas/4_pastas_project.ipynb b/Exercise_notebooks/On_topic/24_pastas/4_pastas_project.ipynb index dd92368..6c583e9 100644 --- a/Exercise_notebooks/On_topic/24_pastas/4_pastas_project.ipynb +++ b/Exercise_notebooks/On_topic/24_pastas/4_pastas_project.ipynb @@ -623,11 +623,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/25_testing/01-testing.ipynb b/Exercise_notebooks/On_topic/25_testing/01-testing.ipynb index ce1772f..430cb76 100644 --- a/Exercise_notebooks/On_topic/25_testing/01-testing.ipynb +++ b/Exercise_notebooks/On_topic/25_testing/01-testing.ipynb @@ -128,11 +128,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Exercise_notebooks/On_topic/25_testing/02-testing2.ipynb b/Exercise_notebooks/On_topic/25_testing/02-testing2.ipynb index de56c19..634e8de 100644 --- a/Exercise_notebooks/On_topic/25_testing/02-testing2.ipynb +++ b/Exercise_notebooks/On_topic/25_testing/02-testing2.ipynb @@ -178,11 +178,7 @@ ] } ], - "metadata": { - "language_info": { - "name": "python" - } - }, + "metadata": {}, "nbformat": 4, "nbformat_minor": 2 } diff --git a/Practical_examples/congress_twitter_analysis/congress_twitter_analysis.ipynb b/Practical_examples/congress_twitter_analysis/congress_twitter_analysis.ipynb index cee960c..37ceacf 100644 --- a/Practical_examples/congress_twitter_analysis/congress_twitter_analysis.ipynb +++ b/Practical_examples/congress_twitter_analysis/congress_twitter_analysis.ipynb @@ -863,7 +863,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.9" + "version": "3.7.6" } }, "nbformat": 4, diff --git a/autotest/__pycache__/test_notebooks.cpython-36-PYTEST.pyc b/autotest/__pycache__/test_notebooks.cpython-36-PYTEST.pyc deleted file mode 100644 index a1e91aa..0000000 Binary files a/autotest/__pycache__/test_notebooks.cpython-36-PYTEST.pyc and /dev/null differ diff --git a/autotest/__pycache__/test_notebooks.cpython-36.pyc b/autotest/__pycache__/test_notebooks.cpython-36.pyc deleted file mode 100644 index 5d1ef34..0000000 Binary files a/autotest/__pycache__/test_notebooks.cpython-36.pyc and /dev/null differ diff --git a/autotest/create_tests.py b/autotest/create_tests.py index 26b56d7..89ac2c1 100644 --- a/autotest/create_tests.py +++ b/autotest/create_tests.py @@ -180,7 +180,7 @@ def _create_test_func(nb_name, nb_path, clearoutput=True): ' os.chdir(cwd)\n'\ ' raise(e)\n'\ ' assert out == 0\n'\ - f' return 1\n' + f' return out\n' return nb_func diff --git a/autotest/test_func.py b/autotest/test_func.py index 7d28e7b..2b56e69 100644 --- a/autotest/test_func.py +++ b/autotest/test_func.py @@ -116,6 +116,7 @@ def clear_output(fname): """ nb = nbformat.read(fname, nbformat.NO_CONVERT) + nb['metadata'] = {} for cell in nb.cells: if hasattr(cell, "outputs"):