Merge pull request #38 from pyexcel/dev

release 0.6.0

Author: chfw

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: chfw
+patreon: chfw

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+With your PR, here is a check list:
+
+- [ ] Has test cases written?
+- [ ] Has all code lines tested?
+- [ ] Has `make format` been run?
+- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
+- [ ] Passes all Travis CI builds
+- [ ] Has fair amount of documentation if your change is complex
+- [ ] Agree on NEW BSD License for your contribution

.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 moban-ansible
+          moban
+          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

.gitignore

@@ -25,6 +25,7 @@ parts/
 sdist/
 var/
 wheels/
+share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -43,14 +44,17 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -60,6 +64,7 @@ coverage.xml
 *.log
 local_settings.py
 db.sqlite3
+db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -72,16 +77,34 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# IPython
+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
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
 
-# celery beat schedule file
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
@@ -107,6 +130,17 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
 
 # VirtualEnv rules
 # Virtualenv
@@ -140,6 +174,7 @@ pip-selfcheck.json
 # Windows rules
 # Windows thumbnail cache files
 Thumbs.db
+Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 
@@ -238,16 +273,22 @@ flycheck_*.el
 # directory configuration
 .dir-locals.el
 
+# network security
+/network-security.data
+
+
 # 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
@@ -258,7 +299,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
@@ -268,6 +309,9 @@ tags
 .idea/**/dictionaries
 .idea/**/shelf
 
+# Generated files
+.idea/**/contentModel.xml
+
 # Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
@@ -281,6 +325,19 @@ tags
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Gradle and Maven with auto-import
+# 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-*/
 
@@ -311,6 +368,9 @@ fabric.properties
 # Editor-based Rest Client
 .idea/httpRequests
 
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
 # SublimeText rules
 # Cache files for Sublime Text
 *.tmlanguage.cache
@@ -326,6 +386,7 @@ fabric.properties
 
 # SFTP configuration file
 sftp-config.json
+sftp-config-alt*.json
 
 # Package control specific files
 Package Control.last-run
@@ -363,6 +424,10 @@ tmtags
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
 
 # Xcode rules
 # Xcode
@@ -389,8 +454,10 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 
-# Eclipse rules
+## Gcc Patch
+/*.gcno
 
+# Eclipse rules
 .metadata
 bin/
 tmp/
@@ -441,12 +508,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
@@ -468,3 +540,7 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
+
+
+# remove moban hash dictionary
+.moban.hashes

.isort.cfg

@@ -0,0 +1,10 @@
+[settings]
+line_length=79
+known_first_party=pyexcel,xlrd,xlwt
+known_third_party=mock,nose
+indent='    '
+multi_line_output=3
+length_sort=1
+default_section=FIRSTPARTY
+no_lines_before=LOCALFOLDER
+sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER

.moban.d/README.rst renamed to .moban.d/custom_README.rst.jj2

@@ -9,6 +9,8 @@
     'xlsm'
 {%endblock%}
 
+{% block morefiles %}"CONTRIBUTORS.rst",{% endblock %}
+
 {%block additional_classifiers%}
     'Programming Language :: Python :: Implementation :: PyPy'
 {%endblock%}

.moban.d/setup.py renamed to .moban.d/custom_setup.py.jj2

@@ -1,4 +1,4 @@
 {% extends 'tests/base.py.jj2' %}
 
 {%block ods_types%}
-{%endblock%}
+{%endblock%}

.moban.d/tests/base.py renamed to .moban.d/tests/custom_base.py.jj2

@@ -2,4 +2,7 @@
 {%block extras %}
 pyexcel
 xlrd==1.1.0
+moban
+black;python_version>="3.6"
+isort;python_version>="3.6"
 {%endblock%}

.moban.d/tests/requirements.txt renamed to .moban.d/tests/custom_requirements.txt.jj2

@@ -0,0 +1,8 @@
+{% extends "travis.yml.jj2" %}
+{%block custom_python_versions%}
+python:
+  - 3.8
+  - 3.7
+  - 3.6
+{%endblock%}
+

.moban.d/travis.yml

@@ -1,26 +1,11 @@
+overrides: "git://github.com/pyexcel/pyexcel-mobans!/mobanfile.yaml"
 configuration:
-  configuration_dir: "commons/config"
-  template_dir:
-  - "commons/templates"
-  - "setupmobans/templates"
-  - ".moban.d"
   configuration: pyexcel-xls.yml
 targets:
-  - README.rst: README.rst
-  - setup.py: setup.py
+  - README.rst: custom_README.rst.jj2
+  - setup.py: custom_setup.py.jj2
   - "docs/source/conf.py": "docs/source/conf.py.jj2"
-  - .travis.yml: travis.yml
-  - requirements.txt: requirements.txt
+  - .travis.yml: xls_travis.yml.jj2
   - .gitignore: gitignore.jj2
   - MANIFEST.in: MANIFEST.in.jj2
-  - "tests/requirements.txt": "tests/requirements.txt"
-  - test.sh: test.script.jj2
-  - test.bat: test.script.jj2
-  - "tests/test_filter.py": "tests/test_filter.py.jj2"
-  - "tests/test_formatters.py": "tests/test_formatters.py.jj2"
-  - "tests/test_stringio.py": "tests/test_stringio.py.jj2"
-  - "tests/test_writer.py": "tests/test_writer.py.jj2"
-  - "tests/base.py": "tests/base.py"
-  - output: CHANGELOG.rst
-    configuration: changelog.yml
-    template: CHANGELOG.rst.jj2
+  - "tests/requirements.txt": "tests/custom_requirements.txt.jj2"