Merge a09ece79ad into d905b5f4c0

.appveyor.yml

@@ -0,0 +1,37 @@
+environment:
+  matrix:
+    - PYTHON: "C:\\Python34"
+      PYTHON_VERSION: "3.4.x" # currently 3.4.3
+      PYTHON_ARCH: "32"
+
+install:
+  # Download setup scripts and unzip
+  - ps: "wget https://github.com/cloudify-cosmo/appveyor-utils/archive/master.zip -OutFile ./master.zip"
+  - "7z e master.zip */appveyor/* -oappveyor"
+
+  # Install Python (from the official .msi of http://python.org) and pip when
+  # not already installed.
+  - "powershell ./appveyor/install.ps1"
+
+  # Prepend newly installed Python to the PATH of this build (this cannot be
+  # done from inside the powershell script as it would require to restart
+  # the parent CMD process).
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+  # Check that we have the expected version and architecture for Python
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "pip --version"
+
+  # Download and install MikTeX
+  - ps: "wget http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.5721.exe -OutFile ./basic-miktex.exe"
+  - "basic-miktex.exe"
+
+
+build: false  # Not a C# project, build stuff at the test step instead.
+
+before_test:
+  - "pip install tox"
+
+test_script:
+  - "tox"

patacrep/__init__.py

@@ -16,4 +16,9 @@ __version__ = '.'.join([str(number) for number in __TUPLE_VERSION__])
 # Directory containing shared data (default templates, custom LaTeX packages,
 # etc.)
 
-__DATADIR__ = os.path.abspath(resource_filename(__name__, 'data'))
+_ROOT = os.path.abspath(os.path.dirname(__file__))
+def pkg_datapath(path=''):
+    """Return the package data path"""
+    return os.path.join(_ROOT, 'data', path)
+
+__DATADIR__ = os.path.abspath(pkg_datapath())

patacrep/build.py

@@ -164,6 +164,7 @@ class SongbookBuilder(object):
 
     def _set_latex(self):
         """Set LaTeX options."""
+        self._lualatex_options.append("--file-line-error")
         if self.unsafe:
             self._lualatex_options.append("--shell-escape")
         if not self.interactive:
@@ -224,10 +225,18 @@ class SongbookBuilder(object):
                 stdout=PIPE,
                 stderr=PIPE,
                 env=os.environ,
+                cwd=os.getcwd(),
                 universal_newlines=True,
                 )
         except Exception as error:
             LOGGER.debug(error)
+            LOGGER.debug(os.getcwd())
+            import subprocess
+            LOGGER.debug(subprocess.check_output(
+                ['dir', os.getcwd()],
+                stderr=subprocess.STDOUT,
+                universal_newlines=True
+                ))
             raise errors.LatexCompilationError(self.basename)
 
         if not self.interactive:

patacrep/content/song.py

@@ -42,7 +42,7 @@ class SongRenderer(Content):
                 {song}
                 """).format(
                     separator="%"*80,
-                    path=self.song.subpath,
+                    path=files.path2posix(self.song.subpath),
                     song=self.song.render(output=context['filename']),
                 )
 

patacrep/songs/chordpro/data/latex/content_image → patacrep/data/ast_templates/chordpro/latex/content_image

@@ -1,5 +1,5 @@
 (* block image *)
-(* set image = content.argument|search_image *)
+(* set image = content.argument|search_image|path2posix *)
 (* if image *)
 \image{(( image ))}
 (*- endif *)

patacrep/data/ast_templates/chordpro/latex/content_partition

@@ -0,0 +1,6 @@
+(* block partition *)
+(* set partition = content.argument|search_partition|path2posix *)
+(* if partition *)
+\lilypond{ ((- partition -)) }
+(*- endif -*)
+(*- endblock -*)

patacrep/songs/chordpro/data/latex/song → patacrep/data/ast_templates/chordpro/latex/song

@@ -29,7 +29,7 @@
   (* endfor *)
   (* if 'cov' in metadata *)
     (* block cov *)
-      (* set cov = metadata["cov"].argument|search_image *)
+      (* set cov = metadata["cov"].argument|search_image|path2posix *)
       (* if cov *)
     cov={(( cov ))},
       (* endif *)

patacrep/errors.py

@@ -47,7 +47,7 @@ class LatexCompilationError(StepError):
     def __init__(self, basename):
         super(LatexCompilationError, self).__init__(
             (
-                """Error while pdfLaTeX compilation of "{basename}.tex" """
+                """Error while LaTeX compilation of "{basename}.tex" """
                 """(see {basename}.log for more information)."""
                 ).format(basename=basename)
             )

patacrep/songs/chordpro/__init__.py

@@ -4,13 +4,13 @@ from jinja2 import Environment, FileSystemLoader, contextfunction, ChoiceLoader
 import jinja2
 import logging
 import os
-from pkg_resources import resource_filename
 
-from patacrep import encoding, files
+from patacrep import encoding, files, pkg_datapath
 from patacrep.songs import Song
 from patacrep.songs.chordpro.syntax import parse_song
 from patacrep.templates import Renderer
 from patacrep.latex import lang2babel
+from patacrep.files import path2posix
 
 LOGGER = logging.getLogger(__name__)
 
@@ -48,12 +48,13 @@ class ChordproSong(Song):
                 self.get_datadirs(os.path.join("templates", self.output_language))
             ),
             FileSystemLoader(
-                os.path.join(resource_filename(__name__, 'data'), self.output_language)
+                os.path.join(pkg_datapath('ast_templates'), 'chordpro', self.output_language)
             ),
             ]))
         jinjaenv.filters['search_image'] = self.search_image
         jinjaenv.filters['search_partition'] = self.search_partition
         jinjaenv.filters['lang2babel'] = lang2babel
+        jinjaenv.filters['path2posix'] = path2posix
 
         try:
             return Renderer(

patacrep/songs/chordpro/data/latex/content_partition

@@ -1,6 +0,0 @@
-(* block partition *)
-(* set partition = content.argument|search_partition *)
-(* if partition *)
-\lilypond{ ((- content.argument|search_partition -)) }
-(*- endif -*)
-(*- endblock -*)

setup.py

@@ -21,7 +21,12 @@ setup(
         "unidecode", "jinja2", "chardet", "ply",
         ],
     setup_requires=["hgtools"],
-    include_package_data=True,
+    package_data={'patacrep': [
+        'data/ast_templates/*/*/*',
+        'data/img/*',
+        'data/latex/*',
+        'data/templates/*',
+        ]},
     entry_points={
         'console_scripts': [
             "songbook = patacrep.songbook.__main__:main",

test/test_compilation/test_compilation.py

@@ -5,10 +5,12 @@
 import glob
 import logging
 import os
+import sys
 import subprocess
 import unittest
 
 from patacrep.encoding import open_read
+from patacrep.files import path2posix
 
 from .. import dynamic # pylint: disable=unused-import
 
@@ -67,16 +69,18 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
                     expected = expectfile.read().strip()
                     expected = expected.replace(
                         "@TEST_FOLDER@",
-                        os.path.dirname(__file__),
+                        path2posix(os.path.dirname(__file__)),
                         )
 
                     expected = expected.replace(
                         "@DATA_FOLDER@",
-                        subprocess.check_output(
-                            ["python", "-c", 'import patacrep, pkg_resources; print(pkg_resources.resource_filename(patacrep.__name__, "data"))'], # pylint: disable=line-too-long
-                            universal_newlines=True,
-                            cwd=os.path.dirname(songbook),
-                            ).strip(),
+                        path2posix(
+                            subprocess.check_output(
+                                [sys.executable, "-c", 'import patacrep, pkg_resources; print(pkg_resources.resource_filename(patacrep.__name__, "data"))'], # pylint: disable=line-too-long
+                                universal_newlines=True,
+                                cwd=os.path.dirname(songbook),
+                                ).strip()
+                        ),
                         )
 
                     self.assertMultiLineEqual(
@@ -108,7 +112,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
     @staticmethod
     def compile_songbook(songbook, steps=None):
         """Compile songbook, and return the command return code."""
-        command = ['python', '-m', 'patacrep.songbook', songbook, '-v']
+        command = [sys.executable, '-m', 'patacrep.songbook', songbook, '-v']
         if steps:
             command.extend(['--steps', steps])
 
@@ -117,7 +121,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
                 command,
                 stderr=subprocess.STDOUT,
                 universal_newlines=True,
-                cwd=os.path.dirname(songbook),
+                cwd=os.path.dirname(songbook)
                 )
             return 0
         except subprocess.CalledProcessError as error:

tox.ini

@@ -7,7 +7,7 @@ envlist = py34, lint
 
 [testenv]
 commands = {envpython} setup.py test
-passenv = TRAVIS
+passenv = TRAVIS APPVEYOR
 deps =
 
 [testenv:lint]