CI/CD

.gitlab-ci.yml

@@ -68,25 +68,25 @@ stages:
   stage: test
   script:
     - echo "Testing student files"
+    - pwd
     - apt-get update
     - apt install git
     - apt install -y xvfb # Virtual framebuffer for GL stuff.
-    - pwd
+    - apt install -y inkscape
+    - pip install -U Pillow
+    - pip install -e ./
+    - cd tests
+    - xvfb-run -s "-screen 0 1400x900x24" python test_slider.py
 #    - apt-get install -y software-properties-common
 #    - apt-get -y update
 #    - add-apt-repository universe
 #    - sed -i "/^# deb.*multiverse/ s/^# //" /etc/apt/sources.list
 #    - sed -i "/^# deb.*universe/ s/^# //" /etc/apt/sources.list
 #    - add-apt-repository ppa:inkscape.dev/stable
-    - apt install -y inkscape
-    - pip install -U Pillow
-    - pip install -e ./
-    - cd tests
 #    - apt install -y swig # build-essential python-dev swig python-pygame # This is for swig. Remove when you go to a conda build system (and see what happens).
 #    - pip install -U -r ../02465students/requirements_pip.txt  --no-cache --upgrade
 #    - pip install -U -r ../02465students/requirements_conda.txt  --no-cache --upgrade
 #    - cd ../02465public/pythontools/tests
-    - xvfb-run -s "-screen 0 1400x900x24" python test_slider.py
 
 
 test_39:
@@ -105,12 +105,11 @@ pages:
   stage: deploy
   script:
     - echo "Building the documentation."
+    - pwd
     - apt-get update
     - apt install -y git
     - apt install -y inkscape
     - apt install -y python-opengl xvfb # Virtual framebuffer for GL stuff.
-    - pwd
-    - ls
     - cd tests
     - xvfb-run -s "-screen 0 1400x900x24" python test_slider.py
     - cp tests/expected public/expected -rf

setup.py

@@ -30,7 +30,7 @@ setuptools.setup(
     package_dir={"": "src"},
     packages=setuptools.find_packages(where="src"),
     python_requires=">=3.8",
-    install_requires=['Jinja2', 'numpy', 'chardet', 'scipy', 'seaborn', 'lxml', 'matplotlib', 'pylatexenc', 'beautifulsoup4', 'PyPDF2', 'clize'],
+    install_requires=['Jinja2', 'numpy', 'chardet', 'scipy', 'seaborn', 'lxml', 'matplotlib', 'pylatexenc', 'beautifulsoup4', 'PyPDF2', 'clize', 'click'],
     include_package_data=True,
     package_data={'': ['data/DTU_Beamer_files/*'],},  # Check Manifest.in.
     entry_points={

src/slider/slide.py

@@ -187,8 +187,10 @@ def set_svg_background_images(lecture_tex, verbose=False,
         for v in glob.glob(SVG_OSVG_DIR + "/x_do_not_edit*.pdf"):
             # if not v.endswith("png"):
             os.remove(v)
-        for f in glob.glob(lecture_tex[:-4] + '_NO_SVGS*'):
-            os.remove(f)
+
+        # Not sure I want to do add this as an option right now. It makes everything slower...
+        # for f in glob.glob(lecture_tex[:-4] + '_NO_SVGS*'):
+        #     os.remove(f)
 
         if os.path.exists(DNE):
             for v in glob.glob(DNE + "/*"):

src/slider/slider_cli.py

@@ -16,7 +16,7 @@ def confirm_start_new_project(latexfile, force=False):
         sys.exit()
 
 
-def slider_cli(latexfile=None, interactive=True, verbose=False):
+def slider_cli(latexfile=None, interactive=True, verbose=False, clean=False):
     """
     Slider software for manipulating overlay-svg images.
     To get started, first start a slider project by creating a new folder and running
@@ -41,6 +41,7 @@ def slider_cli(latexfile=None, interactive=True, verbose=False):
     :param latexfile:
     :param force:
     :param verbose:
+    :param clean: Clean up by removing temporary files of various kinds. Note that this option makes re-compiling the project slower.
     """
 
     # print("Initializing da slides.")

tests/automatic/index.fdb_latexmk

 # Fdb version 3
-["pdflatex"] 1663599667 "index.tex" "index.pdf" "index" 1663599669
+["pdflatex"] 1663600281 "index.tex" "index.pdf" "index" 1663600283
   "/dev/null" 1663230546 0 d41d8cd98f00b204e9800998ecf8427e ""
   "/etc/texmf/web2c/texmf.cnf" 1661854897 475 c0e671620eb5563b2130f56340a5fde8 ""
   "/usr/share/texlive/texmf-dist/fonts/map/fontname/texfonts.map" 1577235249 3524 cb3e574dea2d1052e39280babc910dc8 ""
@@ -290,22 +290,22 @@
   "/usr/share/texmf/web2c/texmf.cnf" 1644012257 39432 7155514e09a3d69036fac785183a21c2 ""
   "/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1661855397 4076253 38befb6d6b6e65b49c50e6f58e595c43 ""
   "/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1661855409 1511258 48b331477fc99ed5ad6f4a5dd0889b17 ""
-  "beamer_slider_preamble.tex" 1663599665 2728 dd84392bcc98cbdc080fd45d3291136a ""
-  "beamercolorthemeDTU.sty" 1663599665 1181 7ab9734d3304a1004f2d9e1737bd3023 ""
-  "beamerfontthemeDTU.sty" 1663599665 1259 711cf5a5686863499f78b39f42a55f2a ""
-  "beamerinnerthemeDTU.sty" 1663599665 1413 443050b5e9bf0131334a4dd368ae135d ""
-  "beamerouterthemeDTU.sty" 1663599665 2587 ef6b483247d69fb58cb5fae2db9f1840 ""
-  "beamerthemeDTU.sty" 1663599665 7254 017a52b2de7ff8eb9becb7a433e0dca2 ""
-  "departments.tex" 1663599665 9638 46ca44325622949c043b61db8bfa9b5e ""
-  "dtucolours.tex" 1663599665 5683 ab2862d4c2b577922d042e90ebfdfadd ""
-  "index.aux" 1663599669 1412 2d0a9582e28c65e3f8629db6ea0ea185 "pdflatex"
-  "index.nav" 1663599669 395 640a03f4d3f0f705896c1d8375ddfa75 "pdflatex"
-  "index.out" 1663599669 0 d41d8cd98f00b204e9800998ecf8427e "pdflatex"
-  "index.tex" 1663599652 755 9004b6443984040ed868a5f2c4eb9ee2 ""
-  "osvgs/x_do_not_edit_myoverlay-l1_nofonts.pdf" 1663599667 14330 9a9ec3c9f35bbffb28f2035300208a56 ""
-  "tex_dtu_compute_a_uk.pdf" 1663599665 13504 7ae3ecb9b649001643f902e32d3a8cca ""
-  "tex_dtu_frise.pdf" 1663599665 32488 57c0f48ec5395d976ac1e57718922c22 ""
-  "tex_dtu_logo.pdf" 1663599665 1830 e452da49133969a7656f3882c11e9b04 ""
+  "beamer_slider_preamble.tex" 1663600276 2728 dd84392bcc98cbdc080fd45d3291136a ""
+  "beamercolorthemeDTU.sty" 1663600276 1181 7ab9734d3304a1004f2d9e1737bd3023 ""
+  "beamerfontthemeDTU.sty" 1663600276 1259 711cf5a5686863499f78b39f42a55f2a ""
+  "beamerinnerthemeDTU.sty" 1663600276 1413 443050b5e9bf0131334a4dd368ae135d ""
+  "beamerouterthemeDTU.sty" 1663600276 2587 ef6b483247d69fb58cb5fae2db9f1840 ""
+  "beamerthemeDTU.sty" 1663600276 7254 017a52b2de7ff8eb9becb7a433e0dca2 ""
+  "departments.tex" 1663600276 9638 46ca44325622949c043b61db8bfa9b5e ""
+  "dtucolours.tex" 1663600276 5683 ab2862d4c2b577922d042e90ebfdfadd ""
+  "index.aux" 1663600283 1412 2d0a9582e28c65e3f8629db6ea0ea185 "pdflatex"
+  "index.nav" 1663600283 395 640a03f4d3f0f705896c1d8375ddfa75 "pdflatex"
+  "index.out" 1663600283 0 d41d8cd98f00b204e9800998ecf8427e "pdflatex"
+  "index.tex" 1663600258 755 9004b6443984040ed868a5f2c4eb9ee2 ""
+  "osvgs/x_do_not_edit_myoverlay-l1_nofonts.pdf" 1663600281 14330 c51f42136ab7667982f2d7db9bd563a4 ""
+  "tex_dtu_compute_a_uk.pdf" 1663600276 13504 7ae3ecb9b649001643f902e32d3a8cca ""
+  "tex_dtu_frise.pdf" 1663600276 32488 57c0f48ec5395d976ac1e57718922c22 ""
+  "tex_dtu_logo.pdf" 1663600276 1830 e452da49133969a7656f3882c11e9b04 ""
   (generated)
   "index.aux"
   "index.log"

tests/automatic/index_NO_SVGS.aux

-\relax 
-\providecommand\hyper@newdestlabel[2]{}
-\providecommand{\transparent@use}[1]{}
-\providecommand\HyperFirstAtBeginDocument{\AtBeginDocument}
-\HyperFirstAtBeginDocument{\ifx\hyper@anchor\@undefined
-\global\let\oldcontentsline\contentsline
-\gdef\contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
-\global\let\oldnewlabel\newlabel
-\gdef\newlabel#1#2{\newlabelxx{#1}#2}
-\gdef\newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
-\AtEndDocument{\ifx\hyper@anchor\@undefined
-\let\contentsline\oldcontentsline
-\let\newlabel\oldnewlabel
-\fi}
-\fi}
-\global\let\hyper@last\relax 
-\gdef\HyperFirstAtBeginDocument#1{#1}
-\providecommand\HyField@AuxAddToFields[1]{}
-\providecommand\HyField@AuxAddToCoFields[2]{}
-\providecommand\babel@aux[2]{}
-\@nameuse{bbl@beforestart}
-\babel@aux{english}{}
-\@writefile{nav}{\headcommand {\slideentry {0}{0}{1}{1/1}{}{0}}}
-\@writefile{nav}{\headcommand {\beamer@framepages {1}{1}}}
-\@writefile{nav}{\headcommand {\slideentry {0}{0}{2}{2/2}{}{0}}}
-\@writefile{nav}{\headcommand {\beamer@framepages {2}{2}}}
-\@writefile{nav}{\headcommand {\beamer@partpages {1}{2}}}
-\@writefile{nav}{\headcommand {\beamer@subsectionpages {1}{2}}}
-\@writefile{nav}{\headcommand {\beamer@sectionpages {1}{2}}}
-\@writefile{nav}{\headcommand {\beamer@documentpages {2}}}
-\@writefile{nav}{\headcommand {\gdef \inserttotalframenumber {2}}}
-\gdef\svg@ink@ver@settings{{\m@ne }{inkscape}{1}}
-\gdef \@abspage@last{2}

tests/automatic/index_NO_SVGS.nav

-\headcommand {\slideentry {0}{0}{1}{1/1}{}{0}}
-\headcommand {\beamer@framepages {1}{1}}
-\headcommand {\slideentry {0}{0}{2}{2/2}{}{0}}
-\headcommand {\beamer@framepages {2}{2}}
-\headcommand {\beamer@partpages {1}{2}}
-\headcommand {\beamer@subsectionpages {1}{2}}
-\headcommand {\beamer@sectionpages {1}{2}}
-\headcommand {\beamer@documentpages {2}}
-\headcommand {\gdef \inserttotalframenumber {2}}

tests/automatic/index_NO_SVGS.tex

- 
-\documentclass[handout,aspectratio=43]{beamer}
-\usepackage{etoolbox}
-\newtoggle{overlabel_includesvgs}
-\newtoggle{overlabel_includelabels}
-\toggletrue{overlabel_includesvgs}
-\toggletrue{overlabel_includelabels}
-\input{beamer_slider_preamble.tex}
-
-\title{Example slide show}
-\author{Author}
- \togglefalse{overlabel_includesvgs}
-\toggletrue{overlabel_includelabels}
-
-\begin{document}
-\begin{frame}
-\maketitle
-\end{frame}
-% This slideshow is made using slider. Install using: pip install beamer-slider 
-% check http://gitlab.compute.dtu.dk/tuhe/slider for more information. 
-\begin{frame}\osvg{myoverlay} % Use the \osvg{labelname} - tag to create new overlays. Run the command `slider` in the terminal and check the ./osvgs directory for the svg files!
-\title{Slide with an overlay}
-This is some example text!
-\end{frame}
-
-\end{document}

tests/automatic/index_NO_SVGS.toc

-\babel@toc {english}{}\relax