Merge pull request #398 from moremoban/dev

release 0.8.0

.azure-pipelines-steps-macos.yml

@@ -2,6 +2,7 @@ steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.x'
   - script: |
+      export SETUPTOOLS_USE_DISTUTILS="stdlib"
       python -m pip install --upgrade pip setuptools wheel
       test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt
       pip install -r requirements.txt

.azure-pipelines-steps.yml

@@ -2,6 +2,7 @@ steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.x'
   - script: |
+      set SETUPTOOLS_USE_DISTUTILS="stdlib"
       python -m pip install --upgrade pip setuptools wheel
       if exist rnd_requirements.txt pip install -r rnd_requirements.txt
       pip install -r requirements.txt

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,5 +4,4 @@ Before raising the PR, here is a check list:
 - [ ] have you updated the change log?
 - [ ] can someone else understand your changes without your explanation?
 - [ ] are you proud of your code changes?
-- [ ] please add your name and github link to contributors.rst in alphabetical order.
 

.github/workflows/moban-update.yml

@@ -0,0 +1,29 @@
+on: [push]
+
+jobs:
+  run_moban:
+    runs-on: ubuntu-latest
+    name: synchronize templates via moban
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.7'
+      - name: check changes
+        run: |
+          pip install moban gitfs2 pypifs moban-jinja2-github
+          make update
+          git status
+          git diff --exit-code
+      - name: Auto-commit
+        if: failure()
+        uses: docker://cdssnc/auto-commit-github-action
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: >-
+            This is an auto-commit, updating project meta data,
+            such as changelog.rst, contributors.rst

.moban.cd/changelog.yml

@@ -1,6 +1,17 @@
 name: moban
 organisation: moremoban
 releases:
+  - changes:
+      - action: Removed
+        details:
+          - moban.plugins.jinja2.tests.files is moved to moban-ansible package
+          - moban.plugins.jinja2.filters.github is moved to moban-jinja2-github package
+      - action: Fixed
+        details:
+          - "`#396`: custom jinja2 plugins(filters, tests and globals) are not
+	    visible if a template is passed as a string."
+    date: 02.09.2020
+    version: 0.8.0
   - changes:
       - action: Updated
         details:

.moban.cd/moban.yml

@@ -1,12 +1,12 @@
 name: moban
 project: moban
 organisation: moremoban
-author: C. W.
+author: chfw
 contact: wangc_2011@hotmail.com
 license: MIT
-version: 0.7.10
-current_version: 0.7.10
-release: 0.7.10
+version: 0.8.0
+current_version: 0.8.0
+release: 0.8.0
 branch: master
 master: index
 command_line_interface: "moban"
@@ -27,6 +27,7 @@ dependencies:
   - crayons>= 0.1.0
   - fs>=2.4.11
   - jinja2-fsloader>=0.2.0
+  - moban-jinja2-github
 description: General purpose static text generator
 scm_host: github.com
 lint_command: make install_test format git-diff-check lint

.moban.d/moban_readme.jj2

@@ -34,13 +34,21 @@ mó bǎn - 模板 General purpose static text generator
 Announcement
 ================================================================================
 
+
+In version 0.8.0, `moban.plugins.jinja2.tests.files` is moved to moban-ansible
+package. `moban.plugins.jinja2.filters.github` is moved to moban-jinja2-github
+package Please install them for backward compatibility.
+
+
 From 2020 onwards, minimum requirement is Python 3.6
 
 
 For existing moban users, python 2 support has been dropped. Please stay with
 versions lower than 0.7.0 if you are still using python 2.
 
 
+
+
 Quick start
 ================================================================================
 

.travis.yml

@@ -30,7 +30,7 @@ stages:
   env:
     - MINREQ=0
   stage: moban
-  install: pip install moban>=0.0.4 gitfs2 pypifs
+  install: pip install moban>=0.0.4 gitfs2 pypifs moban-jinja2-github
   script: make update git-diff-check
 
 jobs:

CHANGELOG.rst

@@ -1,6 +1,20 @@
 Change log
 ================================================================================
 
+0.8.0 - 02.09.2020
+--------------------------------------------------------------------------------
+
+**Removed**
+
+#. moban.plugins.jinja2.tests.files is moved to moban-ansible package
+#. moban.plugins.jinja2.filters.github is moved to moban-jinja2-github package
+
+**Fixed**
+
+#. `#396 <https://github.com/moremoban/moban/issues/396>`_: custom jinja2
+   plugins(filters, tests and globals) are not visible if a template is passed
+   as a string.
+
 0.7.10 - 16.08.2020
 --------------------------------------------------------------------------------
 

CONTRIBUTORS.rst

@@ -1,12 +1,14 @@
-Contributors
+
+8 contributors
 ================================================================================
 
 In alphabetical order:
 
-* `Ayan Banerjee <https://github.com/ayan-b>`_
-* `Charlie Liu <https://github.com/CLiu13>`_
-* `John Vandenberg <https://github.com/jayvdb>`_
-* `Joshua Chung <https://github.com/seeeturtle>`_
-* `PRAJWAL M <https://github.com/PrajwalM2212>`_
-* `salotz <https://github.com/salotz>`_
-* `SerekKiri <https://github.com/SerekKiri>`_
+* `Andrew Scheller <https://api.github.com/users/lurch>`_
+* `Ayan Banerjee <https://api.github.com/users/ayan-b>`_
+* `Charlie Liu <https://api.github.com/users/CLiu13>`_
+* `John Vandenberg <https://api.github.com/users/jayvdb>`_
+* `Joshua Chung <https://api.github.com/users/seeeturtle>`_
+* `PRAJWAL M <https://api.github.com/users/PrajwalM2212>`_
+* `salotz <https://api.github.com/users/salotz>`_
+* `SerekKiri <https://api.github.com/users/SerekKiri>`_

README.rst

@@ -34,13 +34,21 @@ mó bǎn - 模板 General purpose static text generator
 Announcement
 ================================================================================
 
+
+In version 0.8.0, `moban.plugins.jinja2.tests.files` is moved to moban-ansible
+package. `moban.plugins.jinja2.filters.github` is moved to moban-jinja2-github
+package Please install them for backward compatibility.
+
+
 From 2020 onwards, minimum requirement is Python 3.6
 
 
 For existing moban users, python 2 support has been dropped. Please stay with
 versions lower than 0.7.0 if you are still using python 2.
 
 
+
+
 Quick start
 ================================================================================
 
@@ -189,9 +197,6 @@ Given a data.json file with the following content
 
 
    $ moban --template-type slim -c data.json  "{{person.firstname}} {{person.lastname}}"
-   Slimming <p>{{first... to moban.output
-   Slimmed 1 file.
-   $ cat moban.output
    Smith Jones
 
 Handlebars.js template

docs/conf.py

@@ -23,11 +23,11 @@
 
 project = 'moban'
 copyright = '2017-2020 Onni Software Ltd.'
-author = 'C. W.'
+author = 'chfw'
 # The short X.Y version
-version = '0.7.10'
+version = '0.8.0'
 # The full version, including alpha/beta/rc tags
-release = '0.7.10'
+release = '0.8.0'
 
 # -- General configuration ---------------------------------------------------
 

min_requirements.txt

@@ -7,3 +7,4 @@ appdirs==1.4.3
 crayons== 0.1.0
 fs==2.4.11
 jinja2-fsloader==0.2.0
+moban-jinja2-github

moban/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.7.10"
-__author__ = "C. W."
+__version__ = "0.8.0"
+__author__ = "chfw"

moban/constants.py

@@ -25,7 +25,6 @@
 # Command line options
 LABEL_CONFIG = "configuration"
 LABEL_CONFIG_DIR = "configuration_dir"
-LABEL_PLUGIN_DIRS = "plugin_dir"
 LABEL_TEMPLATE = "template"
 POSITIONAL_LABEL_TEMPLATE = "template_in_string"
 LABEL_TMPL_DIRS = "template_dir"

moban/core/mobanfile/__init__.py

@@ -45,6 +45,7 @@ def handle_moban_file_v1(moban_file_configurations, command_line_options):
     merged_options = merge(command_line_options, constants.DEFAULT_OPTIONS)
 
     plugins_dirs = merged_options.get(constants.LABEL_PLUGIN_DIRS)
+
     if plugins_dirs:
         handle_plugin_dirs(plugins_dirs)
 

moban/plugins/jinja2/engine.py

@@ -4,7 +4,7 @@
 from importlib import import_module
 
 import fs.errors
-from jinja2 import Template, Environment
+from jinja2 import Environment
 from lml.loader import scan_plugins_regex
 from lml.plugin import PluginInfo, PluginManager
 from jinja2_fsloader import FSLoader
@@ -16,9 +16,7 @@
 JINJA2_LIBRARIES = "^moban_jinja2_.+$"
 JINJA2_EXTENSIONS = [
     "moban.plugins.jinja2.filters.repr",
-    "moban.plugins.jinja2.filters.github",
     "moban.plugins.jinja2.filters.text",
-    "moban.plugins.jinja2.tests.files",
 ]
 JINJA2_THIRD_PARTY_EXTENSIONS = ["jinja2.ext.do", "jinja2.ext.loopcontrols"]
 LOG = logging.getLogger(__name__)
@@ -135,7 +133,7 @@ def get_template(self, template_file):
             raise exceptions.PassOn(str(e))
 
     def get_template_from_string(self, string):
-        return Template(string)
+        return self.jj2_environment.from_string(string)
 
     def apply_template(self, template, data, output):
         """

mobanfile

@@ -25,3 +25,5 @@ targets:
     template: CHANGELOG.rst.jj2
   - min_requirements.txt: min_requirements.txt.jj2
   - ".github/workflows/pythonpublish.yml": "pythonpublish.yml"
+  - "CONTRIBUTORS.rst": "CONTRIBUTORS.rst.jj2"
+

requirements.txt

@@ -7,3 +7,4 @@ appdirs>=1.4.3
 crayons>= 0.1.0
 fs>=2.4.11
 jinja2-fsloader>=0.2.0
+moban-jinja2-github

setup.py

@@ -40,8 +40,8 @@
     locale.setlocale(locale.LC_ALL, "en_US.UTF-8")
 
 NAME = "moban"
-AUTHOR = "C. W."
-VERSION = "0.7.10"
+AUTHOR = "chfw"
+VERSION = "0.8.0"
 EMAIL = "wangc_2011@hotmail.com"
 LICENSE = "MIT"
 ENTRY_POINTS = {
@@ -53,7 +53,7 @@
     "General purpose static text generator"
 )
 URL = "https://github.com/moremoban/moban"
-DOWNLOAD_URL = "%s/archive/0.7.10.tar.gz" % URL
+DOWNLOAD_URL = "%s/archive/0.8.0.tar.gz" % URL
 FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
 KEYWORDS = [
     "python",
@@ -85,6 +85,7 @@
     "crayons>= 0.1.0",
     "fs>=2.4.11",
     "jinja2-fsloader>=0.2.0",
+    "moban-jinja2-github",
 ]
 SETUP_COMMANDS = {}
 
@@ -96,8 +97,8 @@
 }
 # You do not need to read beyond this line
 PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
-GS_COMMAND = ("gs moban v0.7.10 " +
-              "Find 0.7.10 in changelog for more details")
+GS_COMMAND = ("gs moban v0.8.0 " +
+              "Find 0.8.0 in changelog for more details")
 NO_GS_MESSAGE = ("Automatic github release is disabled. " +
                  "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (