diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 265cfcd04bbea8e1cbad2cf8db1dc720b8e8129d..04ac6820db5851f6a7217f7a0432cd4ea6c7b8df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,68 +1,8 @@ -image: ubuntu:latest # fuck this shit. +image: ubuntu:latest stages: - test - deploy -# - pull -# - build - -#.pullprivate: -# stage: pull -# script: -# - echo "Cloning repos to set up a fresh build environment." -# - cd .. -# - if [ -d 02465private ]; then echo "Private repository exists"; else git clone https://oauth2:${GBAR_TOKEN}@gitlab.gbar.dtu.dk/02465material/02465private.git; fi -# - if [ -d 02465students ]; then echo "Students repository exists"; else git clone https://oauth2:${GBAR_TOKEN}@gitlab.gbar.dtu.dk/02465material/02465students.git; fi -# - rm -rf 02465students_complete -# - cp -rf 02465students 02465students_complete - -#setup_38: -# extends: .pullprivate -# image: python:3.8-buster -# -#setup_39: -# extends: .pullprivate -# image: python:3.9-buster -# -#setup_310: -# extends: .pullprivate -# image: python:3.10-buster - -#.build: -# stage: build -# script: -# - apt-get update -# - apt install git -# - apt install -y python-opengl xvfb # Virtual framebuffer for GL stuff. -# - echo "Current working directory" -# - pwd -# - echo "Contents of cwd:" -# - ls -# - echo "Content of 02465material" -# - ls /builds/02465material -# - echo "Content of /builds/02465material/02465public" -# - ls /builds/02465material/02465public -# - cd pythontools -# #- pip install -U setuptools #==58 # Required for unitgrade-devel because of python 2to3 is not in python 3.10... very hacky, and very bad. Need to change away from minifier. -# - pip install -U -r requirements_full.txt --no-cache --upgrade -# - cd tests -# - echo "CURRENT WORKKING DIRECTORY" -# - pwd -# - xvfb-run -s "-screen 0 1400x900x24" python deploy_student_repos.py # > deploy_student_repos_log.txt - - -#build_38: -# extends: .build -# image: python:3.8-buster -# -#build_39: -# extends: .build -# image: python:3.9-buster - -#build_310: -# extends: .build -# image: python:3.10-buster - .test_students: stage: test @@ -86,31 +26,12 @@ stages: - xvfb-run -s "-screen 0 1400x900x24" python -m unittest test_slider.py - latexmk --version - ls tests_images/* -# - 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 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 test_39: extends: .test_students image: ubuntu:latest -#test_39: -# extends: .test_students -# image: python:3.9-buster -# -#test_310: -# extends: .test_students -# image: python:3.10-buster - -# Copies the previous pipeline but ok. pages: stage: deploy script: @@ -141,31 +62,8 @@ pages: - echo "in public/tests_images" - ls public/tests_images/* - latexmk --version -# - apt install -y python3-sphinx -# - echo "hello" > public/index.html -# - pip install -U -r pythontools/requirements_full.txt --no-cache --upgrade -# - cd ../02465students_complete/docs/source -# - sphinx-build -b html . ../../../02465public/public -# - echo "> Changind directory to 02465public" -# - cd ../../../02465public # Important for the artifact directory to be available. -# - echo "> current working directory" -# - pwd -# - echo "Content of this directory is:" -# - ls -# - echo "Content of public directory is:" -# - ls public -# - echo "ci project dir {$CI_PROJECT_DIR}" -# - cat public/index.html artifacts: paths: - public rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH - - -#- pip install -U setuptools #==58 Required for unitgrade-devel because of python 2to3 is not in python 3.10... very hacky, and very bad. Need to change away from minifier. -# - xvfb-run -s "-screen 0 1400x900x24" python deploy_student_repos.py > deploy_student_repos_log.txt -#- echo "The public/docs/source/index.rst file is" -#- cat pythontools/docs/source/index.rst -#- echo "The 02465students/docs/source/index.rst file is" -#- cat ../02465students_complete/docs/source/index.rst diff --git a/src/beamer_slider.egg-info/PKG-INFO b/src/beamer_slider.egg-info/PKG-INFO index 3ab101ef286439f32766441b5ba00ce66bb4eed9..b87886d26ad0de8c9bdebce3aa78a546aae7f4c1 100644 --- a/src/beamer_slider.egg-info/PKG-INFO +++ b/src/beamer_slider.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: beamer-slider -Version: 0.1.25.2 +Version: 0.1.25.4 Summary: Software to create inkscape overlays in Beamer Home-page: https://lab.compute.dtu.dk/tuhe/slider Author: Tue Herlau diff --git a/src/beamer_slider.egg-info/entry_points.txt b/src/beamer_slider.egg-info/entry_points.txt index 82e604c579506da74da4cb04cb3a3373a7f377ed..d288c6bb861d701a1fcad13e5b505451f7471958 100644 --- a/src/beamer_slider.egg-info/entry_points.txt +++ b/src/beamer_slider.egg-info/entry_points.txt @@ -1,3 +1,3 @@ [console_scripts] slider = slider.slider_cli:clize_main_entry_point -slider_convert = slider.slider_cli:slide_converter_main_entry_point +slider_convert_deck = slider.slider_cli:slide_converter_main_entry_point diff --git a/src/slider/slider_cli.py b/src/slider/slider_cli.py index 4ee46eb8e85ea2d7bbe92b7af30e5365259a69cf..5b1c87485a7b5516205c812dac66ce3e7a1a2c46 100644 --- a/src/slider/slider_cli.py +++ b/src/slider/slider_cli.py @@ -218,7 +218,7 @@ When done, run slider again to keep everything in sync. args = parser.parse_args() - slider_cli(latexfile=args.latexfile, fixbroken=args.fixbroken) + slider_cli(latexfile=args.latexfile, fixbroken=False) # clize.run(slider_cli) if __name__ == '__main__': diff --git a/src/slider/version.py b/src/slider/version.py index 13e1cd600af4e629b65fdd1ea5e4e50dd007295a..bbae2cd8c221a536daebb2408f2cf787941815a4 100644 --- a/src/slider/version.py +++ b/src/slider/version.py @@ -1 +1 @@ -__version__ = "0.1.25.3" \ No newline at end of file +__version__ = "0.1.25.4" \ No newline at end of file