Merge pull request #371 from moremoban/dev

Fix regression error

Author: chfw

.github/workflows/pythonpublish.yml

@@ -0,0 +1,26 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools wheel twine
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: |
+          python setup.py sdist bdist_wheel
+          twine upload dist/*

.gitignore

@@ -52,8 +52,10 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -63,6 +65,7 @@ coverage.xml
 *.log
 local_settings.py
 db.sqlite3
+db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -75,6 +78,7 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
@@ -85,17 +89,23 @@ profile_default/
 ipython_config.py
 
 # pyenv
-.python-version
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
 #   install all needed dependencies.
 #Pipfile.lock
 
-# celery beat schedule file
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
@@ -127,6 +137,16 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# static files generated from Django application using `collectstatic`
+media
+static
+
 # VirtualEnv rules
 # Virtualenv
 # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -159,6 +179,7 @@ pip-selfcheck.json
 # Windows rules
 # Windows thumbnail cache files
 Thumbs.db
+Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 
@@ -264,13 +285,15 @@ flycheck_*.el
 # Vim rules
 # Swap
 [._]*.s[a-v][a-z]
+!*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
 [._]sw[a-p]
 
 # Session
 Session.vim
+Sessionx.vim
 
 # Temporary
 .netrwhist
@@ -281,7 +304,7 @@ tags
 [._]*.un~
 
 # JetBrains rules
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
@@ -311,9 +334,14 @@ tags
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
+# *.iml
+# *.ipr
 
 # CMake
 cmake-build-*/
@@ -363,6 +391,7 @@ fabric.properties
 
 # SFTP configuration file
 sftp-config.json
+sftp-config-alt*.json
 
 # Package control specific files
 Package Control.last-run
@@ -400,6 +429,7 @@ tmtags
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+*.code-workspace
 
 # Xcode rules
 # Xcode
@@ -426,6 +456,9 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 
+## Gcc Patch
+/*.gcno
+
 # Eclipse rules
 .metadata
 bin/
@@ -477,12 +510,17 @@ local.properties
 
 # Annotation Processing
 .apt_generated/
+.apt_generated_test/
 
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies
 .worksheet
 
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
 # TortoiseGit rules
 # Project-level settings
 /.tgitconfig

.moban.cd/changelog.yml

@@ -1,6 +1,15 @@
 name: moban
 organisation: moremoban
 releases:
+  - changes:
+      - action: Fixed
+        details:
+          - "`#365`: regression was introduced by v0.6.5.
+	     If you uses mobanfile as data configuration file,
+	     you are very likely to have this show stopper.
+	     Please upgrade to this version."
+    date: 18.01.2020
+    version: 0.7.1
   - changes:
       - action: Removed
         details:

.moban.cd/moban.yml

@@ -4,16 +4,16 @@ organisation: moremoban
 author: C. W.
 contact: [email protected]
 license: MIT
-version: 0.7.0
-current_version: 0.7.0
+version: 0.7.1
+current_version: 0.7.1
 release: 0.7.0
 branch: master
 master: index
 command_line_interface: "moban"
 entry_point: "moban.main:main"
 company: Onni Software Ltd.
-copyright_year: 2017-2019
-copyright: 2017-2019 Onni Software Ltd. and its contributors
+copyright_year: 2017-2020
+copyright: 2017-2020 Onni Software Ltd. and its contributors
 keywords:
   - jinja2
   - moban

.travis.yml

@@ -16,33 +16,18 @@ stages:
   - moban
   - test
 
-.disable_global: &disable_global
-  addons: false
-  cache: false
-  env: {}
-  python: false
-  before_install: false
-  install: false
-  before_script: false
-  script: false
-  after_success: false
-  after_failure: false
-  before_deploy: false
-  deploy: false
 
 .lint: &lint
-  <<: *disable_global
   git:
     submodules: false
   python: 3.6
   stage: lint
   script: make install_test format git-diff-check lint
 
 .moban: &moban
-  <<: *disable_global
   python: 3.6
   stage: moban
-  install: pip install moban>=0.0.4
+  install: pip install moban>=0.0.4 gitfs2 pypifs
   script: make update git-diff-check
 
 jobs:

CHANGELOG.rst

@@ -1,6 +1,15 @@
 Change log
 ================================================================================
 
+0.7.1 - 18.01.2020
+--------------------------------------------------------------------------------
+
+**Fixed**
+
+#. `#365 <https://github.com/moremoban/moban/issues/365>`_: regression was
+   introduced by v0.6.5. If you uses mobanfile as data configuration file, you
+   are very likely to have this show stopper. Please upgrade to this version.
+
 0.7.0 - 18.01.2020
 --------------------------------------------------------------------------------
 

README.rst

@@ -27,6 +27,7 @@ mó bǎn - 模板 General purpose static text generator
 :Issues: http://github.com/moremoban/moban/issues
 :License: MIT
 
+.. image:: https://github.com/moremoban/moban/raw/dev/docs/images/moban-in-intro.gif
 
 Announcement
 ================================================================================
@@ -92,10 +93,6 @@ or clone it and install it:
 Quick start
 ================================================================================
 
-
-.. image:: https://github.com/moremoban/moban/raw/dev/docs/images/moban-in-intro.gif
-
-
 .. code-block:: bash
 
     $ export HELLO="world"
@@ -126,15 +123,21 @@ A bit formal example:
 	$ moban -c data.yml -t my.template
 	$ cat moban.output
 
-Given data.yml as::
+Given data.yml as:
+
+.. code-block:: bash
 
     hello: world
 
-and my.template as::
+and my.template as:
+
+.. code-block:: bash
 
     {{hello}}
 
-moban.output will contain::
+moban.output will contain:
+
+.. code-block:: bash
 
     world
 

azure-pipelines.yml

@@ -9,6 +9,6 @@ jobs:
       - template: '.azure-pipelines-steps.yml'
   - job: 'MacOS'
     pool:
-      vmImage: macOS-10.13
+      vmImage: macOS-10.15
     steps:
       - template: '.azure-pipelines-steps-macos.yml'

docs/conf.py

@@ -22,10 +22,10 @@
 # -- Project information -----------------------------------------------------
 
 project = 'moban'
-copyright = '2017-2019 Onni Software Ltd.'
+copyright = '2017-2020 Onni Software Ltd.'
 author = 'C. W.'
 # The short X.Y version
-version = '0.7.0'
+version = '0.7.1'
 # The full version, including alpha/beta/rc tags
 release = '0.7.0'
 

moban/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 __author__ = "C. W."