🤝 merge with master

Author: chfw

.travis.yml

@@ -20,13 +20,6 @@ jobs:
 
 stage: test
 
-before_script:
-  - git clone https://github.com/sphinx-doc/sphinx ../sphinx
-  - (cd .. && ln -s sphinx/sphinx/templates/quickstart/
-                    sphinx-quickstart-templates)
-  - sed -i "s/{{ \(\w*\) | repr }}/'{{ \1 }}'/;s/{%- \(for\|endfor\)/{% \1/"
-        ../sphinx-quickstart-templates/conf.py_t
-
 script:
   - find templates/ -type f -name '*.jj2' -exec echo '{}' \;|sed -e "s/templates\//{%include \"/" -e "s/$/\" %}/" > test.file
   - moban -c config/data.yml -t test.file -td templates .

templates/Pipfile.jj2

@@ -0,0 +1,16 @@
+[[source]]
+url = 'https://pypi.python.org/simple'
+verify_ssl = true
+name = 'pypi'
+
+[requires]
+python_version= '3.6'
+
+[packages]
+{% for dependency in dependencies: %}
+  {% if '=' in dependency %}
+    {{dependency}}
+  {% else %}
+    {{dependency}} = "*"
+  {% endif %}
+{% endfor %}

templates/docs/conf.py_t

@@ -62,9 +62,11 @@ templates_path = ['{{ dot }}templates']
 # source_suffix = ['.rst', '.md']
 source_suffix = '{{ suffix }}'
 
+{% if master_doc != 'index' -%}
 # The master toctree document.
 master_doc = '{{ master_str }}'
 
+{% endif -%}
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
@@ -78,7 +80,7 @@ language = {{ language | repr }}
 exclude_patterns = [{{ exclude_patterns }}]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = None
 
 
 # -- Options for HTML output -------------------------------------------------

templates/setup.py.jj2

@@ -63,12 +63,18 @@ 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%}
+    {%block additional_keywords -%}
     {%endblock%}
 ]
 

templates/test.script.jj2

@@ -22,7 +22,7 @@
   {%endif%}
 {%endif%}
 pip freeze
-nosetests --with-coverage --cover-package {{package|lower|replace('-', '_')}} --cover-package tests {%if include_doctest%}--with-doctest --doctest-extension=.rst README.rst{%endif%} tests {%if not nodocs%}docs/source{%endif%} {%if not external_module_library%}{{package|lower|replace('-', '_')}}{%endif%} && flake8 . --exclude=.moban.d {%block flake8_options%}--builtins=unicode,xrange,long{%endblock%}
+nosetests --with-coverage --cover-package {{package|lower|replace('-', '_')}} --cover-package tests tests {%if include_doctest%}--with-doctest --doctest-extension=.rst README.rst{%endif%} {%if not nodocs%}docs/source{%endif%} {%if not external_module_library%}{{package|lower|replace('-', '_')}}{%endif%} && flake8 . --exclude=.moban.d,docs {%block flake8_options%}--builtins=unicode,xrange,long{%endblock%}
 
 {%block posttest%}
 {%endblock%}

upstreaming.yml

@@ -1,9 +1,15 @@
+requires:
+  - https://github.com/sphinx-doc/sphinx
 configuration:
   configuration: config/data.yml
   template_dir:
     - .moban.dt/
     - templates
-    - ../sphinx-quickstart-templates
+    - sphinx:sphinx/templates/quickstart
+targets:
+  - .gitignore: gitignore.jj2
+  - LICENSE: NEW_BSD_LICENSE.jj2
+  - README.rst: local-README.rst.jj2
 copy:
   - templates/docs/Makefile.jj2: Makefile.new_t
   - templates/docs/make.bat.jj2: make.bat.new_t