Skip to content

Commit d9a1b26

Browse files
committed
Merge branch 'dev' into remove-empty-console-script
2 parents 15a8203 + 1aa0efe commit d9a1b26

File tree

2 files changed

+67
-35
lines changed

2 files changed

+67
-35
lines changed

CHANGELOG.rst

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Change log
22
================================================================================
33

4+
0.0.8 - tba
5+
--------------------------------------------------------------------------------
6+
7+
Updated
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `moban#295 <https://github.com/moremoban/moban/issues/295>`_: limit publish
11+
command in setup.py to be less than 79
12+
413
0.0.7 - 14.07.2019
514
--------------------------------------------------------------------------------
615

@@ -9,44 +18,57 @@ Updated
918

1019
#. sync templates/docs/make.bat.jj2 to include changes from
1120
https://github.com/sphinx-doc/sphinx/commit/0dbdae31
12-
#. #100: Fixed travis.yml.jj2 to not emit yamllint errors
13-
#. #101: Fixed travis.yml.jj2 .disable_global to reset `install:`
14-
#. #31: Added test_command to override travis.yml.jj2 use of Makefile
15-
#. #96: Expanded travis.yml.jj2 and use in in the pypi-mobans repo
16-
#. #88: Enhanced min_requirements.txt.jj2 support for dependencies with multiple
17-
constraints such as `>1,<3`
18-
#. #93: Added CI to ensure pypi-mobans is in sync with upstream
19-
#. #99: Formated changelog.yml according to yamllint default rules
21+
#. `#100 <https://github.com/moremoban/pypi-mobans/issues/100>`_: Fixed
22+
travis.yml.jj2 to not emit yamllint errors
23+
#. `#101 <https://github.com/moremoban/pypi-mobans/issues/101>`_: Fixed
24+
travis.yml.jj2 .disable_global to reset `install:`
25+
#. `#31 <https://github.com/moremoban/pypi-mobans/issues/31>`_: Added
26+
test_command to override travis.yml.jj2 use of Makefile
27+
#. `#96 <https://github.com/moremoban/pypi-mobans/issues/96>`_: Expanded
28+
travis.yml.jj2 and use in in the pypi-mobans repo
29+
#. `#88 <https://github.com/moremoban/pypi-mobans/issues/88>`_: Enhanced
30+
min_requirements.txt.jj2 support for dependencies with multiple constraints
31+
such as `>1,<3`
32+
#. `#93 <https://github.com/moremoban/pypi-mobans/issues/93>`_: Added CI to
33+
ensure pypi-mobans is in sync with upstream
34+
#. `#99 <https://github.com/moremoban/pypi-mobans/issues/99>`_: Formated
35+
changelog.yml according to yamllint default rules
2036

2137
Added
2238
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2339

24-
#. #89: setup.py.jj2 support for dependencies using all PEP 508 environment
25-
markers; enable setup_use_markers to activate, and enable
26-
setup_use_markers_fix to use with setuptools pre v22
27-
#. #98: Added .gitattributes to reduce conflicts on changelog.yml
40+
#. `#89 <https://github.com/moremoban/pypi-mobans/issues/89>`_: setup.py.jj2
41+
support for dependencies using all PEP 508 environment markers; enable
42+
setup_use_markers to activate, and enable setup_use_markers_fix to use with
43+
setuptools pre v22
44+
#. `#98 <https://github.com/moremoban/pypi-mobans/issues/98>`_: Added
45+
.gitattributes to reduce conflicts on changelog.yml
2846

2947
0.0.6 - 25-05-2019
3048
--------------------------------------------------------------------------------
3149

3250
Updated
3351
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3452

35-
#. #87: updated the pipfile syntax
53+
#. `#87 <https://github.com/moremoban/pypi-mobans/issues/87>`_: updated the
54+
pipfile syntax
3655

3756
Added
3857
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3958

40-
#. #87: Added tests for pipfile generation
59+
#. `#87 <https://github.com/moremoban/pypi-mobans/issues/87>`_: Added tests for
60+
pipfile generation
4161

4262
0.0.5 - 04-05-2019
4363
--------------------------------------------------------------------------------
4464

4565
Updated
4666
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4767

48-
#. #75: separate flake8 linting in separate travis job
49-
#. #72: project and copyright are no longer filled.
68+
#. `#75 <https://github.com/moremoban/pypi-mobans/issues/75>`_: separate flake8
69+
linting in separate travis job
70+
#. `#72 <https://github.com/moremoban/pypi-mobans/issues/72>`_: project and
71+
copyright are no longer filled.
5072
#. black style on setup.py, include python 3.7, 3.8 , update gitignore
5173

5274
0.0.4 - 18-02-2019
@@ -58,9 +80,12 @@ Updated
5880
#. travis-ci: uses xenial dist. dropped python 3.4, 3.7-dev and added 3.7, pypy2
5981
and pypy3
6082
#. added min_requirements.txt where minimum requirements are computed
61-
#. #71: include tests folder as test_suite if 'tests' folder exists
62-
#. #16: package data / MANIFEST.in.jj2 is not easy to customise
63-
#. #14: Mandatory CHANGELOG.rst become optional
83+
#. `#71 <https://github.com/moremoban/pypi-mobans/issues/71>`_: include tests
84+
folder as test_suite if 'tests' folder exists
85+
#. `#16 <https://github.com/moremoban/pypi-mobans/issues/16>`_: package data /
86+
MANIFEST.in.jj2 is not easy to customise
87+
#. `#14 <https://github.com/moremoban/pypi-mobans/issues/14>`_: Mandatory
88+
CHANGELOG.rst become optional
6489

6590
0.0.3 - 18-01-2019
6691
--------------------------------------------------------------------------------

changelog.yml

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,48 @@ releases:
77
- "`#114`: setup.py.jj2 gets default console_scripts entry no matter what."
88
date: tba
99
version: 0.0.8
10+
- changes:
11+
- action: Updated
12+
details:
13+
- "`moban#295`: limit publish command in setup.py to be less than 79"
14+
date: tba
15+
version: 0.0.8
1016
- changes:
1117
- action: Updated
1218
details:
1319
- sync templates/docs/make.bat.jj2 to include changes from
1420
https://github.com/sphinx-doc/sphinx/commit/0dbdae31
15-
- "#100: Fixed travis.yml.jj2 to not emit yamllint errors"
16-
- "#101: Fixed travis.yml.jj2 .disable_global to reset `install:`"
17-
- "#31: Added test_command to override travis.yml.jj2 use of Makefile"
18-
- "#96: Expanded travis.yml.jj2 and use in in the pypi-mobans repo"
19-
- "#88: Enhanced min_requirements.txt.jj2 support for dependencies
21+
- "`#100`: Fixed travis.yml.jj2 to not emit yamllint errors"
22+
- "`#101`: Fixed travis.yml.jj2 .disable_global to reset `install:`"
23+
- "`#31`: Added test_command to override travis.yml.jj2 use of
24+
Makefile"
25+
- "`#96`: Expanded travis.yml.jj2 and use in in the pypi-mobans repo"
26+
- "`#88`: Enhanced min_requirements.txt.jj2 support for dependencies
2027
with multiple constraints such as `>1,<3`"
21-
- "#93: Added CI to ensure pypi-mobans is in sync with upstream"
22-
- "#99: Formated changelog.yml according to yamllint default rules"
28+
- "`#93`: Added CI to ensure pypi-mobans is in sync with upstream"
29+
- "`#99`: Formated changelog.yml according to yamllint default rules"
2330
- action: Added
2431
details:
25-
- "#89: setup.py.jj2 support for dependencies using all PEP 508
32+
- "`#89`: setup.py.jj2 support for dependencies using all PEP 508
2633
environment markers; enable setup_use_markers to activate, and
2734
enable setup_use_markers_fix to use with setuptools pre v22"
28-
- "#98: Added .gitattributes to reduce conflicts on changelog.yml"
35+
- "`#98`: Added .gitattributes to reduce conflicts on changelog.yml"
2936
date: 14.07.2019
3037
version: 0.0.7
3138
- changes:
3239
- action: Updated
3340
details:
34-
- "#87: updated the pipfile syntax"
41+
- "`#87`: updated the pipfile syntax"
3542
- action: Added
3643
details:
37-
- "#87: Added tests for pipfile generation"
44+
- "`#87`: Added tests for pipfile generation"
3845
date: 25-05-2019
3946
version: 0.0.6
4047
- changes:
4148
- action: Updated
4249
details:
43-
- "#75: separate flake8 linting in separate travis job"
44-
- "#72: project and copyright are no longer filled."
50+
- "`#75`: separate flake8 linting in separate travis job"
51+
- "`#72`: project and copyright are no longer filled."
4552
- black style on setup.py, include python 3.7, 3.8 , update gitignore
4653
date: 04-05-2019
4754
version: 0.0.5
@@ -51,9 +58,9 @@ releases:
5158
- "travis-ci: uses xenial dist. dropped python 3.4, 3.7-dev and added
5259
3.7, pypy2 and pypy3"
5360
- added min_requirements.txt where minimum requirements are computed
54-
- "#71: include tests folder as test_suite if 'tests' folder exists"
55-
- "#16: package data / MANIFEST.in.jj2 is not easy to customise"
56-
- "#14: Mandatory CHANGELOG.rst become optional"
61+
- "`#71`: include tests folder as test_suite if 'tests' folder exists"
62+
- "`#16`: package data / MANIFEST.in.jj2 is not easy to customise"
63+
- "`#14`: Mandatory CHANGELOG.rst become optional"
5764
date: 18-02-2019
5865
version: 0.0.4
5966
- changes:

0 commit comments

Comments
 (0)