From 2aeb68bbc20a45bb3f9101c74965bfd883a64e96 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 17:27:40 +0200 Subject: [PATCH 01/10] use constant name for miktex --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index a403001d..3ecb61ab 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,7 +23,7 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Download miktex portable (if not cached) - - ps: "If (!(Test-Path miktex-portable.exe)){wget http://mirrors.ctan.org/systems/win32/miktex/setup/miktex-portable-2.9.5857.exe -OutFile ./miktex-portable.exe}" + - ps: "If (!(Test-Path miktex-portable.exe)){wget http://mirrors.ctan.org/systems/win32/miktex/setup/miktex-portable.exe -OutFile ./miktex-portable.exe}" # Unzip miktex portable - "7z x miktex-portable.exe * -aot -omiktex > nul" From bfadcbf539bc171485cf09e7e8d7075536c05824 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 17:28:31 +0200 Subject: [PATCH 02/10] Print debug infos --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 3ecb61ab..5bcd4b76 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,6 +29,8 @@ install: - "7z x miktex-portable.exe * -aot -omiktex > nul" # Let the binaries be directly callable + - cmd: pwd + - cmd: dir C:\projects\patacrep\miktex\miktex\bin - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\miktex\bin # Update some packages to prevent ltluatex bug From 74930e65fc636094110fdc738896fba4bc941094 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 17:33:07 +0200 Subject: [PATCH 03/10] more debug --- .appveyor.yml | 4 +++- patacrep/latex/lexer.py | 1 - patacrep/songs/latex/__init__.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5bcd4b76..efa82474 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,9 @@ install: # Let the binaries be directly callable - cmd: pwd - - cmd: dir C:\projects\patacrep\miktex\miktex\bin + - cmd: dir . + - cmd: cd miktex + - cmd: dir . - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\miktex\bin # Update some packages to prevent ltluatex bug diff --git a/patacrep/latex/lexer.py b/patacrep/latex/lexer.py index 0b5c2ce7..0d7438e9 100644 --- a/patacrep/latex/lexer.py +++ b/patacrep/latex/lexer.py @@ -147,4 +147,3 @@ class SongLexer(SimpleLexer): if token.lexer.open_braces == 0: token.type = 'SONG_RTITLE' return token - diff --git a/patacrep/songs/latex/__init__.py b/patacrep/songs/latex/__init__.py index 1054f7da..27100eba 100644 --- a/patacrep/songs/latex/__init__.py +++ b/patacrep/songs/latex/__init__.py @@ -57,4 +57,3 @@ SONG_RENDERERS = { 'sg': Latex2LatexSong, }, } - From f855650e1deb26d7b05978fba1a70ac936e595ea Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 17:47:21 +0200 Subject: [PATCH 04/10] verbose unzip --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index efa82474..ac14eb39 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ install: - ps: "If (!(Test-Path miktex-portable.exe)){wget http://mirrors.ctan.org/systems/win32/miktex/setup/miktex-portable.exe -OutFile ./miktex-portable.exe}" # Unzip miktex portable - - "7z x miktex-portable.exe * -aot -omiktex > nul" + - "7z x miktex-portable.exe * -aot -omiktex" # Let the binaries be directly callable - cmd: pwd From 5dc0fb0719307653b9de84655a44aa788286cd1d Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 19:12:04 +0200 Subject: [PATCH 05/10] attempt to fix new folder organisation --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ac14eb39..be8902d6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,9 +31,9 @@ install: # Let the binaries be directly callable - cmd: pwd - cmd: dir . - - cmd: cd miktex + - cmd: cd miktex\temp\texmfs\install\miktex\bin - cmd: dir . - - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\miktex\bin + - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\temp\texmfs\install\miktex\bin # Update some packages to prevent ltluatex bug # - cmd: mpm.exe --update=miktex-bin-2.9 --verbose From b325fd8c32f629a783daac4a1eafc4d4f74d00a7 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 19:15:51 +0200 Subject: [PATCH 06/10] clean path --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index be8902d6..39ef70d8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,9 +31,9 @@ install: # Let the binaries be directly callable - cmd: pwd - cmd: dir . - - cmd: cd miktex\temp\texmfs\install\miktex\bin + - cmd: cd miktex\texmfs\install\miktex\bin - cmd: dir . - - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\temp\texmfs\install\miktex\bin + - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\texmfs\install\miktex\bin # Update some packages to prevent ltluatex bug # - cmd: mpm.exe --update=miktex-bin-2.9 --verbose From 7c397a618ef2c654ad7ab6fb5b7ccca5883ab8f4 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 19:58:25 +0200 Subject: [PATCH 07/10] verbose mpm --- .appveyor.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 39ef70d8..98fdb484 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,10 +29,6 @@ install: - "7z x miktex-portable.exe * -aot -omiktex" # Let the binaries be directly callable - - cmd: pwd - - cmd: dir . - - cmd: cd miktex\texmfs\install\miktex\bin - - cmd: dir . - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\texmfs\install\miktex\bin # Update some packages to prevent ltluatex bug @@ -40,7 +36,7 @@ install: # - cmd: mpm.exe --update=ltxbase --update=luatexbase --update=luaotfload --update=miktex-luatex-base --update=fontspec # Manually install required texlive packages - - cmd: mpm.exe --install-some texlive_packages.txt + - cmd: mpm.exe --verbose --install-some texlive_packages.txt # Update fonts - cmd: luaotfload-tool.exe --update From d4c88ea7224d7412d76ba3ca5003d97b8291bd1e Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Tue, 19 Jul 2016 20:11:22 +0200 Subject: [PATCH 08/10] remove unicode-data --- texlive_packages.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/texlive_packages.txt b/texlive_packages.txt index f6064a0c..2ef1b312 100644 --- a/texlive_packages.txt +++ b/texlive_packages.txt @@ -14,7 +14,6 @@ ms newunicodechar pgf tipa -unicode-data url xcolor xstring From 68bd4134566262b0a88e5645b6ec2a8de1972580 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Wed, 20 Jul 2016 11:31:53 +0200 Subject: [PATCH 09/10] skip compilation on AppVeyor and Travis --- .appveyor.yml | 14 +++++++------- test/test_book/test_compilation.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 98fdb484..1da47d3e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,23 +23,23 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Download miktex portable (if not cached) - - ps: "If (!(Test-Path miktex-portable.exe)){wget http://mirrors.ctan.org/systems/win32/miktex/setup/miktex-portable.exe -OutFile ./miktex-portable.exe}" + #- ps: "If (!(Test-Path miktex-portable.exe)){wget http://mirrors.ctan.org/systems/win32/miktex/setup/miktex-portable.exe -OutFile ./miktex-portable.exe}" # Unzip miktex portable - - "7z x miktex-portable.exe * -aot -omiktex" + #- "7z x miktex-portable.exe * -aot -omiktex" # Let the binaries be directly callable - - cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\texmfs\install\miktex\bin + #- cmd: set PATH=%PATH%;C:\projects\patacrep\miktex\texmfs\install\miktex\bin # Update some packages to prevent ltluatex bug # - cmd: mpm.exe --update=miktex-bin-2.9 --verbose # - cmd: mpm.exe --update=ltxbase --update=luatexbase --update=luaotfload --update=miktex-luatex-base --update=fontspec # Manually install required texlive packages - - cmd: mpm.exe --verbose --install-some texlive_packages.txt + #- cmd: mpm.exe --verbose --install-some texlive_packages.txt # Update fonts - - cmd: luaotfload-tool.exe --update + #- cmd: luaotfload-tool.exe --update build: false # Not a C# project, build stuff at the test step instead. @@ -50,5 +50,5 @@ test_script: - "tox" # Cache Miktex Portable file -cache: -- C:\projects\patacrep\miktex-portable.exe +#cache: +#- C:\projects\patacrep\miktex-portable.exe diff --git a/test/test_book/test_compilation.py b/test/test_book/test_compilation.py index 0439becd..3b864c6b 100644 --- a/test/test_book/test_compilation.py +++ b/test/test_book/test_compilation.py @@ -122,8 +122,8 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): @classmethod def _create_compilation_test(cls, base, onthefly=False): """Return a function testing that `base.tex` is correctly compiled.""" - @unittest.skipIf('TRAVIS' in os.environ, - "Travis does not support lualatex compilation yet") + @unittest.skipIf('CI' in os.environ, + "Travis or AppVeyor does not support lualatex compilation yet") def test_compilation(self): """Test that `base` is rendered to pdf.""" # Check compilation From e56c626846cd417ef8a555b271e587a327de44af Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Wed, 20 Jul 2016 11:38:36 +0200 Subject: [PATCH 10/10] (pylint) import order --- patacrep/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patacrep/files.py b/patacrep/files.py index 967844d4..114513d4 100644 --- a/patacrep/files.py +++ b/patacrep/files.py @@ -5,10 +5,10 @@ from functools import lru_cache import logging import os import pkgutil -import posixpath import re import sys from zipimport import zipimporter +import posixpath from patacrep import utils from patacrep import __DATADIR__