diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51947883ff6b85cd24eb997a7bff853c3f2b3290..d7c87900c72ff1036e5ca28d6ae77a6bb7e6bd53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ stages: test_38: extends: .test_students - image: python:3.8-buster +# image: python:3.8-buster #test_39: # extends: .test_students diff --git a/setup.py b/setup.py index e869ea1f4eb552c31b3a54144fe74ba20754aaf9..ea06020f3346e740cc17772c50c8d5ca88386b1e 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setuptools.setup( name="beamer-slider", - version="0.1.23", + version="0.1.24.1", author="Tue Herlau", author_email="tuhe@dtu.dk", description="Software to create inkscape overlays in Beamer", @@ -32,7 +32,7 @@ setuptools.setup( python_requires=">=3.8", install_requires=['Jinja2', 'numpy', 'chardet', 'scipy', 'seaborn', 'lxml', 'matplotlib', 'pylatexenc', 'beautifulsoup4', 'PyPDF2', 'clize'], include_package_data=True, - package_data={'': ['DTU_Beamer_files/DTU_Beamer_files.zip'],}, # Check Manifest.in. + package_data={'': ['data/DTU_Beamer_files/*'],}, # Check Manifest.in. entry_points={ 'console_scripts': ['slider=slider.slider_cli:clize_main_entry_point'], } diff --git a/src/slider/DTU_Beamer_files/02450_beamer_preamble.tex b/src/slider/data/DTU_Beamer_files/02450_beamer_preamble.tex similarity index 100% rename from src/slider/DTU_Beamer_files/02450_beamer_preamble.tex rename to src/slider/data/DTU_Beamer_files/02450_beamer_preamble.tex diff --git a/src/slider/DTU_Beamer_files/02450_lectures_base.tex b/src/slider/data/DTU_Beamer_files/02450_lectures_base.tex similarity index 100% rename from src/slider/DTU_Beamer_files/02450_lectures_base.tex rename to src/slider/data/DTU_Beamer_files/02450_lectures_base.tex diff --git a/src/slider/DTU_Beamer_files/DTU_Beamer_files.zip b/src/slider/data/DTU_Beamer_files/DTU_Beamer_files.zip similarity index 100% rename from src/slider/DTU_Beamer_files/DTU_Beamer_files.zip rename to src/slider/data/DTU_Beamer_files/DTU_Beamer_files.zip diff --git a/src/slider/DTU_Beamer_files/beamer_slider_preamble.tex b/src/slider/data/DTU_Beamer_files/beamer_slider_preamble.tex similarity index 100% rename from src/slider/DTU_Beamer_files/beamer_slider_preamble.tex rename to src/slider/data/DTU_Beamer_files/beamer_slider_preamble.tex diff --git a/src/slider/DTU_Beamer_files/beamercolorthemeDTU.sty b/src/slider/data/DTU_Beamer_files/beamercolorthemeDTU.sty similarity index 100% rename from src/slider/DTU_Beamer_files/beamercolorthemeDTU.sty rename to src/slider/data/DTU_Beamer_files/beamercolorthemeDTU.sty diff --git a/src/slider/DTU_Beamer_files/beamerfontthemeDTU.sty b/src/slider/data/DTU_Beamer_files/beamerfontthemeDTU.sty similarity index 100% rename from src/slider/DTU_Beamer_files/beamerfontthemeDTU.sty rename to src/slider/data/DTU_Beamer_files/beamerfontthemeDTU.sty diff --git a/src/slider/DTU_Beamer_files/beamerinnerthemeDTU.sty b/src/slider/data/DTU_Beamer_files/beamerinnerthemeDTU.sty similarity index 100% rename from src/slider/DTU_Beamer_files/beamerinnerthemeDTU.sty rename to src/slider/data/DTU_Beamer_files/beamerinnerthemeDTU.sty diff --git a/src/slider/DTU_Beamer_files/beamerouterthemeDTU.sty b/src/slider/data/DTU_Beamer_files/beamerouterthemeDTU.sty similarity index 100% rename from src/slider/DTU_Beamer_files/beamerouterthemeDTU.sty rename to src/slider/data/DTU_Beamer_files/beamerouterthemeDTU.sty diff --git a/src/slider/DTU_Beamer_files/beamerthemeDTU.sty b/src/slider/data/DTU_Beamer_files/beamerthemeDTU.sty similarity index 100% rename from src/slider/DTU_Beamer_files/beamerthemeDTU.sty rename to src/slider/data/DTU_Beamer_files/beamerthemeDTU.sty diff --git a/src/slider/DTU_Beamer_files/blank.png b/src/slider/data/DTU_Beamer_files/blank.png similarity index 100% rename from src/slider/DTU_Beamer_files/blank.png rename to src/slider/data/DTU_Beamer_files/blank.png diff --git a/src/slider/DTU_Beamer_files/departments.tex b/src/slider/data/DTU_Beamer_files/departments.tex similarity index 100% rename from src/slider/DTU_Beamer_files/departments.tex rename to src/slider/data/DTU_Beamer_files/departments.tex diff --git a/src/slider/DTU_Beamer_files/dtu_slideshow_base.tex b/src/slider/data/DTU_Beamer_files/dtu_slideshow_base.tex similarity index 100% rename from src/slider/DTU_Beamer_files/dtu_slideshow_base.tex rename to src/slider/data/DTU_Beamer_files/dtu_slideshow_base.tex diff --git a/src/slider/DTU_Beamer_files/dtucolours.tex b/src/slider/data/DTU_Beamer_files/dtucolours.tex similarity index 100% rename from src/slider/DTU_Beamer_files/dtucolours.tex rename to src/slider/data/DTU_Beamer_files/dtucolours.tex diff --git a/src/slider/DTU_Beamer_files/tex_compute_uk.pdf b/src/slider/data/DTU_Beamer_files/tex_compute_uk.pdf similarity index 100% rename from src/slider/DTU_Beamer_files/tex_compute_uk.pdf rename to src/slider/data/DTU_Beamer_files/tex_compute_uk.pdf diff --git a/src/slider/DTU_Beamer_files/tex_dtu_compute_a_uk.pdf b/src/slider/data/DTU_Beamer_files/tex_dtu_compute_a_uk.pdf similarity index 100% rename from src/slider/DTU_Beamer_files/tex_dtu_compute_a_uk.pdf rename to src/slider/data/DTU_Beamer_files/tex_dtu_compute_a_uk.pdf diff --git a/src/slider/DTU_Beamer_files/tex_dtu_frise.pdf b/src/slider/data/DTU_Beamer_files/tex_dtu_frise.pdf similarity index 100% rename from src/slider/DTU_Beamer_files/tex_dtu_frise.pdf rename to src/slider/data/DTU_Beamer_files/tex_dtu_frise.pdf diff --git a/src/slider/DTU_Beamer_files/tex_dtu_logo.pdf b/src/slider/data/DTU_Beamer_files/tex_dtu_logo.pdf similarity index 100% rename from src/slider/DTU_Beamer_files/tex_dtu_logo.pdf rename to src/slider/data/DTU_Beamer_files/tex_dtu_logo.pdf diff --git a/src/slider/DTU_Beamer_files/textext_preamble.tex b/src/slider/data/DTU_Beamer_files/textext_preamble.tex similarity index 100% rename from src/slider/DTU_Beamer_files/textext_preamble.tex rename to src/slider/data/DTU_Beamer_files/textext_preamble.tex