Merge pull request #412 from pep-dortmund/2024_revision_before_2024

2024 revision before 2024
pep-dortmund · Sep 22, 2024 · 759c535 · 759c535
2 parents 238ff8f + 5a9e15e
commit 759c535
Show file tree

Hide file tree

Showing 45 changed files with 7 additions and 6 deletions.
diff --git a/exercises-toolbox/.gitignore b/exercises-toolbox/.gitignore
@@ -2,3 +2,4 @@
 *.dummy
 vorlage.py
 FB53-Coronafallzahlen.csv
+4-scipy/3-polyfit/daten.txt
diff --git a/exercises-toolbox/7-git/aufgabe.txt → exercises-toolbox/6-git/aufgabe.txt b/exercises-toolbox/7-git/aufgabe.txt → exercises-toolbox/6-git/aufgabe.txt
diff --git a/exercises-toolbox/7-git/repo/HEAD → exercises-toolbox/6-git/repo/HEAD b/exercises-toolbox/7-git/repo/HEAD → exercises-toolbox/6-git/repo/HEAD
diff --git a/exercises-toolbox/7-git/repo/config → exercises-toolbox/6-git/repo/config b/exercises-toolbox/7-git/repo/config → exercises-toolbox/6-git/repo/config
diff --git a/exercises-toolbox/7-git/repo/description → exercises-toolbox/6-git/repo/description b/exercises-toolbox/7-git/repo/description → exercises-toolbox/6-git/repo/description
diff --git a/...ox/7-git/repo/hooks/applypatch-msg.sample → ...ox/6-git/repo/hooks/applypatch-msg.sample b/...ox/7-git/repo/hooks/applypatch-msg.sample → ...ox/6-git/repo/hooks/applypatch-msg.sample
diff --git a/...oolbox/7-git/repo/hooks/commit-msg.sample → ...oolbox/6-git/repo/hooks/commit-msg.sample b/...oolbox/7-git/repo/hooks/commit-msg.sample → ...oolbox/6-git/repo/hooks/commit-msg.sample
diff --git a/...olbox/7-git/repo/hooks/post-update.sample → ...olbox/6-git/repo/hooks/post-update.sample b/...olbox/7-git/repo/hooks/post-update.sample → ...olbox/6-git/repo/hooks/post-update.sample
diff --git a/...ox/7-git/repo/hooks/pre-applypatch.sample → ...ox/6-git/repo/hooks/pre-applypatch.sample b/...ox/7-git/repo/hooks/pre-applypatch.sample → ...ox/6-git/repo/hooks/pre-applypatch.sample
diff --git a/...oolbox/7-git/repo/hooks/pre-commit.sample → ...oolbox/6-git/repo/hooks/pre-commit.sample b/...oolbox/7-git/repo/hooks/pre-commit.sample → ...oolbox/6-git/repo/hooks/pre-commit.sample
diff --git a/...-toolbox/7-git/repo/hooks/pre-push.sample → ...-toolbox/6-git/repo/hooks/pre-push.sample b/...-toolbox/7-git/repo/hooks/pre-push.sample → ...-toolbox/6-git/repo/hooks/pre-push.sample
diff --git a/...oolbox/7-git/repo/hooks/pre-rebase.sample → ...oolbox/6-git/repo/hooks/pre-rebase.sample b/...oolbox/7-git/repo/hooks/pre-rebase.sample → ...oolbox/6-git/repo/hooks/pre-rebase.sample
diff --git a/...-git/repo/hooks/prepare-commit-msg.sample → ...-git/repo/hooks/prepare-commit-msg.sample b/...-git/repo/hooks/prepare-commit-msg.sample → ...-git/repo/hooks/prepare-commit-msg.sample
diff --git a/...es-toolbox/7-git/repo/hooks/update.sample → ...es-toolbox/6-git/repo/hooks/update.sample b/...es-toolbox/7-git/repo/hooks/update.sample → ...es-toolbox/6-git/repo/hooks/update.sample
diff --git a/exercises-toolbox/7-git/repo/info/exclude → exercises-toolbox/6-git/repo/info/exclude b/exercises-toolbox/7-git/repo/info/exclude → exercises-toolbox/6-git/repo/info/exclude
diff --git a/...08/12ad76f0973724e371b34d1d4ce0f94a1f8116 → ...08/12ad76f0973724e371b34d1d4ce0f94a1f8116 b/...08/12ad76f0973724e371b34d1d4ce0f94a1f8116 → ...08/12ad76f0973724e371b34d1d4ce0f94a1f8116
diff --git a/...31/0ad6d3e3742ee979b82278b5cc1f876603ce31 → ...31/0ad6d3e3742ee979b82278b5cc1f876603ce31 b/...31/0ad6d3e3742ee979b82278b5cc1f876603ce31 → ...31/0ad6d3e3742ee979b82278b5cc1f876603ce31
diff --git a/...3e/e8a5721ac10476e0c823f67fc56e62ac4f5cea → ...3e/e8a5721ac10476e0c823f67fc56e62ac4f5cea b/...3e/e8a5721ac10476e0c823f67fc56e62ac4f5cea → ...3e/e8a5721ac10476e0c823f67fc56e62ac4f5cea
diff --git a/...49/c601bc19da81a83a205449e4897f19ba7a3206 → ...49/c601bc19da81a83a205449e4897f19ba7a3206 b/...49/c601bc19da81a83a205449e4897f19ba7a3206 → ...49/c601bc19da81a83a205449e4897f19ba7a3206
diff --git a/...66/c41ab8a887f27f8bebcd305411df5326c8c9ed → ...66/c41ab8a887f27f8bebcd305411df5326c8c9ed b/...66/c41ab8a887f27f8bebcd305411df5326c8c9ed → ...66/c41ab8a887f27f8bebcd305411df5326c8c9ed
diff --git a/...74/4809e58151727928bd7c2b817ae0b013b60abd → ...74/4809e58151727928bd7c2b817ae0b013b60abd b/...74/4809e58151727928bd7c2b817ae0b013b60abd → ...74/4809e58151727928bd7c2b817ae0b013b60abd
diff --git a/...93/98763c2fc0165a7739e58b5612234e0a9a0b2f → ...93/98763c2fc0165a7739e58b5612234e0a9a0b2f b/...93/98763c2fc0165a7739e58b5612234e0a9a0b2f → ...93/98763c2fc0165a7739e58b5612234e0a9a0b2f
diff --git a/...9d/67a8c6b9ac9c9749720797ad3c51031906bf22 → ...9d/67a8c6b9ac9c9749720797ad3c51031906bf22 b/...9d/67a8c6b9ac9c9749720797ad3c51031906bf22 → ...9d/67a8c6b9ac9c9749720797ad3c51031906bf22
diff --git a/...9e/4a210068506c9c80685f2972657beb1e7e9baf → ...9e/4a210068506c9c80685f2972657beb1e7e9baf b/...9e/4a210068506c9c80685f2972657beb1e7e9baf → ...9e/4a210068506c9c80685f2972657beb1e7e9baf
diff --git a/...ab/a966bc5470ff40518141076d239d80752c7c45 → ...ab/a966bc5470ff40518141076d239d80752c7c45 b/...ab/a966bc5470ff40518141076d239d80752c7c45 → ...ab/a966bc5470ff40518141076d239d80752c7c45
diff --git a/...b0/566c0142bc9889bd683c21a0819f264628f0f2 → ...b0/566c0142bc9889bd683c21a0819f264628f0f2 b/...b0/566c0142bc9889bd683c21a0819f264628f0f2 → ...b0/566c0142bc9889bd683c21a0819f264628f0f2
diff --git a/...bd/e6fe651d9c6da730f477c1d6e7f1a836030af9 → ...bd/e6fe651d9c6da730f477c1d6e7f1a836030af9 b/...bd/e6fe651d9c6da730f477c1d6e7f1a836030af9 → ...bd/e6fe651d9c6da730f477c1d6e7f1a836030af9
diff --git a/...d5/f152a8469657041b4d51e932210ecd2d65b6d6 → ...d5/f152a8469657041b4d51e932210ecd2d65b6d6 b/...d5/f152a8469657041b4d51e932210ecd2d65b6d6 → ...d5/f152a8469657041b4d51e932210ecd2d65b6d6
diff --git a/...e0/2d436b047c6a0bacd25bfa9239590001b5f58e → ...e0/2d436b047c6a0bacd25bfa9239590001b5f58e b/...e0/2d436b047c6a0bacd25bfa9239590001b5f58e → ...e0/2d436b047c6a0bacd25bfa9239590001b5f58e
diff --git a/...e0/809ac6648cae33e48e1eb04a116645b32faf67 → ...e0/809ac6648cae33e48e1eb04a116645b32faf67 b/...e0/809ac6648cae33e48e1eb04a116645b32faf67 → ...e0/809ac6648cae33e48e1eb04a116645b32faf67
diff --git a/...e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 → ...e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/...e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 → ...e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/...f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc → ...f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc b/...f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc → ...f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc
diff --git a/...fd/77fce646b2a931a52c96c7bcac626085a81184 → ...fd/77fce646b2a931a52c96c7bcac626085a81184 b/...fd/77fce646b2a931a52c96c7bcac626085a81184 → ...fd/77fce646b2a931a52c96c7bcac626085a81184
diff --git a/exercises-toolbox/7-git/repo/refs/heads/main → exercises-toolbox/6-git/repo/refs/heads/main b/exercises-toolbox/7-git/repo/refs/heads/main → exercises-toolbox/6-git/repo/refs/heads/main
diff --git a/exercises-toolbox/6-make/.gitignore → exercises-toolbox/7-make/.gitignore b/exercises-toolbox/6-make/.gitignore → exercises-toolbox/7-make/.gitignore
diff --git a/exercises-toolbox/6-make/I.txt → exercises-toolbox/7-make/I.txt b/exercises-toolbox/6-make/I.txt → exercises-toolbox/7-make/I.txt
diff --git a/exercises-toolbox/6-make/L.txt → exercises-toolbox/7-make/L.txt b/exercises-toolbox/6-make/L.txt → exercises-toolbox/7-make/L.txt
diff --git a/...ses-toolbox/6-make/Makefile-bonus-loesung → ...ses-toolbox/7-make/Makefile-bonus-loesung b/...ses-toolbox/6-make/Makefile-bonus-loesung → ...ses-toolbox/7-make/Makefile-bonus-loesung
diff --git a/exercises-toolbox/6-make/Makefile-loesung → exercises-toolbox/7-make/Makefile-loesung b/exercises-toolbox/6-make/Makefile-loesung → exercises-toolbox/7-make/Makefile-loesung
diff --git a/exercises-toolbox/6-make/aufgabe.txt → exercises-toolbox/7-make/aufgabe.txt b/exercises-toolbox/6-make/aufgabe.txt → exercises-toolbox/7-make/aufgabe.txt
diff --git a/...oolbox/6-make/auswertung-bonus-loesung.py → ...oolbox/7-make/auswertung-bonus-loesung.py b/...oolbox/6-make/auswertung-bonus-loesung.py → ...oolbox/7-make/auswertung-bonus-loesung.py
diff --git a/exercises-toolbox/6-make/auswertung.py → exercises-toolbox/7-make/auswertung.py b/exercises-toolbox/6-make/auswertung.py → exercises-toolbox/7-make/auswertung.py
diff --git a/exercises-toolbox/6-make/lambda.txt → exercises-toolbox/7-make/lambda.txt b/exercises-toolbox/6-make/lambda.txt → exercises-toolbox/7-make/lambda.txt
diff --git a/exercises-toolbox/Makefile b/exercises-toolbox/Makefile
@@ -10,8 +10,8 @@ all: $(BUILDS)
 	@cp -r 1-python build/exercises-toolbox-1
 	@cp -r 2-numpy 3-matplotlib build/exercises-toolbox-2
 	@cp -r 4-scipy 5-uncertainties build/exercises-toolbox-3
-	@cp -r 6-make build/exercises-toolbox-4
-	@cp -r 7-git 8-all build/exercises-toolbox-5
+	@cp -r 6-git build/exercises-toolbox-4
+	@cp -r 7-make 8-all build/exercises-toolbox-5
 	@rm -rf build/exercises-toolbox-{1,2,3,4,5}/*/{,*/}{Makefile,.gitignore,__pycache__,*.dummy}
 	@cd build ; \
 	for day in 1 2 3 4 5 ; do \

diff --git a/python/python.ipynb b/python/python.ipynb
@@ -6,7 +6,7 @@
    "source": [
     "![Python](https://www.python.org/static/community_logos/python-logo-generic.svg)\n",
     "\n",
-    "- Aktuelle Version: Python 3.11\n",
+    "- Aktuelle Version: Python 3.12\n",
     "- *Interpretierte* Programmiersprache\n",
     " - Kein Kompilieren\n",
     " - Programme werden mit dem `python`-Programm ausgeführt\n",
@@ -1415,7 +1415,7 @@
     "U = 42\n",
     "R = 7\n",
     "\n",
-    "print(f\"Spannung U = {U}, R = {R}, I = {U / R}\")"
+    "print(f\"Spannung U = {U} V, R = {R} Ω, I = {U / R} A\")"
    ]
   },
   {
@@ -1653,7 +1653,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Allgemeiner Syntax-Fehler: ` SyntaxError`\n",
+    "## Allgemeiner Syntax-Fehler: `SyntaxError`\n",
     "Zeile in der der Fehler auftritt: `line 6`   \n",
     "Grund für den Fehler: `SyntaxError: invalid syntax`   \n",
     "Hier sogar mit Hinweis auf das fehlerhafte/fehlende Zeichen.\n"
@@ -2005,7 +2005,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.6"
+   "version": "3.10.8"
   }
  },
  "nbformat": 4,