Skip to content

Commit d132353

Browse files
authored
Merge pull request #398 from moremoban/dev
release 0.8.0
2 parents 897cce9 + be97950 commit d132353

25 files changed

+106
-146
lines changed

.azure-pipelines-steps-macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ steps:
22
- task: UsePythonVersion@0
33
displayName: 'Use Python 3.x'
44
- script: |
5+
export SETUPTOOLS_USE_DISTUTILS="stdlib"
56
python -m pip install --upgrade pip setuptools wheel
67
test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt
78
pip install -r requirements.txt

.azure-pipelines-steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ steps:
22
- task: UsePythonVersion@0
33
displayName: 'Use Python 3.x'
44
- script: |
5+
set SETUPTOOLS_USE_DISTUTILS="stdlib"
56
python -m pip install --upgrade pip setuptools wheel
67
if exist rnd_requirements.txt pip install -r rnd_requirements.txt
78
pip install -r requirements.txt

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ Before raising the PR, here is a check list:
44
- [ ] have you updated the change log?
55
- [ ] can someone else understand your changes without your explanation?
66
- [ ] are you proud of your code changes?
7-
- [ ] please add your name and github link to contributors.rst in alphabetical order.
87

.github/workflows/moban-update.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
on: [push]
2+
3+
jobs:
4+
run_moban:
5+
runs-on: ubuntu-latest
6+
name: synchronize templates via moban
7+
steps:
8+
- uses: actions/checkout@v2
9+
with:
10+
ref: ${{ github.head_ref }}
11+
- name: Set up Python
12+
uses: actions/setup-python@v1
13+
with:
14+
python-version: '3.7'
15+
- name: check changes
16+
run: |
17+
pip install moban gitfs2 pypifs moban-jinja2-github
18+
make update
19+
git status
20+
git diff --exit-code
21+
- name: Auto-commit
22+
if: failure()
23+
uses: docker://cdssnc/auto-commit-github-action
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
with:
27+
args: >-
28+
This is an auto-commit, updating project meta data,
29+
such as changelog.rst, contributors.rst

.moban.cd/changelog.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
name: moban
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Removed
6+
details:
7+
- moban.plugins.jinja2.tests.files is moved to moban-ansible package
8+
- moban.plugins.jinja2.filters.github is moved to moban-jinja2-github package
9+
- action: Fixed
10+
details:
11+
- "`#396`: custom jinja2 plugins(filters, tests and globals) are not
12+
visible if a template is passed as a string."
13+
date: 02.09.2020
14+
version: 0.8.0
415
- changes:
516
- action: Updated
617
details:

.moban.cd/moban.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: moban
22
project: moban
33
organisation: moremoban
4-
author: C. W.
4+
author: chfw
55
66
license: MIT
7-
version: 0.7.10
8-
current_version: 0.7.10
9-
release: 0.7.10
7+
version: 0.8.0
8+
current_version: 0.8.0
9+
release: 0.8.0
1010
branch: master
1111
master: index
1212
command_line_interface: "moban"
@@ -27,6 +27,7 @@ dependencies:
2727
- crayons>= 0.1.0
2828
- fs>=2.4.11
2929
- jinja2-fsloader>=0.2.0
30+
- moban-jinja2-github
3031
description: General purpose static text generator
3132
scm_host: github.com
3233
lint_command: make install_test format git-diff-check lint

.moban.d/moban_readme.jj2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,21 @@ mó bǎn - 模板 General purpose static text generator
3434
Announcement
3535
================================================================================
3636

37+
38+
In version 0.8.0, `moban.plugins.jinja2.tests.files` is moved to moban-ansible
39+
package. `moban.plugins.jinja2.filters.github` is moved to moban-jinja2-github
40+
package Please install them for backward compatibility.
41+
42+
3743
From 2020 onwards, minimum requirement is Python 3.6
3844

3945

4046
For existing moban users, python 2 support has been dropped. Please stay with
4147
versions lower than 0.7.0 if you are still using python 2.
4248

4349

50+
51+
4452
Quick start
4553
================================================================================
4654

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ stages:
3030
env:
3131
- MINREQ=0
3232
stage: moban
33-
install: pip install moban>=0.0.4 gitfs2 pypifs
33+
install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github
3434
script: make update git-diff-check
3535

3636
jobs:

CHANGELOG.rst

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

4+
0.8.0 - 02.09.2020
5+
--------------------------------------------------------------------------------
6+
7+
**Removed**
8+
9+
#. moban.plugins.jinja2.tests.files is moved to moban-ansible package
10+
#. moban.plugins.jinja2.filters.github is moved to moban-jinja2-github package
11+
12+
**Fixed**
13+
14+
#. `#396 <https://github.com/moremoban/moban/issues/396>`_: custom jinja2
15+
plugins(filters, tests and globals) are not visible if a template is passed
16+
as a string.
17+
418
0.7.10 - 16.08.2020
519
--------------------------------------------------------------------------------
620

CONTRIBUTORS.rst

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
Contributors
1+
2+
8 contributors
23
================================================================================
34

45
In alphabetical order:
56

6-
* `Ayan Banerjee <https://github.com/ayan-b>`_
7-
* `Charlie Liu <https://github.com/CLiu13>`_
8-
* `John Vandenberg <https://github.com/jayvdb>`_
9-
* `Joshua Chung <https://github.com/seeeturtle>`_
10-
* `PRAJWAL M <https://github.com/PrajwalM2212>`_
11-
* `salotz <https://github.com/salotz>`_
12-
* `SerekKiri <https://github.com/SerekKiri>`_
7+
* `Andrew Scheller <https://api.github.com/users/lurch>`_
8+
* `Ayan Banerjee <https://api.github.com/users/ayan-b>`_
9+
* `Charlie Liu <https://api.github.com/users/CLiu13>`_
10+
* `John Vandenberg <https://api.github.com/users/jayvdb>`_
11+
* `Joshua Chung <https://api.github.com/users/seeeturtle>`_
12+
* `PRAJWAL M <https://api.github.com/users/PrajwalM2212>`_
13+
* `salotz <https://api.github.com/users/salotz>`_
14+
* `SerekKiri <https://api.github.com/users/SerekKiri>`_

0 commit comments

Comments
 (0)