From 2dc3b67e2b9c3177ab599a378cd0fd6511041b9a Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Fri, 30 Oct 2015 13:14:27 +0100 Subject: [PATCH] Change the package_data location --- patacrep/__init__.py | 7 ++++++- .../ast_templates/chordpro}/chordpro/content_chord | 0 .../ast_templates/chordpro}/chordpro/content_chordlist | 0 .../ast_templates/chordpro}/chordpro/content_comment | 0 .../ast_templates/chordpro}/chordpro/content_define | 0 .../ast_templates/chordpro}/chordpro/content_endofline | 0 .../ast_templates/chordpro}/chordpro/content_error | 0 .../chordpro}/chordpro/content_guitar_comment | 0 .../ast_templates/chordpro}/chordpro/content_image | 0 .../ast_templates/chordpro}/chordpro/content_line | 0 .../ast_templates/chordpro}/chordpro/content_newline | 0 .../ast_templates/chordpro}/chordpro/content_partition | 0 .../ast_templates/chordpro}/chordpro/content_space | 0 .../ast_templates/chordpro}/chordpro/content_tablature | 0 .../ast_templates/chordpro}/chordpro/content_verse | 0 .../ast_templates/chordpro}/chordpro/content_word | 0 .../data => data/ast_templates/chordpro}/chordpro/song | 0 .../ast_templates/chordpro}/chordpro/song_body | 0 .../ast_templates/chordpro}/chordpro/song_header | 0 .../ast_templates/chordpro}/html/content_chord | 0 .../ast_templates/chordpro}/html/content_chordlist | 0 .../ast_templates/chordpro}/html/content_comment | 0 .../ast_templates/chordpro}/html/content_define | 0 .../ast_templates/chordpro}/html/content_define_list | 0 .../ast_templates/chordpro}/html/content_endofline | 0 .../ast_templates/chordpro}/html/content_error | 0 .../ast_templates/chordpro}/html/content_guitar_comment | 0 .../ast_templates/chordpro}/html/content_image | 0 .../data => data/ast_templates/chordpro}/html/content_line | 0 .../ast_templates/chordpro}/html/content_metadata_cover | 0 .../ast_templates/chordpro}/html/content_newline | 0 .../ast_templates/chordpro}/html/content_partition | 0 .../ast_templates/chordpro}/html/content_space | 0 .../ast_templates/chordpro}/html/content_tablature | 0 .../ast_templates/chordpro}/html/content_verse | 0 .../data => data/ast_templates/chordpro}/html/content_word | 0 .../data => data/ast_templates/chordpro}/html/song | 0 .../data => data/ast_templates/chordpro}/html/song_body | 0 .../data => data/ast_templates/chordpro}/html/song_header | 0 .../ast_templates/chordpro}/latex/content_chord | 0 .../ast_templates/chordpro}/latex/content_chordlist | 0 .../ast_templates/chordpro}/latex/content_comment | 0 .../ast_templates/chordpro}/latex/content_define | 0 .../ast_templates/chordpro}/latex/content_endofline | 0 .../ast_templates/chordpro}/latex/content_error | 0 .../ast_templates/chordpro}/latex/content_guitar_comment | 0 .../ast_templates/chordpro}/latex/content_image | 0 .../ast_templates/chordpro}/latex/content_line | 0 .../ast_templates/chordpro}/latex/content_newline | 0 .../ast_templates/chordpro}/latex/content_partition | 0 .../ast_templates/chordpro}/latex/content_space | 0 .../ast_templates/chordpro}/latex/content_tablature | 0 .../ast_templates/chordpro}/latex/content_verse | 0 .../ast_templates/chordpro}/latex/content_word | 0 .../data => data/ast_templates/chordpro}/latex/song | 0 .../data => data/ast_templates/chordpro}/latex/song_body | 0 patacrep/songs/chordpro/__init__.py | 5 ++--- setup.py | 7 ++++++- 58 files changed, 14 insertions(+), 5 deletions(-) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_chord (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_chordlist (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_comment (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_define (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_endofline (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_error (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_guitar_comment (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_image (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_line (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_newline (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_partition (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_space (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_tablature (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_verse (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/content_word (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/song (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/song_body (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/chordpro/song_header (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_chord (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_chordlist (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_comment (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_define (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_define_list (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_endofline (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_error (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_guitar_comment (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_image (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_line (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_metadata_cover (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_newline (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_partition (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_space (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_tablature (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_verse (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/content_word (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/song (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/song_body (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/html/song_header (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_chord (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_chordlist (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_comment (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_define (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_endofline (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_error (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_guitar_comment (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_image (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_line (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_newline (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_partition (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_space (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_tablature (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_verse (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/content_word (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/song (100%) rename patacrep/{songs/chordpro/data => data/ast_templates/chordpro}/latex/song_body (100%) diff --git a/patacrep/__init__.py b/patacrep/__init__.py index e63b5123..13e74a66 100644 --- a/patacrep/__init__.py +++ b/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(resource_filename(__name__, 'data')) +def pkg_datapath(path=''): + """Return the package data path""" + return os.path.join(_ROOT, path) + +__DATADIR__ = os.path.abspath(pkg_datapath()) diff --git a/patacrep/songs/chordpro/data/chordpro/content_chord b/patacrep/data/ast_templates/chordpro/chordpro/content_chord similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_chord rename to patacrep/data/ast_templates/chordpro/chordpro/content_chord diff --git a/patacrep/songs/chordpro/data/chordpro/content_chordlist b/patacrep/data/ast_templates/chordpro/chordpro/content_chordlist similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_chordlist rename to patacrep/data/ast_templates/chordpro/chordpro/content_chordlist diff --git a/patacrep/songs/chordpro/data/chordpro/content_comment b/patacrep/data/ast_templates/chordpro/chordpro/content_comment similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_comment rename to patacrep/data/ast_templates/chordpro/chordpro/content_comment diff --git a/patacrep/songs/chordpro/data/chordpro/content_define b/patacrep/data/ast_templates/chordpro/chordpro/content_define similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_define rename to patacrep/data/ast_templates/chordpro/chordpro/content_define diff --git a/patacrep/songs/chordpro/data/chordpro/content_endofline b/patacrep/data/ast_templates/chordpro/chordpro/content_endofline similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_endofline rename to patacrep/data/ast_templates/chordpro/chordpro/content_endofline diff --git a/patacrep/songs/chordpro/data/chordpro/content_error b/patacrep/data/ast_templates/chordpro/chordpro/content_error similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_error rename to patacrep/data/ast_templates/chordpro/chordpro/content_error diff --git a/patacrep/songs/chordpro/data/chordpro/content_guitar_comment b/patacrep/data/ast_templates/chordpro/chordpro/content_guitar_comment similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_guitar_comment rename to patacrep/data/ast_templates/chordpro/chordpro/content_guitar_comment diff --git a/patacrep/songs/chordpro/data/chordpro/content_image b/patacrep/data/ast_templates/chordpro/chordpro/content_image similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_image rename to patacrep/data/ast_templates/chordpro/chordpro/content_image diff --git a/patacrep/songs/chordpro/data/chordpro/content_line b/patacrep/data/ast_templates/chordpro/chordpro/content_line similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_line rename to patacrep/data/ast_templates/chordpro/chordpro/content_line diff --git a/patacrep/songs/chordpro/data/chordpro/content_newline b/patacrep/data/ast_templates/chordpro/chordpro/content_newline similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_newline rename to patacrep/data/ast_templates/chordpro/chordpro/content_newline diff --git a/patacrep/songs/chordpro/data/chordpro/content_partition b/patacrep/data/ast_templates/chordpro/chordpro/content_partition similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_partition rename to patacrep/data/ast_templates/chordpro/chordpro/content_partition diff --git a/patacrep/songs/chordpro/data/chordpro/content_space b/patacrep/data/ast_templates/chordpro/chordpro/content_space similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_space rename to patacrep/data/ast_templates/chordpro/chordpro/content_space diff --git a/patacrep/songs/chordpro/data/chordpro/content_tablature b/patacrep/data/ast_templates/chordpro/chordpro/content_tablature similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_tablature rename to patacrep/data/ast_templates/chordpro/chordpro/content_tablature diff --git a/patacrep/songs/chordpro/data/chordpro/content_verse b/patacrep/data/ast_templates/chordpro/chordpro/content_verse similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_verse rename to patacrep/data/ast_templates/chordpro/chordpro/content_verse diff --git a/patacrep/songs/chordpro/data/chordpro/content_word b/patacrep/data/ast_templates/chordpro/chordpro/content_word similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/content_word rename to patacrep/data/ast_templates/chordpro/chordpro/content_word diff --git a/patacrep/songs/chordpro/data/chordpro/song b/patacrep/data/ast_templates/chordpro/chordpro/song similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/song rename to patacrep/data/ast_templates/chordpro/chordpro/song diff --git a/patacrep/songs/chordpro/data/chordpro/song_body b/patacrep/data/ast_templates/chordpro/chordpro/song_body similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/song_body rename to patacrep/data/ast_templates/chordpro/chordpro/song_body diff --git a/patacrep/songs/chordpro/data/chordpro/song_header b/patacrep/data/ast_templates/chordpro/chordpro/song_header similarity index 100% rename from patacrep/songs/chordpro/data/chordpro/song_header rename to patacrep/data/ast_templates/chordpro/chordpro/song_header diff --git a/patacrep/songs/chordpro/data/html/content_chord b/patacrep/data/ast_templates/chordpro/html/content_chord similarity index 100% rename from patacrep/songs/chordpro/data/html/content_chord rename to patacrep/data/ast_templates/chordpro/html/content_chord diff --git a/patacrep/songs/chordpro/data/html/content_chordlist b/patacrep/data/ast_templates/chordpro/html/content_chordlist similarity index 100% rename from patacrep/songs/chordpro/data/html/content_chordlist rename to patacrep/data/ast_templates/chordpro/html/content_chordlist diff --git a/patacrep/songs/chordpro/data/html/content_comment b/patacrep/data/ast_templates/chordpro/html/content_comment similarity index 100% rename from patacrep/songs/chordpro/data/html/content_comment rename to patacrep/data/ast_templates/chordpro/html/content_comment diff --git a/patacrep/songs/chordpro/data/html/content_define b/patacrep/data/ast_templates/chordpro/html/content_define similarity index 100% rename from patacrep/songs/chordpro/data/html/content_define rename to patacrep/data/ast_templates/chordpro/html/content_define diff --git a/patacrep/songs/chordpro/data/html/content_define_list b/patacrep/data/ast_templates/chordpro/html/content_define_list similarity index 100% rename from patacrep/songs/chordpro/data/html/content_define_list rename to patacrep/data/ast_templates/chordpro/html/content_define_list diff --git a/patacrep/songs/chordpro/data/html/content_endofline b/patacrep/data/ast_templates/chordpro/html/content_endofline similarity index 100% rename from patacrep/songs/chordpro/data/html/content_endofline rename to patacrep/data/ast_templates/chordpro/html/content_endofline diff --git a/patacrep/songs/chordpro/data/html/content_error b/patacrep/data/ast_templates/chordpro/html/content_error similarity index 100% rename from patacrep/songs/chordpro/data/html/content_error rename to patacrep/data/ast_templates/chordpro/html/content_error diff --git a/patacrep/songs/chordpro/data/html/content_guitar_comment b/patacrep/data/ast_templates/chordpro/html/content_guitar_comment similarity index 100% rename from patacrep/songs/chordpro/data/html/content_guitar_comment rename to patacrep/data/ast_templates/chordpro/html/content_guitar_comment diff --git a/patacrep/songs/chordpro/data/html/content_image b/patacrep/data/ast_templates/chordpro/html/content_image similarity index 100% rename from patacrep/songs/chordpro/data/html/content_image rename to patacrep/data/ast_templates/chordpro/html/content_image diff --git a/patacrep/songs/chordpro/data/html/content_line b/patacrep/data/ast_templates/chordpro/html/content_line similarity index 100% rename from patacrep/songs/chordpro/data/html/content_line rename to patacrep/data/ast_templates/chordpro/html/content_line diff --git a/patacrep/songs/chordpro/data/html/content_metadata_cover b/patacrep/data/ast_templates/chordpro/html/content_metadata_cover similarity index 100% rename from patacrep/songs/chordpro/data/html/content_metadata_cover rename to patacrep/data/ast_templates/chordpro/html/content_metadata_cover diff --git a/patacrep/songs/chordpro/data/html/content_newline b/patacrep/data/ast_templates/chordpro/html/content_newline similarity index 100% rename from patacrep/songs/chordpro/data/html/content_newline rename to patacrep/data/ast_templates/chordpro/html/content_newline diff --git a/patacrep/songs/chordpro/data/html/content_partition b/patacrep/data/ast_templates/chordpro/html/content_partition similarity index 100% rename from patacrep/songs/chordpro/data/html/content_partition rename to patacrep/data/ast_templates/chordpro/html/content_partition diff --git a/patacrep/songs/chordpro/data/html/content_space b/patacrep/data/ast_templates/chordpro/html/content_space similarity index 100% rename from patacrep/songs/chordpro/data/html/content_space rename to patacrep/data/ast_templates/chordpro/html/content_space diff --git a/patacrep/songs/chordpro/data/html/content_tablature b/patacrep/data/ast_templates/chordpro/html/content_tablature similarity index 100% rename from patacrep/songs/chordpro/data/html/content_tablature rename to patacrep/data/ast_templates/chordpro/html/content_tablature diff --git a/patacrep/songs/chordpro/data/html/content_verse b/patacrep/data/ast_templates/chordpro/html/content_verse similarity index 100% rename from patacrep/songs/chordpro/data/html/content_verse rename to patacrep/data/ast_templates/chordpro/html/content_verse diff --git a/patacrep/songs/chordpro/data/html/content_word b/patacrep/data/ast_templates/chordpro/html/content_word similarity index 100% rename from patacrep/songs/chordpro/data/html/content_word rename to patacrep/data/ast_templates/chordpro/html/content_word diff --git a/patacrep/songs/chordpro/data/html/song b/patacrep/data/ast_templates/chordpro/html/song similarity index 100% rename from patacrep/songs/chordpro/data/html/song rename to patacrep/data/ast_templates/chordpro/html/song diff --git a/patacrep/songs/chordpro/data/html/song_body b/patacrep/data/ast_templates/chordpro/html/song_body similarity index 100% rename from patacrep/songs/chordpro/data/html/song_body rename to patacrep/data/ast_templates/chordpro/html/song_body diff --git a/patacrep/songs/chordpro/data/html/song_header b/patacrep/data/ast_templates/chordpro/html/song_header similarity index 100% rename from patacrep/songs/chordpro/data/html/song_header rename to patacrep/data/ast_templates/chordpro/html/song_header diff --git a/patacrep/songs/chordpro/data/latex/content_chord b/patacrep/data/ast_templates/chordpro/latex/content_chord similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_chord rename to patacrep/data/ast_templates/chordpro/latex/content_chord diff --git a/patacrep/songs/chordpro/data/latex/content_chordlist b/patacrep/data/ast_templates/chordpro/latex/content_chordlist similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_chordlist rename to patacrep/data/ast_templates/chordpro/latex/content_chordlist diff --git a/patacrep/songs/chordpro/data/latex/content_comment b/patacrep/data/ast_templates/chordpro/latex/content_comment similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_comment rename to patacrep/data/ast_templates/chordpro/latex/content_comment diff --git a/patacrep/songs/chordpro/data/latex/content_define b/patacrep/data/ast_templates/chordpro/latex/content_define similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_define rename to patacrep/data/ast_templates/chordpro/latex/content_define diff --git a/patacrep/songs/chordpro/data/latex/content_endofline b/patacrep/data/ast_templates/chordpro/latex/content_endofline similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_endofline rename to patacrep/data/ast_templates/chordpro/latex/content_endofline diff --git a/patacrep/songs/chordpro/data/latex/content_error b/patacrep/data/ast_templates/chordpro/latex/content_error similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_error rename to patacrep/data/ast_templates/chordpro/latex/content_error diff --git a/patacrep/songs/chordpro/data/latex/content_guitar_comment b/patacrep/data/ast_templates/chordpro/latex/content_guitar_comment similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_guitar_comment rename to patacrep/data/ast_templates/chordpro/latex/content_guitar_comment diff --git a/patacrep/songs/chordpro/data/latex/content_image b/patacrep/data/ast_templates/chordpro/latex/content_image similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_image rename to patacrep/data/ast_templates/chordpro/latex/content_image diff --git a/patacrep/songs/chordpro/data/latex/content_line b/patacrep/data/ast_templates/chordpro/latex/content_line similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_line rename to patacrep/data/ast_templates/chordpro/latex/content_line diff --git a/patacrep/songs/chordpro/data/latex/content_newline b/patacrep/data/ast_templates/chordpro/latex/content_newline similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_newline rename to patacrep/data/ast_templates/chordpro/latex/content_newline diff --git a/patacrep/songs/chordpro/data/latex/content_partition b/patacrep/data/ast_templates/chordpro/latex/content_partition similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_partition rename to patacrep/data/ast_templates/chordpro/latex/content_partition diff --git a/patacrep/songs/chordpro/data/latex/content_space b/patacrep/data/ast_templates/chordpro/latex/content_space similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_space rename to patacrep/data/ast_templates/chordpro/latex/content_space diff --git a/patacrep/songs/chordpro/data/latex/content_tablature b/patacrep/data/ast_templates/chordpro/latex/content_tablature similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_tablature rename to patacrep/data/ast_templates/chordpro/latex/content_tablature diff --git a/patacrep/songs/chordpro/data/latex/content_verse b/patacrep/data/ast_templates/chordpro/latex/content_verse similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_verse rename to patacrep/data/ast_templates/chordpro/latex/content_verse diff --git a/patacrep/songs/chordpro/data/latex/content_word b/patacrep/data/ast_templates/chordpro/latex/content_word similarity index 100% rename from patacrep/songs/chordpro/data/latex/content_word rename to patacrep/data/ast_templates/chordpro/latex/content_word diff --git a/patacrep/songs/chordpro/data/latex/song b/patacrep/data/ast_templates/chordpro/latex/song similarity index 100% rename from patacrep/songs/chordpro/data/latex/song rename to patacrep/data/ast_templates/chordpro/latex/song diff --git a/patacrep/songs/chordpro/data/latex/song_body b/patacrep/data/ast_templates/chordpro/latex/song_body similarity index 100% rename from patacrep/songs/chordpro/data/latex/song_body rename to patacrep/data/ast_templates/chordpro/latex/song_body diff --git a/patacrep/songs/chordpro/__init__.py b/patacrep/songs/chordpro/__init__.py index 45e2e987..fd035e30 100644 --- a/patacrep/songs/chordpro/__init__.py +++ b/patacrep/songs/chordpro/__init__.py @@ -5,9 +5,8 @@ import jinja2 import logging import operator 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 @@ -53,7 +52,7 @@ 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 diff --git a/setup.py b/setup.py index 4cfaeda0..023201eb 100755 --- a/setup.py +++ b/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",