Merge pull request #74 from moremoban/dev

release 0.0.4

CHANGELOG.rst

@@ -1,13 +1,26 @@
 Change log
 ================================================================================
 
-0.0.3 - 18-01-2018
+0.0.4 - 18-02-2019
+--------------------------------------------------------------------------------
+
+Updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. travis-ci: uses xenial dist. dropped python 3.4, 3.7-dev and added 3.7, pypy2
+   and pypy3
+#. added min_requirements.txt where minimum requirements are computed
+#. #71: include tests folder as test_suite if 'tests' folder exists
+#. #16: package data / MANIFEST.in.jj2 is not easy to customise
+#. #14: Mandatory CHANGELOG.rst become optional
+
+0.0.3 - 18-01-2019
 --------------------------------------------------------------------------------
 
 First release
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-#. bug fix on `PR#60z`
+#. bug fix on `#60 <https://github.com/moremoban/pypi-mobans/pull/60>`_
 
 0.0.2 - 18-01-2019
 --------------------------------------------------------------------------------

changelog.yml

@@ -1,11 +1,21 @@
 name: "pypi-mobans"
 organisation: moremoban
 releases:
+- changes:
+  - action: Updated
+    details:
+    - "travis-ci: uses xenial dist. dropped python 3.4, 3.7-dev and added 3.7, pypy2 and pypy3"
+    - "added min_requirements.txt where minimum requirements are computed"
+    - "#71: include tests folder as test_suite if 'tests' folder exists"
+    - "#16: package data / MANIFEST.in.jj2 is not easy to customise"
+    - "#14: Mandatory CHANGELOG.rst become optional"
+  date: 18-02-2019
+  version: 0.0.4
 - changes:
   - action: First release
     details:
-    - "bug fix on `PR#60z`"
-  date: 18-01-2018
+    - "bug fix on `PR#60`"
+  date: 18-01-2019
   version: 0.0.3
 - changes:
   - action: Added

mobanfile

@@ -1,5 +1,5 @@
 requires:
-  - https://github.com/sphinx-doc/sphinx
+  - https://github.com/sphinx-doc/sphinx.git
 configuration:
   configuration: config/data.yml
   template_dir:
@@ -13,8 +13,8 @@ targets:
   - output: CHANGELOG.rst
     configuration: changelog.yml
     template: CHANGELOG.rst.jj2
-copy:
-  - templates/docs/Makefile.jj2: Makefile.new_t
-  - templates/docs/make.bat.jj2: make.bat.new_t
-  - templates/docs/master_doc.rst_t: master_doc.rst_t
-  - templates/docs/conf.py_t: conf.py_t
+  - copy:
+    - templates/docs/Makefile.jj2: Makefile.new_t
+    - templates/docs/make.bat.jj2: make.bat.new_t
+    - templates/docs/master_doc.rst_t: master_doc.rst_t
+    - templates/docs/conf.py_t: conf.py_t

templates/MANIFEST.in.jj2

@@ -1,5 +1,16 @@
 include README.rst
 include LICENSE
+{% if 'CHANGELOG.rst' is exists %}
 include CHANGELOG.rst
+{% endif %}
+{% if 'CONTRIBUTORS.rst' is exists %}
+include CONTRIBUTORS.rst
+{% endif %}
+{% if 'tests' is exists %}
+recursive-include tests *
+{% endif %}
+{% if 'docs' is exists %}
+recursive-include docs *
+{% endif %}
 {%block more_options%}
 {%endblock%}

templates/docs/conf.py_t

@@ -30,10 +30,16 @@ project = {{ project | repr }}
 copyright = {{ copyright | repr }}
 author = {{ author | repr }}
 
+{%- if version %}
+
 # The short X.Y version
 version = {{ version | repr }}
+{%- endif %}
+{%- if release %}
+
 # The full version, including alpha/beta/rc tags
 release = {{ release | repr }}
+{%- endif %}
 
 
 # -- General configuration ---------------------------------------------------
@@ -50,24 +56,28 @@ extensions = [
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['{{ dot }}templates']
 
+{% if suffix != '.rst' -%}
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
 source_suffix = {{ suffix | repr }}
 
-{% if master_doc != 'index' -%}
+{% endif -%}
+{% if master != 'index' -%}
 # The master toctree document.
 master_doc = {{ master | repr }}
 
 {% endif -%}
+{% if language -%}
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
 language = {{ language | repr }}
 
+{% endif -%}
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
@@ -81,44 +91,10 @@ exclude_patterns = [{{ exclude_patterns }}]
 #
 html_theme = 'alabaster'
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['{{ dot }}static']
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself.  Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-#
-# html_sidebars = {}
-
-
-# -- Options for Epub output -------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#
-# epub_identifier = ''
-
-# A unique identification for the text.
-#
-# epub_uid = ''
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
 {%- if extensions %}
 
 
@@ -138,4 +114,3 @@ intersphinx_mapping = {'https://docs.python.org/': None}
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 {%- endif %}
-

templates/docs/make.bat.jj2

@@ -33,4 +33,3 @@ goto end
 
 :end
 popd
-

templates/docs/master_doc.rst_t

@@ -18,4 +18,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

templates/min_requirements.txt.jj2

@@ -0,0 +1,7 @@
+{% for dependency in dependencies: %}
+{%     if ';' in dependency: %}
+{{dependency.split(';')[0].replace('>=', '==').replace('>', '==') + ';' + dependency.split(';')[1]}}
+{%     else: %}
+{{dependency.replace('>=', '==').replace('>', '==')}}
+{%     endif %}
+{% endfor %}

templates/setup.py.jj2

@@ -326,6 +326,9 @@ def filter_out_test_code(file_handle):
 
 if __name__ == '__main__':
     setup(
+{% if 'tests' is exists %}
+        test_suite="tests",
+{% endif %}
         name=NAME,
         author=AUTHOR,
         version=VERSION,

templates/travis.yml.jj2

@@ -1,16 +1,18 @@
 sudo: false
+dist: xenial
 language: python
 notifications:
   email: false
 {%block test_other_environments%}
 {%endblock%}
 {%block custom_python_versions%}
 python:
-  - pypy-5.3.1
-  - 3.7-dev
+  - &pypy2 pypy2.7-6.0
+  - &pypy3 pypy3.5-6.0
+  - 3.8-dev
+  - 3.7
   - 3.6
   - 3.5
-  - 3.4
   - 2.7
 {%endblock%}
 {%block exclusion_matrix%}