Merge pull request #45 from jayvdb/issue_8

add missing comma in additional_keywords, fix #8

Author: chfw

templates/docs/conf.py_t

@@ -165,16 +165,12 @@ texinfo_documents = [
      author, '{{ project_fn }}', 'One line description of project.',
      'Miscellaneous'),
 ]
-{%- if epub %}
 
 
 # -- Options for Epub output -------------------------------------------------
 
 # Bibliographic Dublin Core info.
 epub_title = project
-epub_author = author
-epub_publisher = author
-epub_copyright = copyright
 
 # The unique identifier of the text. This can be a ISBN number
 # or the project homepage.
@@ -187,7 +183,6 @@ epub_copyright = copyright
 
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['search.html']
-{%- endif %}
 {%- if extensions %}
 
 

templates/setup.py.jj2

@@ -63,13 +63,20 @@ DESCRIPTION = (
 URL = 'https://{{scm_host}}/{{organisation}}/{{name}}'
 DOWNLOAD_URL = '%s/archive/{{release}}.tar.gz' % URL
 FILES = ['README.rst',{%block morefiles %}{%endblock%} 'CHANGELOG.rst']
+{% if self.additional_keywords %}
+{% set additional_keywords = self.additional_keywords() %}
+{% if additional_keywords and not additional_keywords.rstrip().endswith(',') %}
+{% set additional_keywords = additional_keywords.rstrip() + ',\n' %}
+{% endif %}
+{% endif %}
 KEYWORDS = [
-    'python',
 {% for keyword in keywords %}
     '{{keyword}}',
 {% endfor %}
-    {%block additional_keywords%}
-    {%endblock%}
+{% if additional_keywords %}
+{{ additional_keywords -}}
+{% endif %}
+    'python',
 ]
 
 CLASSIFIERS = [