Test on python 3.9 (#407)

* 💄 fix jumping jinja2_fsloader problem. fix #367

* 🎉 test on python 3.9. thanks for fixing #364 and pr #404

* 🎉 github action for python 3.9

* 💚 update rua yaml version for 3.9

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 💚 add rua yaml for python 3.6

* This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst

* 💄 update yaml style

* 💚 update github action

Co-authored-by: chfw <[email protected]>

Author: chfw

.github/workflows/pythonpackage.yml

@@ -9,17 +9,16 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9-dev]
 
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v2
+      - uses: actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip setuptools
           pip install -r requirements.txt
       - name: Lint with flake8
         run: |

.isort.cfg

@@ -2,7 +2,7 @@
 line_length=79
 # Ignore generated files
 skip=setup.py, moban/__init__.py
-known_third_party=fs, lml, crayons, jinja2, ruamel.yaml, mock, pytest
+known_third_party=fs, lml, crayons, jinja2, ruamel.yaml, pytest, jinja2_fsloader
 indent='    '
 multi_line_output=3
 length_sort=1

.moban.cd/moban.yml

@@ -18,9 +18,10 @@ keywords:
   - jinja2
   - moban
 dependencies:
+  - ruamel.yaml>=0.15.5;python_version == '3.6'
   - ruamel.yaml>=0.15.42;python_version == '3.7'
-  - ruamel.yaml>=0.15.5;python_version != '3.4' and python_version < '3.7'
   - ruamel.yaml>=0.15.98;python_version == '3.8'
+  - ruamel.yaml>=0.15.98;python_version == '3.9'
   - jinja2>=2.7.1
   - lml>=0.0.9
   - appdirs>=1.4.3

.moban.d/moban_travis.yml.jj2

@@ -10,4 +10,5 @@ python:
   - 3.7
   - 3.6
   - 3.8
+  - 3.9-dev
 {%endblock%}

.travis.yml

@@ -7,6 +7,7 @@ python:
   - 3.7
   - 3.6
   - 3.8
+  - 3.9-dev
 env:
   - MINREQ=1
 

min_requirements.txt

@@ -1,6 +1,7 @@
+ruamel.yaml==0.15.5;python_version == '3.6'
 ruamel.yaml==0.15.42;python_version == '3.7'
-ruamel.yaml==0.15.5;python_version != '3.4' and python_version < '3.7'
 ruamel.yaml==0.15.98;python_version == '3.8'
+ruamel.yaml==0.15.98;python_version == '3.9'
 jinja2==2.7.1
 lml==0.0.9
 appdirs==1.4.3

moban/plugins/jinja2/engine.py

@@ -7,10 +7,10 @@
 from jinja2 import Environment
 from lml.loader import scan_plugins_regex
 from lml.plugin import PluginInfo, PluginManager
+from jinja2_fsloader import FSLoader
 from jinja2.exceptions import TemplateNotFound, TemplateSyntaxError
 
 from moban import constants, exceptions
-from jinja2_fsloader import FSLoader
 from moban.externals import file_system
 
 JINJA2_LIBRARIES = "^moban_jinja2_.+$"

requirements.txt

@@ -1,6 +1,7 @@
+ruamel.yaml>=0.15.5;python_version == '3.6'
 ruamel.yaml>=0.15.42;python_version == '3.7'
-ruamel.yaml>=0.15.5;python_version != '3.4' and python_version < '3.7'
 ruamel.yaml>=0.15.98;python_version == '3.8'
+ruamel.yaml>=0.15.98;python_version == '3.9'
 jinja2>=2.7.1
 lml>=0.0.9
 appdirs>=1.4.3

setup.py

@@ -91,9 +91,10 @@
 
 PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests", "tests.*"])
 EXTRAS_REQUIRE = {
+    ":python_version == '3.6'": ["ruamel.yaml>=0.15.5"],
     ":python_version == '3.7'": ["ruamel.yaml>=0.15.42"],
-    ":python_version != '3.4' and python_version < '3.7'": ["ruamel.yaml>=0.15.5"],
     ":python_version == '3.8'": ["ruamel.yaml>=0.15.98"],
+    ":python_version == '3.9'": ["ruamel.yaml>=0.15.98"],
 }
 # You do not need to read beyond this line
 PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)