Merge branch 'develop' into 'master'

Develop

See merge request R3/howto-cards!174

.ci/generateIndex.py

-
 import os, re
 from os import path
+from natsort import natsorted
 
 def line_prepender(filename, line):
     with open(filename, 'r+') as f:
@@ -14,6 +14,8 @@ def build_link(title, href):
 def build_section_start(title):
 
     title = title.replace("Gdpr", "GDPR")
+    title = title.replace("Handbook", "PI Handbook")
+    title = title.replace("Covid 19", "COVID-19")
 
     return f'\n\t<div class="index-box">\n\t\t<h3>{title}</h3>\n\t\t<ul>\n'
 
@@ -70,13 +72,14 @@ sections = []
 for direct in cardDirs:
     if path.isdir(direct):
         dirs = os.listdir(direct)
+        dirs = natsorted(dirs)
 
         for d in dirs:
             if d[0] != ".":
                 sections.append(d)
 
 sections = list(set(sections))
-sections.sort()
+sections = natsorted(sections)
 
 # Index contains the generated content, init it with an empty container
 index = ''
@@ -88,7 +91,7 @@ for folder in cardDirs:
     # check if folder exists
     if path.isdir(folder):
         dirs = os.listdir(folder)
-        dirs = sorted(dirs)
+        dirs = natsorted(dirs)
 
         for d in dirs:
             if d[0] != ".":
@@ -166,7 +169,7 @@ for folder in cardDirs:
                                 print("-----------------------")
 
                 # join all subcategories to the index
-                localIndexArr[indexS].sort()
+                localIndexArr[indexS] = natsorted(localIndexArr[indexS])
 
 print(localIndexArr)
 

.gitlab-ci.yml

@@ -17,6 +17,8 @@ prepare:index:
   rules:
     - if: $CI_COMMIT_REF_NAME
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE !~ /tmpBranch/ && $CI_COMMIT_MESSAGE !~ /Update index/'
+  before_script:
+    - pip install natsort
   script:
     - python .ci/generateIndex.py
     - mkdir .tmp