Skip to content

Commit 7d357b7

Browse files
authored
Merge pull request #111 from moremoban/dev
release 0.3.1
2 parents af29877 + 51f8351 commit 7d357b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+387
-74
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Before raising the PR, here is a check list:
22

33
1) have you written unit tests for your code changes?
4-
2) have you run "black -l 79 on_your_changed_files.py"?
4+
2) have you run "make format"?
55
3) are you requesting to "dev"?
66
4) have you updated the change log?
77
5) do you think that you can understand your changes after 6 month?

.isort.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[settings]
2+
line_length=79
3+
known_first_party=lml, jinja2
4+
indent=' '
5+
multi_line_output=3
6+
length_sort=1
7+
forced_separate=django.contrib,django.utils
8+
default_section=FIRSTPARTY
9+
no_lines_before=LOCALFOLDER
10+
sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER

.moban.cd/changelog.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: moban
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Added
6+
details:
7+
- "`#97`: requires will clone a repo if given. Note: only github, gitlab, bitbucket for now"
8+
date: 02-11-2018
9+
version: 0.3.1
410
- changes:
511
- action: Added
612
details:

.moban.cd/moban.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ organisation: moremoban
33
author: C. W.
44
55
license: MIT
6-
version: 0.3.0
7-
current_version: 0.3.0
8-
release: 0.3.0
6+
version: 0.3.1
7+
current_version: 0.3.1
8+
release: 0.3.1
99
branch: master
1010
command_line_interface: "moban"
1111
entry_point: "moban.main:main"

.moban.d/setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
{%block platform_block%}
44
{%endblock%}
5+
6+
{%block morefiles%} 'CONTRIBUTORS.rst',{%endblock%}

CHANGELOG.rst

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

4+
0.3.1 - 02-11-2018
5+
--------------------------------------------------------------------------------
6+
7+
Added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#97 <https://github.com/moremoban/moban/issues/97>`_: requires will clone a
11+
repo if given. Note: only github, gitlab, bitbucket for now
12+
413
0.3.0 - 27-18-2018
514
--------------------------------------------------------------------------------
615

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ $ pip install tests/requirements.txt
3434
$ make
3535
```
3636

37+
## In order to format the code automatically
38+
39+
you will need python 3.6 to run "make format"
40+
3741
When you enable travis-ci on your own account, you shall see travis-ci running a build on each of your pushed commit to your own fork.
3842

3943
## Steps for creating a Pull Request

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ update:
55

66
test:
77
bash test.sh
8+
9+
format:
10+
isort -y $(find moban -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
11+
black -l 79 moban
12+
black -l 79 tests

docs/README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This section covers the use cases for moban. Please check them out individually.
1212
#. `Use custom jinja2 filter test n global`_
1313
#. `Pass a folder full of templates`_
1414
#. `Use pypi package as a moban dependency`_
15+
#. `Use git repository as a moban dependency`_
1516

1617
.. _Jinja2 command line: level-1-jinja2-cli
1718
.. _Template inheritance: level-2-template-inheritance
@@ -22,3 +23,4 @@ This section covers the use cases for moban. Please check them out individually.
2223
.. _Use custom jinja2 filter test n global: level-7-use-custom-jinja2-filter-test-n-global
2324
.. _Pass a folder full of templates: level-8-pass-a-folder-full-of-templates
2425
.. _Use pypi package as a moban dependency: level-9-moban-dependency-as-pypi-package
26+
.. _Use git repository as a moban dependency: level-10-moban-dependency-as-git-repo

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
author = u'C. W.'
2929

3030
# The short X.Y version
31-
version = u'0.3.0'
31+
version = u'0.3.1'
3232
# The full version, including alpha/beta/rc tags
33-
release = u'0.3.0'
33+
release = u'0.3.1'
3434

3535

3636
# -- General configuration ---------------------------------------------------

0 commit comments

Comments
 (0)