Merge pull request 'Release v0.4.1' (#20) from release-0.4.1 into main

Reviewed-on: wtf-eg/handbuch-gen#20

.drone.yml

@@ -32,8 +32,9 @@ steps:
     image: sphinxdoc/sphinx-latexpdf:5.0.2
     commands:
       - apt-get update
-      - apt-get -y install texlive-lang-german rsync
+      - apt-get -y install texlive-lang-german rsync git
       - pip install -r requirements.txt
+      - export SPHINXOPTS="-D version=$(git -C source/handbuch describe --tags --abbrev=0) -D release=$(git -C source/handbuch describe --tags)"
       - make -j4 bundle
   - name: upload
     image: alpine
@@ -44,8 +45,8 @@ steps:
         from_secret: nextcloud_password
     commands:
       - apk add curl
-      - curl -X PUT -u $NC_USER:$NC_PASSWORD https://work.wtf-eg.de/remote.php/dav/files/$NC_USER/Member-Handbuch/Das%20Handbuch%20zur%20WTF%20eG.pdf -T bundle/rtfm-dashandbuchzurwtfeg.pdf
+      - curl -X PUT -u $NC_USER:$NC_PASSWORD https://work.wtf-eg.de/remote.php/dav/files/$NC_USER/Dokumentation/Das%20Handbuch%20zur%20WTF%20eG.pdf -T bundle/rtfm-dashandbuchzurwtfeg.pdf
-      - curl -X PUT -u $NC_USER:$NC_PASSWORD https://work.wtf-eg.de/remote.php/dav/files/$NC_USER/Member-Handbuch/Das%20Handbuch%20zur%20WTF%20eG.epub -T bundle/RTFM-DasHandbuchzurWTFeG.epub
+      - curl -X PUT -u $NC_USER:$NC_PASSWORD https://work.wtf-eg.de/remote.php/dav/files/$NC_USER/Dokumentation/Das%20Handbuch%20zur%20WTF%20eG.epub -T bundle/RTFM-DasHandbuchzurWTFeG.epub
     when:
       branch:
         - main
@@ -55,6 +56,6 @@ steps:
 
 ---
 kind: signature
-hmac: 84db7299d18047e70a324c4b059f8a2cdd13b497ac439264e4430a37e443c610
+hmac: 797e2df88805ae1dee84d60ec024034965dcf41fc2ef86d5667adfdfe10b2719
 
 ...

README.md

@@ -17,6 +17,14 @@ This repository accesses the required WTF handbook's content as a git submodule.
 git clone --recurse-submodules https://git.wtf-eg.de/wtf-eg/handbuch-gen.git
 ```
 
+If you cloned this repository initially without submobules, you can always update the content of submodule directories with the git submodule update command. Execute the command from the main project directory:
+
+```
+git submodule update --init --recursive
+```
+
+The --init flag initializes the submodules before the update. The --recursive option searches for nested submodules and ensures they are updated too.
+
 ### Python based dependencies
 
 In order to generate the documentation, first create a Python 3 virtual environment using the `venv` module included in Python 3:
@@ -29,7 +37,13 @@ In order to generate the documentation, first create a Python 3 virtual environm
 
 For generating the images from PlantUML sources (`*.plantuml`), [PlantUML](https://plantuml.com/) is required.
 
-For pdf output the LaTeX builder is used, so `latex` and `pdflatex` need to be installed.
+For pdf output the LaTeX builder is used, so `latex` and `pdflatex` need to be installed. On a clean (no Latex compilation yet) operating system like GNU/Debian, the following dependencies are required to make Latex compile the sources.
+
+```
+sudo apt install texlive-base texlive-latex-base texlive-latex-extra texlive-lang-german texlive-fonts-extra --no-install-recommends
+```
+
+For document generation `make` and `latexmk` is required.
 
 ### Running the document generation via make
 
@@ -39,6 +53,17 @@ The top level directory contains a Makefile, for generation with all output form
 make bundle
 `````
 
+In order to automatically determine the version string from the latest Git tag, execute the following command before calling `make`:
+
+```
+export SPHINXOPTS="-D version=$(git -C source/handbuch describe --tags --abbrev=0) -D release=$(git -C source/handbuch describe --tags)"
+```
+
 The output files of the final handbook can be found in the subfolder `./bundle`.
 
 All generated intermediate artifacts and the final output files can be found in the `./build` subfolder.
+
+### Clean up
+
+1. Deactivate the virtual Python environment: ```deactivate```
+2. Clean up the build sources: ```make clean``` and ```rm -r build bundle```

source/conf.py

@@ -20,11 +20,14 @@ import sys
 # -- Project information -----------------------------------------------------
 
 project = 'RTFM - Das Handbuch zur WTF eG'
-copyright = '2021, diverse'
+copyright = '2021-2023, diverse'
 author = 'Autorenkollektiv'
 
 # The full version, including alpha/beta/rc tags
-release = '0.2.0'
+release = '0.0.0'
+
+# The major project version, without alpha/beta/rc tags
+version = '0.0.0'
 
 # -- General configuration ---------------------------------------------------
 
@@ -51,6 +54,8 @@ language = 'de'
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = []
 
+myst_url_schemes = ['http', 'https', 'mailto', 'ftp', 'mumble']
+
 
 # -- Options for HTML output -------------------------------------------------
 

source/handbuch

@@ -1 +1 @@
-Subproject commit c209afb9e79c4018182af6b59dc926717a563a9b
+Subproject commit 1b1c4bffef881b4eb80956a2755578c17dc615ec

source/index.rst

@@ -3,21 +3,20 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-RTFM - Das Handbuch zur wtf Kooperative eG
+RTFM - Das Handbuch zur WTF Kooperative eG
 ===========================================
 
 .. toctree::
    :maxdepth: 2
-   :caption: Contents:
+   :caption: Inhaltsverzeichnis
 
    handbuch/impressum.md
    handbuch/intro.md
    handbuch/organisation.md
    handbuch/Aufnahmeprozess.md
    handbuch/Wegweiser.md
+   handbuch/Business/index.rst
+   handbuch/Einkaufen-beim-Großhandel.md
    handbuch/RaaS.md
    handbuch/Auszahlung.md
    handbuch/FAQ.md
-   
-Indices and tables
-==================