Merge pull request #88 from hsf-training/fix_dataload_uproot5

Fix tutorials and transfer a few more to notebooks

Author: jonas-eschle

.gitignore

@@ -3,9 +3,12 @@ _book/
 node_modules/
 *.pyc
 *.swp
+
 book.pdf
 analysis-essentials.pdf
 shell/files/data-shell.zip
 build
 .ipynb_checkpoints
-*~
+*~
+/.idea
+

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
-        args: ['--maxkb=1000']
+        args: [ '--maxkb=1000' ]
       - id: check-merge-conflict
       - id: check-case-conflict
       - id: check-symlinks
@@ -21,16 +21,19 @@ repos:
 
       - id: nbqa-pyupgrade
         additional_dependencies: [ pyupgrade ]
-        args: [ --py38-plus ]
-#
-#  - repo: https://github.com/ambv/black
-#    rev: 21.9b0
-#    hooks:
-#      - id: black
-#        args: [ --line-length=120 ]
-#
+        args: [ --py39-plus ]
+
   - repo: https://github.com/kynan/nbstripout
     rev: 0.8.1
     hooks:
       - id: nbstripout
+        args: [ --extra-keys=metadata.language_info.codemirror_mode.version metadata.kernelspec metadata.language_info.pygments_lexer metadata.language_info.version ]
+
+
+  # needs rust, only activate if needed
+#  - repo: https://github.com/shssoichiro/oxipng
+#    rev: v9.1.3
+#    hooks:
+#      - id: oxipng
+#        args: [ "--", "--best", "--strip", "all", "--quiet" ]
 

advanced-python/10Basics.ipynb

@@ -391,7 +391,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "{'a': 'b'}.get?"
+    "get?"
    ]
   },
   {
@@ -506,22 +506,14 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
+    "name": "ipython"
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.7"
+   "nbconvert_exporter": "python"
   },
   "nbsphinx": {
    "execute": "auto"

advanced-python/11AdvancedPython.ipynb

@@ -295,6 +295,8 @@
    "outputs": [],
    "source": [
     "# SOLUTION\n",
+    "\n",
+    "\n",
     "@contextlib.contextmanager\n",
     "def func(x):\n",
     "    yield x\n",
@@ -479,6 +481,8 @@
    "outputs": [],
    "source": [
     "# SOLUTION\n",
+    "\n",
+    "\n",
     "def timed_func(func):\n",
     "    def wrapped_func(*args, **kwargs):\n",
     "        print(args)\n",
@@ -965,22 +969,14 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
+    "name": "ipython"
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.7"
+   "nbconvert_exporter": "python"
   }
  },
  "nbformat": 4,

advanced-python/12AdvancedClasses.ipynb

@@ -503,22 +503,14 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
+    "name": "ipython"
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.7"
+   "nbconvert_exporter": "python"
   }
  },
  "nbformat": 4,