Skip to content

Commit f5abe13

Browse files
chfwchfw
authored
Merge pull request #74 from moremoban/dev
release 0.0.4
2 parents 2e82954 + c8d485c commit f5abe13

15 files changed

+302
-58
lines changed

‎CHANGELOG.rst

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
Change log
22
================================================================================
33

4-
0.0.3 - 18-01-2018
4+
0.0.4 - 18-02-2019
5+
--------------------------------------------------------------------------------
6+
7+
Updated
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. travis-ci: uses xenial dist. dropped python 3.4, 3.7-dev and added 3.7, pypy2
11+
and pypy3
12+
#. added min_requirements.txt where minimum requirements are computed
13+
#. #71: include tests folder as test_suite if 'tests' folder exists
14+
#. #16: package data / MANIFEST.in.jj2 is not easy to customise
15+
#. #14: Mandatory CHANGELOG.rst become optional
16+
17+
0.0.3 - 18-01-2019
518
--------------------------------------------------------------------------------
619

720
First release
821
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
922

10-
#. bug fix on `PR#60z`
23+
#. bug fix on `#60 <https://github.com/moremoban/pypi-mobans/pull/60>`_
1124

1225
0.0.2 - 18-01-2019
1326
--------------------------------------------------------------------------------

‎changelog.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
name: "pypi-mobans"
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Updated
6+
details:
7+
- "travis-ci: uses xenial dist. dropped python 3.4, 3.7-dev and added 3.7, pypy2 and pypy3"
8+
- "added min_requirements.txt where minimum requirements are computed"
9+
- "#71: include tests folder as test_suite if 'tests' folder exists"
10+
- "#16: package data / MANIFEST.in.jj2 is not easy to customise"
11+
- "#14: Mandatory CHANGELOG.rst become optional"
12+
date: 18-02-2019
13+
version: 0.0.4
414
- changes:
515
- action: First release
616
details:
7-
- "bug fix on `PR#60z`"
8-
date: 18-01-2018
17+
- "bug fix on `PR#60`"
18+
date: 18-01-2019
919
version: 0.0.3
1020
- changes:
1121
- action: Added

‎mobanfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
requires:
2-
- https://github.com/sphinx-doc/sphinx
2+
- https://github.com/sphinx-doc/sphinx.git
33
configuration:
44
configuration: config/data.yml
55
template_dir:
@@ -13,8 +13,8 @@ targets:
1313
- output: CHANGELOG.rst
1414
configuration: changelog.yml
1515
template: CHANGELOG.rst.jj2
16-
copy:
17-
- templates/docs/Makefile.jj2: Makefile.new_t
18-
- templates/docs/make.bat.jj2: make.bat.new_t
19-
- templates/docs/master_doc.rst_t: master_doc.rst_t
20-
- templates/docs/conf.py_t: conf.py_t
16+
- copy:
17+
- templates/docs/Makefile.jj2: Makefile.new_t
18+
- templates/docs/make.bat.jj2: make.bat.new_t
19+
- templates/docs/master_doc.rst_t: master_doc.rst_t
20+
- templates/docs/conf.py_t: conf.py_t

‎templates/MANIFEST.in.jj2

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
include README.rst
22
include LICENSE
3+
{% if 'CHANGELOG.rst' is exists %}
34
include CHANGELOG.rst
5+
{% endif %}
6+
{% if 'CONTRIBUTORS.rst' is exists %}
7+
include CONTRIBUTORS.rst
8+
{% endif %}
9+
{% if 'tests' is exists %}
10+
recursive-include tests *
11+
{% endif %}
12+
{% if 'docs' is exists %}
13+
recursive-include docs *
14+
{% endif %}
415
{%block more_options%}
516
{%endblock%}

‎templates/docs/conf.py_t

+11-36
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,16 @@ project = {{ project | repr }}
3030
copyright = {{ copyright | repr }}
3131
author = {{ author | repr }}
3232

33+
{%- if version %}
34+
3335
# The short X.Y version
3436
version = {{ version | repr }}
37+
{%- endif %}
38+
{%- if release %}
39+
3540
# The full version, including alpha/beta/rc tags
3641
release = {{ release | repr }}
42+
{%- endif %}
3743

3844

3945
# -- General configuration ---------------------------------------------------
@@ -50,24 +56,28 @@ extensions = [
5056
# Add any paths that contain templates here, relative to this directory.
5157
templates_path = ['{{ dot }}templates']
5258

59+
{% if suffix != '.rst' -%}
5360
# The suffix(es) of source filenames.
5461
# You can specify multiple suffix as a list of string:
5562
#
5663
# source_suffix = ['.rst', '.md']
5764
source_suffix = {{ suffix | repr }}
5865

59-
{% if master_doc != 'index' -%}
66+
{% endif -%}
67+
{% if master != 'index' -%}
6068
# The master toctree document.
6169
master_doc = {{ master | repr }}
6270

6371
{% endif -%}
72+
{% if language -%}
6473
# The language for content autogenerated by Sphinx. Refer to documentation
6574
# for a list of supported languages.
6675
#
6776
# This is also used if you do content translation via gettext catalogs.
6877
# Usually you set "language" from the command line for these cases.
6978
language = {{ language | repr }}
7079

80+
{% endif -%}
7181
# List of patterns, relative to source directory, that match files and
7282
# directories to ignore when looking for source files.
7383
# This pattern also affects html_static_path and html_extra_path.
@@ -81,44 +91,10 @@ exclude_patterns = [{{ exclude_patterns }}]
8191
#
8292
html_theme = 'alabaster'
8393

84-
# Theme options are theme-specific and customize the look and feel of a theme
85-
# further. For a list of options available for each theme, see the
86-
# documentation.
87-
#
88-
# html_theme_options = {}
89-
9094
# Add any paths that contain custom static files (such as style sheets) here,
9195
# relative to this directory. They are copied after the builtin static files,
9296
# so a file named "default.css" will overwrite the builtin "default.css".
9397
html_static_path = ['{{ dot }}static']
94-
95-
# Custom sidebar templates, must be a dictionary that maps document names
96-
# to template names.
97-
#
98-
# The default sidebars (for documents that don't match any pattern) are
99-
# defined by theme itself. Builtin themes are using these templates by
100-
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
101-
# 'searchbox.html']``.
102-
#
103-
# html_sidebars = {}
104-
105-
106-
# -- Options for Epub output -------------------------------------------------
107-
108-
# Bibliographic Dublin Core info.
109-
epub_title = project
110-
111-
# The unique identifier of the text. This can be a ISBN number
112-
# or the project homepage.
113-
#
114-
# epub_identifier = ''
115-
116-
# A unique identification for the text.
117-
#
118-
# epub_uid = ''
119-
120-
# A list of files that should not be packed into the epub file.
121-
epub_exclude_files = ['search.html']
12298
{%- if extensions %}
12399

124100

@@ -138,4 +114,3 @@ intersphinx_mapping = {'https://docs.python.org/': None}
138114
# If true, `todo` and `todoList` produce output, else they produce nothing.
139115
todo_include_todos = True
140116
{%- endif %}
141-

‎templates/docs/make.bat.jj2

-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@ goto end
3333

3434
:end
3535
popd
36-

‎templates/docs/master_doc.rst_t

-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ Indices and tables
1818
* :ref:`genindex`
1919
* :ref:`modindex`
2020
* :ref:`search`
21-

‎templates/min_requirements.txt.jj2

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% for dependency in dependencies: %}
2+
{% if ';' in dependency: %}
3+
{{dependency.split(';')[0].replace('>=', '==').replace('>', '==') + ';' + dependency.split(';')[1]}}
4+
{% else: %}
5+
{{dependency.replace('>=', '==').replace('>', '==')}}
6+
{% endif %}
7+
{% endfor %}

‎templates/setup.py.jj2

+3
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ def filter_out_test_code(file_handle):
326326

327327
if __name__ == '__main__':
328328
setup(
329+
{% if 'tests' is exists %}
330+
test_suite="tests",
331+
{% endif %}
329332
name=NAME,
330333
author=AUTHOR,
331334
version=VERSION,

‎templates/travis.yml.jj2

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
sudo: false
2+
dist: xenial
23
language: python
34
notifications:
45
email: false
56
{%block test_other_environments%}
67
{%endblock%}
78
{%block custom_python_versions%}
89
python:
9-
- pypy-5.3.1
10-
- 3.7-dev
10+
- &pypy2 pypy2.7-6.0
11+
- &pypy3 pypy3.5-6.0
12+
- 3.8-dev
13+
- 3.7
1114
- 3.6
1215
- 3.5
13-
- 3.4
1416
- 2.7
1517
{%endblock%}
1618
{%block exclusion_matrix%}

0 commit comments

Comments
 (0)