resolve merge conflict

the-teachingRSE-project · Mar 20, 2024 · 534e5bf · 534e5bf
2 parents cc9361d + 6ec351e
commit 534e5bf
Show file tree

Hide file tree

Showing 36 changed files with 1,714 additions and 829 deletions.
diff --git a/.github/spellignore.txt b/.github/spellignore.txt
@@ -20,21 +20,26 @@ CarpentriesLibrary
 CarpentriesSoftware
 Center
 CHAOSS
+citable
 codebase
+CodeMeta
 CodeRefinery
+comp-lvls-se
 Coursera
 CRSP
 CSE
+curation
 cybersecurity
 DALIA
 DaLiJe
 de
+deRSE
 DFG
 DigComp
 DigCompEdu
 DigCompOrg
 DigiFlex
-digitalization
+digitalisation
 DigitalSkillsGap
 distributable
 DMP
@@ -46,12 +51,14 @@ EduTrain
 edX
 EMBL
 EMBL-EBI
+eng
 ENCCS
 EOR
 Erlangen-Nürnberg
 ERuDIte
 EuroCC
 EuroHPC
+examplemaster
 exascale
 ExCALIBUR
 EXCELERATE
@@ -62,7 +69,8 @@ findability
 findable
 FIXME
 Forschung
-FORTRAN
+Friedrich
+Fortran
 franca
 funders
 FutureUniversity
@@ -104,6 +112,7 @@ MOOCs
 MPI
 multicore
 multithreading
+neuro-symbolic
 NFDI
 NFDI4Ing
 numpy
@@ -125,14 +134,17 @@ RDM
 RDM-RSE
 repos
 reproducibility
+ReproHack
 researchology
 researchonomy
 reusability
 RSE
 RSE's
 rse-specialisations
 RTPs
+scalable
 scipy
+SeniorCC
 SRU
 SSI
 sth
@@ -143,7 +155,9 @@ swrepo
 swrepos
 SWREPOS
 SysOps
+tbl
 TeSS
+teams-se
 TrainingMaterial
 UofO
 un-deRSE

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -11,24 +11,20 @@ jobs:
       - name: Install pandoc
         run: |
           sudo apt-get update && sudo apt-get install -y --no-install-recommends \
-            texlive pandoc texlive-bibtex-extra texlive-fonts-recommended \
-            texlive-xetex lmodern biber latexmk python3 python3-yaml \
+            inkscape \
+            texlive texlive-latex-extra pandoc latexmk \
+            texlive-bibtex-extra biber \
+            texlive-fonts-recommended texlive-fonts-extra lmodern fonts-linuxlibertine \
+            python3 python3-yaml \
             xz-utils make gpg-agent
           python3 -m pip install -r ${{ env.DIR }}/requirements.txt
-      - name: Configure LaTeX environment
-        working-directory: ${{ env.DIR }}
-        run: |
-          mkdir -p "${HOME}/texmf"
-          tlmgr init-usertree
-          tlmgr option repository https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2021/tlnet-final/
-          tlmgr install academicons
       - name: pandoc compile
         working-directory: ${{ env.DIR }}
         run: make all
       - name: move
         run: mkdir -p github_artifacts && mv ${{ env.DIR }}/*.pdf ./github_artifacts/
       - name: Upload pdf as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PDF files
           path: ./github_artifacts
@@ -39,7 +35,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: github_artifacts
       - name: move

diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
@@ -18,15 +18,23 @@ jobs:
             # strip citations and references
             sed -ri 's/\[@[A-Za-z0-9_ ;@-]+\]//g' $file
             sed -ri 's/[^#\[][@#][A-Za-z0-9_ ;@-]+:[A-Za-z0-9_ ;@-]+}*//g' $file
+            sed -ri 's/@[A-Za-z0-9_]+//g' $file
             # strip words that escape the spellchecker allowlist
-            sed -i 's/Dr.-Ing.//g; s/Ph.D.//g; s/M.Sc.//g; s/B.Sc.//g; ' $file
+            sed -i 's/Dr.-Ing.//g; s/Ph.D.//g; s/M.Sc.//g; s/B.Sc.//g; s/Fortran//g;' $file
             # latex commands
             grep -P -oh -e "(?<=[\\\\\{])[A-Za-z]+" $file | sort | uniq >> .github/spellignore.txt
             # RSE compositions
             grep -P -oh -e "[\w-]*RSE[\w-]*" $file | sort | uniq >> .github/spellignore.txt
             # remove header
             sed -i '1,/---/{/^---$/,/^---$/d}' $file
           done
+      - name: "populate spellignore with author names"
+        uses: mikefarah/yq@master
+        with:
+          cmd: |
+            yq '.authors[] | .lastName' contributors.yml | sed 's/ /\n/g; /null/d' >> .github/spellignore.txt
+            yq '.authors[] | .firstName' contributors.yml | sed 's/ /\n/g; /null/d' >> .github/spellignore.txt
+            yq '.authors[] | .suffixName' contributors.yml | sed 's/ /\n/g; /null/d' >> .github/spellignore.txt
       - uses: eschercloudai/[email protected]
         with:
           files-to-check: "competencies.md|call_to_action.md|survey.md|institutionalised_education.md|intro.md"

diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 call_to_action.pdf
 competencies.pdf
-institutionalized_education.pdf
+institutionalised_education.pdf
 intro.pdf
 survey.pdf
 build/
-
-# Generated automatically by template.py
-template.tex