Änderungen damit beide kurse mop/pycas gebaut werden können

.gitlab-ci.yml

@@ -2,15 +2,17 @@ image: jochenschulz/jupyterbook
 
 cache:
   paths:
-    - _build
+    - cas/_build
 
 
 pages:
   script:
-    - mkdir -p _build/.jupyter_cache/
-    - jupyter-book build .
-    - rm -rf public
-    - cp -r  _build/html public
+    - mkdir -p cas/_build/.jupyter_cache/
+    - ln -s src cas/src
+    - ln -s data cas/data
+    - jupyter-book build cas
+    - rm -rf public/pycas
+    - cp -r  cas/_build/html public/pycas
   artifacts:
     paths:
       - public

cas/_config.yml

+# Book settings
+title: Mathematisch orientiertes Programmieren
+author: Jochen Schulz, Christoph Rügge, Daniel Schellhorn, Nils Beyer
+logo: data/logo.jpg
+
+# Information about where the book exists on the web
+repository:
+  url                       : https://gitlab.gwdg.de/nam/mop
+
+html:
+  use_repository_button: true
+  use_issues_button: true
+
+latex:
+  latex_documents:
+    targetname: book.tex
+
+# ########################################  ###############################################
+# Interact link settings
+launch_buttons:
+  notebook_interface            : "classic"
+
+#######################################################################################
+# Execution settings
+execute:
+  execute_notebooks         : cache  # Whether to execute notebooks at build time. Must be one of ("auto", "force", "cache", "off")
+  cache                     : "_build/.jupyter_cache/"  # A path to the jupyter cache that will be used to store execution artifacs. Defaults to `_build/.jupyter_cache/`
+  exclude_patterns          : ["README.md", "*.ipynb"]  # A list of patterns to *skip* in execution (e.g. a notebook that takes a really long time)
+  timeout: 240

cas/_toc.yml

+- file: src/einleitung
+  numbered: false
+- part: Basis Python
+  chapters:
+    - file: src/Allgemeines/allgemeines_lecture
+      sections:
+        - file: src/Allgemeines/allgemeines_exercise
+    - file: src/Container/container_lecture
+      sections:
+        - file: src/Container/container_exercise
+    - file: src/Funktionen/funktionen_lecture
+      sections:
+        - file: src/Funktionen/funktionen_exercise
+    - file: src/Kontrollstrukturen/kontrollstrukturen_lecture
+      sections:
+        - file: src/Kontrollstrukturen/kontrollstrukturen_exercise
+    - file: src/Module_Laden/module_laden_lecture
+      sections:
+        - file: src/Module_Laden/module_laden_exercise
+    - file: src/Iteratoren_Generatoren/iteratoren_generatoren_lecture
+      sections:
+        - file: src/Iteratoren_Generatoren/iteratoren_generatoren_exercise
+    - file: src/Rekursion/rekursion_lecture
+      sections:
+        - file: src/Rekursion/rekursion_exercise
+    - file: src/Docstrings/lecture
+    - file: src/Scope/scope_lecture
+      sections:
+        - file: src/Scope/scope_exercise
+    - file: src/Dekoratoren/dekoratoren_lecture
+      sections:
+        - file: src/Dekoratoren/dekoratoren_exercise
+    - file: src/Strings/strings_lecture
+      sections:
+        - file: src/Strings/strings_exercise
+- part: Numerik und Visualisierung
+  chapters:
+    - file: src/Numpy/numpy_lecture
+      sections:
+        - file: src/Numpy/numpy_exercise
+    - file: src/Visualisierung_mit_Holoviews/visualisierung_lecture
+    - file: src/Visualisierung_mit_Holoviews/holoviews_demo_lecture
+    - file: src/Visualisierung_mit_Holoviews/grafiken_lecture
+      sections:
+        - file: src/Visualisierung_mit_Holoviews/visualisierung_exercise
+    - file: src/Andere_Visualisierungen/andere_visualisierungen_lecture
+      sections:
+        - file: src/Andere_Visualisierungen/andere_visualisierungen_exercise
+- part: Symbolisches Rechnen (CAS)
+  chapters:
+    - file: src/Symbolisches_Rechnen/symbolisches_rechnen_lecture
+      sections:
+        - file: src/Symbolisches_Rechnen/symbolisches_rechnen_exercise
+    - file: src/Mengen/mengen_lecture
+      sections:
+        - file: src/Mengen/mengen_exercise
+    - file: src/Gleichungen/gleichungen_lecture
+      sections:
+        - file: src/Gleichungen/gleichungen_exercise
+    - file: src/Differentation/differentation_lecture
+      sections:
+        - file: src/Differentation/differentation_exercise
+    - file: src/Integration/integration_lecture
+      sections:
+        - file: src/Integration/integration_exercise
+    - file: src/Grenzwerte_Folgen_Reihen/folgen_lecture
+      sections:
+        - file: src/Grenzwerte_Folgen_Reihen/folgen_exercise
+    - file: src/Symbolische_Matrizen/symbolische_matrizen_lecture
+      sections:
+        - file: src/Symbolische_Matrizen/symbolische_matrizen_exercise
+
+- part: Tools und Referenzen
+  chapters:
+  - file: src/Git/git_lecture
+    sections:
+      - file: src/Git/git_exercise
+  - file: src/cheatsheet

mop/_config.yml

+# Book settings
+title: Mathematisch orientiertes Programmieren
+author: Jochen Schulz, Christoph Rügge, Daniel Schellhorn, Nils Beyer
+logo: logo.jpg
+
+# Information about where the book exists on the web
+repository:
+  url                       : https://gitlab.gwdg.de/nam/mop
+
+html:
+  use_repository_button: true
+  use_issues_button: true
+
+latex:
+  latex_documents:
+    targetname: book.tex
+
+# ########################################  ###############################################
+# Interact link settings
+launch_buttons:
+  notebook_interface            : "classic"
+
+#######################################################################################
+# Execution settings
+execute:
+  execute_notebooks         : cache  # Whether to execute notebooks at build time. Must be one of ("auto", "force", "cache", "off")
+  cache                     : "_build/.jupyter_cache/"  # A path to the jupyter cache that will be used to store execution artifacs. Defaults to `_build/.jupyter_cache/`
+  exclude_patterns          : ["README.md", "*.ipynb"]  # A list of patterns to *skip* in execution (e.g. a notebook that takes a really long time)
+  timeout: 240

mop/_toc.yml

+- file: src/einleitung
+  numbered: false
+- part: Prelude
+  chapters:
+    - file: src/Linux_und_Terminals/linux_lecture
+      sections:
+        - file: src/Linux_und_Terminals/linux_exercise
+- part: Basis Python
+  chapters:
+    - file: src/Allgemeines/allgemeines_lecture
+      sections:
+        - file: src/Allgemeines/allgemeines_exercise
+    - file: src/Container/container_lecture
+      sections:
+        - file: src/Container/container_exercise
+    - file: src/Funktionen/funktionen_lecture
+      sections:
+        - file: src/Funktionen/funktionen_exercise
+    - file: src/Kontrollstrukturen/kontrollstrukturen_lecture
+      sections:
+        - file: src/Kontrollstrukturen/kontrollstrukturen_exercise
+    - file: src/Module_Laden/module_laden_lecture
+      sections:
+        - file: src/Module_Laden/module_laden_exercise
+    - file: src/Module_Management_und_Erzeugung/module_management_lecture
+      sections:
+        - file: src/Module_Management_und_Erzeugung/module_management_exercise
+    - file: src/Iteratoren_Generatoren/iteratoren_generatoren_lecture
+      sections:
+        - file: src/Iteratoren_Generatoren/iteratoren_generatoren_exercise
+    - file: src/Itertools/itertools_lecture
+      sections:
+        - file: src/Itertools/itertools_exercise
+    - file: src/Rekursion/rekursion_lecture
+      sections:
+        - file: src/Rekursion/rekursion_exercise
+    - file: src/Docstrings/lecture
+    - file: src/Scope/scope_lecture
+      sections:
+        - file: src/Scope/scope_exercise
+    - file: src/Dekoratoren/dekoratoren_lecture
+      sections:
+        - file: src/Dekoratoren/dekoratoren_exercise
+    - file: src/Strings/strings_lecture
+      sections:
+        - file: src/Strings/strings_exercise
+- part: Wissenschaftliches Rechnen
+  chapters:
+    - file: src/Numpy/numpy_lecture
+      sections:
+        - file: src/Numpy/numpy_exercise
+    - file: src/Lineare_Algebra/lineare_algebra_lecture
+      sections:
+        - file: src/Lineare_Algebra/lineare_algebra_exercise
+    - file: src/Visualisierung_mit_Holoviews/visualisierung_lecture
+    - file: src/Visualisierung_mit_Holoviews/holoviews_demo_lecture
+    - file: src/Visualisierung_mit_Holoviews/grafiken_lecture
+      sections:
+        - file: src/Visualisierung_mit_Holoviews/visualisierung_exercise
+    - file: src/Pandas/pandas_lecture
+      sections:
+        - file: src/Pandas/pandas_exercise
+    - file: src/Andere_Visualisierungen/andere_visualisierungen_lecture
+      sections:
+        - file: src/Andere_Visualisierungen/andere_visualisierungen_exercise
+    - file: src/Symbolisches_Rechnen/symbolisches_rechnen_lecture
+      sections:
+        - file: src/Symbolisches_Rechnen/symbolisches_rechnen_exercise
+    - file: src/Gleichungen/gleichungen_lecture
+      sections:
+        - file: src/Gleichungen/gleichungen_exercise
+    - file: src/Differentation/differentation_lecture
+      sections:
+        - file: src/Differentation/differentation_exercise
+    - file: src/Integration/integration_lecture
+      sections:
+        - file: src/Integration/integration_exercise
+    - file: src/Numerische_Differentation_Integration/numerische_differentation_lecture
+      sections:
+        - file: src/Numerische_Differentation_Integration/numerische_differentation_exercise
+    - file: src/Interpolation/interpolation_lecture
+      sections:
+        - file: src/Interpolation/interpolation_exercise
+    - file: src/Nichtlineare_Gleichungen/nichtlineare_gleichungen_lecture
+      sections:
+        - file: src/Nichtlineare_Gleichungen/nichtlineare_gleichungen_exercise
+    - file: src/Wahrscheinlichkeitsrechnung/wahrscheinlichkeitsrechnung_lecture
+      sections:
+        - file: src/Wahrscheinlichkeitsrechnung/wahrscheinlichkeitsrechnung_exercise
+- part: Fortgeschritten
+  chapters:
+    - file: src/Objektorientierung/objektorientierung_lecture
+      sections:
+        - file: src/Objektorientierung/objektorientierung_exercise
+    - file: src/Exceptions/exceptions_lecture
+      sections:
+        - file: src/Exceptions/exceptions_exercise
+    - file: src/Performance/performance_lecture
+      sections:
+        - file: src/Performance/performance_exercise
+    - file: src/Parallelisierung/parallelisierung_lecture
+      sections:
+        - file: src/Parallelisierung/parallelisierung_exercise
+    - file: src/Streams/streams_lecture
+      sections:
+        - file: src/Streams/streams_exercise
+
+
+- part: Tools und Referenzen
+  chapters:
+  - file: src/Git/git_lecture
+    sections:
+      - file: src/Git/git_exercise
+  - file: src/cheatsheet

pyproject.toml

@@ -5,23 +5,21 @@ description = "mop python dependencies"
 authors = ["Jochen Schulz <schulz@math.uni-goettingen.de>"]
 
 [tool.poetry.dependencies]
-python = "^3.8"
-jupyter-book = "^0.8.1"
-numpy = "^1.19.2"
-scipy = "^1.5.2"
-holoviews = "^1.13.3"
-bokeh = "^2.2.1"
-pandas = "^1.1.2"
-numba = "^0.51.2"
-dask = "^2.26.0"
-sympy = "^1.6.2"
-networkx = "^2.5"
-matplotlib = "^3.3.2"
-imageio = "^2.9.0"
-tables = "^3.6.1"
-distributed = "^2.26.0"
-line_profiler = "^3.0.2"
+python = "^3.9"
+jupyter-book = "^0.10.0"
+#scipy = "^1.5.2"
+#numba = "^0.51.2"
+#dask = "^2.26.0"
+#networkx = "^2.5"
+#matplotlib = "^3.3.2"
+#imageio = "^2.9.0"
+#tables = "^3.6.1"
+#distributed = "^2.26.0"
+#line_profiler = "^3.0.2"
 jupyter = "^1.0.0"
+wheel = "^0.36.2"
+holoviews = "^1.14.1"
+sympy = "^1.7.1"
 
 [tool.poetry.dev-dependencies]
 

src/einleitung.md

@@ -10,9 +10,6 @@ springen zwischen Themen häufiger hin und her weil es dem Aufbau und Verständn
 dient. Es gibt zu fast allen Themen Übungen inklusive Lösungen. Es ist empfohlen diese
 in einem jupyter notebook zu bearbeiten (Details dazu in der Veranstaltungsdokumentation).
 
-Das Prelude ({ref}`linux`) ist letztendlich optional; es ist jedoch empfohlen den Ausflug in
-die Linux-Terminal-Welt zu machen, da dies gleich einen größeren Überblick
-und Verständnis des Stoffs erlaubt.
 
 Das Kapitel Tools beschäftigt sich mit Werkzeugen die hilfreich im wissenschaftlichen
 Kontext sind (aber nicht nur dort!). Hierzu zählt insbesondere ein Versions Kontroll System wie {ref}`git`.