Merge pull request #67 from moremoban/dev

release 0.0.2

Author: chfw

CHANGELOG.rst

@@ -1,7 +1,25 @@
 Change log
 ================================================================================
 
-0.0.1 - 05.11.2018
+0.0.2 - 18-01-2019
+--------------------------------------------------------------------------------
+
+Added
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#60 <https://github.com/moremoban/pypi-mobans/pull/60>`_: codec and locale
+   hacks added
+#. `#61 <https://github.com/moremoban/pypi-mobans/pull/61>`_: add python
+   classifiers
+
+Updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#63 <https://github.com/moremoban/pypi-mobans/pull/63>`_: updated Pipfile
+   implementation
+#. Synchronize with sphinx doc file at release date
+
+0.0.1 - 05-11-2018
 --------------------------------------------------------------------------------
 
 First release

changelog.yml

@@ -1,11 +1,22 @@
 name: "pypi-mobans"
 organisation: moremoban
 releases:
+- changes:
+  - action: Added
+    details:
+    - "`PR#60`: codec and locale hacks added"
+    - "`PR#61`: add python classifiers"
+  - action: Updated
+    details:
+    - "`PR#63`: updated Pipfile implementation"
+    - Synchronize with sphinx doc file at release date
+  date: 18-01-2019
+  version: 0.0.2
 - changes:
   - action: First release
     details:
     - versioning is applied
     - Pipfile included
-  date: 05.11.2018
+  date: 05-11-2018
   version: 0.0.1
 

templates/Pipfile.jj2

@@ -8,9 +8,25 @@ python_version= '3.6'
 
 [packages]
 {% for dependency in dependencies: %}
-  {% if '=' in dependency %}
+  {% if ('=' in dependency) or ('>' in dependency) or ('<' in dependency) %}
     {{dependency}}
   {% else %}
     {{dependency}} = "*"
   {% endif %}
 {% endfor %}
+
+[dev-packages]
+nose = "*"
+mock = "*"
+codecov = "*"
+coverage = "*"
+flake8 = "*"
+{% if dev_dependencies is defined %}
+  {% for dependency in dev_dependencies: %}
+    {% if ('=' in dependency) or ('>' in dependency) or ('<' in dependency) %}
+      {{dependency}}
+    {% else %}
+      {{dependency}} = "*"
+    {% endif %}
+  {% endfor %}
+{% endif %}

templates/docs/conf.py_t

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
-#
 # Configuration file for the Sphinx documentation builder.
 #
-# This file does only contain a selection of the most common options. For a
-# full list see the documentation:
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 
 # -- Path setup --------------------------------------------------------------
@@ -15,35 +13,31 @@
 {% if append_syspath -%}
 import os
 import sys
-sys.path.insert(0, u'{{ module_path }}')
+sys.path.insert(0, {{ module_path | repr }})
 {% else -%}
 # import os
 # import sys
 {% if module_path -%}
-# sys.path.insert(0, u'{{ module_path }}')
+# sys.path.insert(0, {{ module_path | repr }})
 {% else -%}
 # sys.path.insert(0, os.path.abspath('.'))
 {% endif -%}
 {% endif %}
 
 # -- Project information -----------------------------------------------------
 
-project = u'{{ project_str }}'
-copyright = u'{{ copyright_str }}'
-author = u'{{ author_str }}'
+project = {{ project | repr }}
+copyright = {{ copyright | repr }}
+author = {{ author | repr }}
 
 # The short X.Y version
-version = u'{{ version_str }}'
+version = {{ version | repr }}
 # The full version, including alpha/beta/rc tags
-release = u'{{ release_str }}'
+release = {{ release | repr }}
 
 
 # -- General configuration ---------------------------------------------------
 
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
@@ -60,11 +54,11 @@ templates_path = ['{{ dot }}templates']
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '{{ suffix }}'
+source_suffix = {{ suffix | repr }}
 
 {% if master_doc != 'index' -%}
 # The master toctree document.
-master_doc = '{{ master_str }}'
+master_doc = {{ master | repr }}
 
 {% endif -%}
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -79,9 +73,6 @@ language = {{ language | repr }}
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = [{{ exclude_patterns }}]
 
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = None
-
 
 # -- Options for HTML output -------------------------------------------------
 
@@ -112,63 +103,6 @@ html_static_path = ['{{ dot }}static']
 # html_sidebars = {}
 
 
-# -- Options for HTMLHelp output ---------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = '{{ project_fn }}doc'
-
-
-# -- Options for LaTeX output ------------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #
-    # 'preamble': '',
-
-    # Latex figure (float) alignment
-    #
-    # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, '{{ project_fn }}.tex', u'{{ project_doc_texescaped_str }}',
-     u'{{ author_texescaped_str }}', 'manual'),
-]
-
-
-# -- Options for manual page output ------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, '{{ project_manpage }}', u'{{ project_doc_str }}',
-     [author], 1)
-]
-
-
-# -- Options for Texinfo output ----------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, '{{ project_fn }}', u'{{ project_doc_str }}',
-     author, '{{ project_fn }}', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-
 # -- Options for Epub output -------------------------------------------------
 
 # Bibliographic Dublin Core info.
@@ -204,3 +138,4 @@ intersphinx_mapping = {'https://docs.python.org/': None}
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 {%- endif %}
+

templates/setup.py.jj2

@@ -4,6 +4,8 @@
 {% block shebang %}
 #!/usr/bin/env python3
 {% endblock %}
+{% set min_python_version = min_python_version|default('2.6') %}
+{% set min_python_version = min_python_version.split('.', 2) %}
 
 {% block header %}
 # Template by pypi-mobans
@@ -25,8 +27,30 @@ from platform import python_implementation
 {%block compat_block%}
 PY2 = sys.version_info[0] == 2
 PY26 = PY2 and sys.version_info[1] < 7
+PY33 = sys.version_info < (3, 4)
 {%endblock%}
 
+# Work around mbcs bug in distutils.
+# http://bugs.python.org/issue10945
+# This work around is only if a project supports Python < 3.4
+{% if PY33 %}
+try:
+    codecs.lookup('mbcs')
+except LookupError:
+    ascii = codecs.lookup('ascii')
+    func = lambda name, enc=ascii: {True: enc}.get(name=='mbcs')
+    codecs.register(func)
+{% endif %}
+
+# Work around for locale not being set
+try:
+    lc = locale.getlocale()
+    pf = platform.system()
+    if pf != 'Windows' and lc == (None, None):
+        locale.setlocale(locale.LC_ALL, 'C.UTF-8')
+except (ValueError, UnicodeError, locale.Error):
+    locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+
 NAME = '{{name}}'
 AUTHOR = '{{author}}'
 VERSION = '{{current_version}}'
@@ -84,12 +108,33 @@ CLASSIFIERS = [
     'Topic :: Software Development :: Libraries',
     'Programming Language :: Python',
     'Intended Audience :: Developers',
+    {% if min_python_version <= ['2', '6'] %}
     'Programming Language :: Python :: 2.6',
+    {%- endif %}
+
+    {% if min_python_version <= ['2', '7'] %}
     'Programming Language :: Python :: 2.7',
+    {%- endif %}
+
+    {%- if min_python_version[0] == '3' %}
+    'Programming Language :: Python :: 3 :: Only',
+    {%- endif %}
+
+    {% if min_python_version <= ['3','3'] %}
     'Programming Language :: Python :: 3.3',
+    {%- endif %}
+
+    {% if min_python_version <= ['3','4'] %}
     'Programming Language :: Python :: 3.4',
+    {%- endif %}
+
+    {% if min_python_version <= ['3','5'] %}
     'Programming Language :: Python :: 3.5',
+    {%- endif %}
+
+    {% if min_python_version <= ['3','6'] %}
     'Programming Language :: Python :: 3.6',
+    {% endif %}
     {%block additional_classifiers%}
     {%endblock %}
 ]