Merge pull request #45 from pyexcel/dev

release 0.6.0

Author: chfw

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,9 @@
 With your PR, here is a check list:
 
-- [ ] Has Test cases written
-- [ ] Has all code lines tested
+- [ ] Has test cases written?
+- [ ] Has all code lines tested?
 - [ ] Has `make format` been run?
-- [ ] Has `moban` been run?
+- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
 - [ ] Passes all Travis CI builds
 - [ ] Has fair amount of documentation if your change is complex
-- [ ] run 'make format' so as to confirm the pyexcel organisation's coding style
-- [ ] Please update CHANGELOG.rst
-- [ ] Please add yourself to CONTRIBUTORS.rst
 - [ ] 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,7 +25,6 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -52,8 +51,10 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -63,6 +64,7 @@ coverage.xml
 *.log
 local_settings.py
 db.sqlite3
+db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -75,6 +77,7 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
@@ -85,17 +88,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 +136,12 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
 # VirtualEnv rules
 # Virtualenv
 # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -159,6 +174,7 @@ pip-selfcheck.json
 # Windows rules
 # Windows thumbnail cache files
 Thumbs.db
+Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 
@@ -264,13 +280,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 +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
@@ -311,9 +329,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 +386,7 @@ fabric.properties
 
 # SFTP configuration file
 sftp-config.json
+sftp-config-alt*.json
 
 # Package control specific files
 Package Control.last-run
@@ -400,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
@@ -426,6 +454,9 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 
+## Gcc Patch
+/*.gcno
+
 # Eclipse rules
 .metadata
 bin/
@@ -477,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
@@ -504,3 +540,7 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
+
+
+# remove moban hash dictionary
+.moban.hashes

.moban.d/custom_travis.yml.jj2

@@ -1,5 +1,8 @@
 {% extends "travis.yml.jj2" %}
 
-{%block custom_install %}  - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
-  - pip install --upgrade pip>8 setuptools>21
+{%block custom_python_versions%}
+python:
+  - 3.8
+  - 3.7
+  - 3.6
 {%endblock%}

.travis.yml

@@ -4,50 +4,24 @@ language: python
 notifications:
   email: false
 python:
-  - &pypy2 pypy2.7-6.0
-  - &pypy3 pypy3.5-6.0
-  - 3.8-dev
+  - 3.8
   - 3.7
   - 3.6
-  - 3.5
-  - 2.7
 
 stages:
   - lint
-  - 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
+  env:
+    - MINREQ=0
   stage: lint
   script: make lint
 
-.moban: &moban
-  <<: *disable_global
-  python: 3.6
-  stage: moban
-  install: pip install moban>=0.0.4
-  script:
-    - moban
-    - git diff --exit-code
-
 jobs:
   include:
     - *moban
@@ -56,8 +30,6 @@ jobs:
 stage: test
 
 before_install:
-  - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
-  - pip install --upgrade pip>8 setuptools>21
   - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
       mv min_requirements.txt requirements.txt ;
     fi

CHANGELOG.rst

@@ -1,19 +1,28 @@
 Change log
 ================================================================================
 
+0.6.0 - 10.10.2020
+--------------------------------------------------------------------------------
+
+**Updated**
+
+#. New style xlsx plugins, promoted by pyexcel-io v0.6.2.
+
 0.5.8 - 28.12.2019
 --------------------------------------------------------------------------------
 
 **Updated**
 
-#. #34 pin openpyxl>=2.6.1
+#. `#34 <https://github.com/pyexcel/pyexcel-xlsx/issues/34>`_: pin
+   openpyxl>=2.6.1
 
 0.5.7 - 15.02.2019
 --------------------------------------------------------------------------------
 
 **Added**
 
-#. pyexcel-io#66 pin openpyxl < 2.6.0
+#. `pyexcel-io#66 <https://github.com/pyexcel/pyexcel-io/issues/66>`_ pin
+   openpyxl < 2.6.0
 
 0.5.6 - 26.03.2018
 --------------------------------------------------------------------------------

CONTRIBUTORS.rst

@@ -0,0 +1,10 @@
+
+
+3 contributors
+================================================================================
+
+In alphabetical order:
+
+* `Benoit Pierre <https://github.com/benoit-pierre>`_
+* `John Vandenberg <https://github.com/jayvdb>`_
+* `Stephen J. Fuhry <https://github.com/fuhrysteve>`_

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
+Copyright (c) 2015-2020 by Onni Software Ltd. and its contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms of the software as well
@@ -13,7 +13,7 @@ that the following conditions are met:
   and/or other materials provided with the distribution.
 
 * Neither the name of 'pyexcel-xlsx' nor the names of the contributors
-  may be used to endorse or promote products derived from this software
+  may not be used to endorse or promote products derived from this software
   without specific prior written permission.
 
 THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND

MANIFEST.in

@@ -1,5 +1,6 @@
 include README.rst
 include LICENSE
 include CHANGELOG.rst
+include CONTRIBUTORS.rst
 recursive-include tests *
 recursive-include docs *

Makefile

@@ -1,9 +1,16 @@
 all: test
 
-test:
+test: lint
 	bash test.sh
 
+install_test:
+	pip install -r tests/requirements.txt
+
+lint:
+	bash lint.sh
+
 format:
-	isort -y $(find pyexcel_xlsx -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
-	black -l 79 pyexcel_xlsx
-	black -l 79 tests
+	bash format.sh
+
+git-diff-check:
+	git diff --exit-code

Pipfile

@@ -8,7 +8,7 @@ python_version= '3.6'
 
 [packages]
 openpyxl = '>=2.6.1'
-pyexcel-io = '>=0.5.3'
+pyexcel-io = '>=0.6.2'
 
 [dev-packages]
 nose = "*"