Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

github: chfw
patreon: chfw
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
With your PR, here is a check list:

- [ ] Has Test cases written
- [ ] Has all code lines tested
- [ ] 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
38 changes: 37 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
Expand All @@ -43,6 +45,7 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
Expand Down Expand Up @@ -77,9 +80,20 @@ target/
# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.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

# celery beat schedule file
celerybeat-schedule

Expand Down Expand Up @@ -107,6 +121,11 @@ venv.bak/

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# VirtualEnv rules
# Virtualenv
Expand Down Expand Up @@ -238,6 +257,10 @@ flycheck_*.el
# directory configuration
.dir-locals.el

# network security
/network-security.data


# Vim rules
# Swap
[._]*.s[a-v][a-z]
Expand Down Expand Up @@ -268,6 +291,9 @@ tags
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
Expand All @@ -281,6 +307,14 @@ 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/modules.xml
# .idea/*.iml
# .idea/modules

# CMake
cmake-build-*/

Expand Down Expand Up @@ -311,6 +345,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
Expand Down Expand Up @@ -390,7 +427,6 @@ DerivedData/
!default.perspectivev3

# Eclipse rules

.metadata
bin/
tmp/
Expand Down
File renamed without changes.
File renamed without changes.
19 changes: 4 additions & 15 deletions .moban.yml
Original file line number Diff line number Diff line change
@@ -1,22 +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-xlsxr.yml
targets:
- README.rst: README.rst
- setup.py: setup.py
- requirements.txt: requirements.txt
- LICENSE: NEW_BSD_LICENSE.jj2
- README.rst: custom_README.rst.jj2
- setup.py: custom_setup.py.jj2
- MANIFEST.in: MANIFEST.in.jj2
- "tests/requirements.txt": "tests/requirements.txt"
- test.sh: test.script.jj2
- test.bat: test.script.jj2
- "tests/requirements.txt": "tests/custom_requirements.txt.jj2"
- .travis.yml: travis.yml.jj2
- .gitignore: gitignore.jj2
- "pyexcel_xlsxr/_version.py": version.py.jj2
- output: CHANGELOG.rst
configuration: changelog.yml
template: CHANGELOG.rst.jj2
56 changes: 51 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,66 @@
sudo: false
dist: xenial
language: python
notifications:
email: false
python:
- pypy-5.3.1
- 3.7-dev
- &pypy2 pypy2.7-6.0
- &pypy3 pypy3.5-6.0
- 3.8-dev
- 3.7
- 3.6
- 3.5
- 3.4
- 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
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
- *lint

stage: test

before_install:
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
mv min_requirements.txt requirements.txt ;
fi
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
- test ! -f rnd_requirements.txt ||
pip install --no-deps -r rnd_requirements.txt
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
- pip install -r tests/requirements.txt
script:
Expand Down
23 changes: 14 additions & 9 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,31 @@ Change log
0.5.2 - 15.09.2018
--------------------------------------------------------------------------------

Updated
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
**Updated**


**^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^**

#. Fix python 3 compactibility

0.5.1 - 14.07.2018
--------------------------------------------------------------------------------

Updated
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
**Updated**


#. `#1 <https://github.com/pyexcel/pyexcel-xlsxr/issues/1>`_: fix xml parsing
problem when the microsoft spreadsheetml 2009 ac name space 'x14ac' made lxml
an idiot
**^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^**

#. `#1 <https://github.com///issues/1>`_: fix xml parsing problem when the
microsoft spreadsheetml 2009 ac name space 'x14ac' made lxml an idiot

0.5.0 - 24.11.2017
--------------------------------------------------------------------------------

Added
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
**Added**


**^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^**

#. Initial release. In order align it with pyexcel 0.5.0 release, its version
start from 0.5.0
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015-2018 by Onni Software Ltd. and its contributors
Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
All rights reserved.

Redistribution and use in source and binary forms of the software as well
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include README.rst
include LICENSE
include CHANGELOG.rst
recursive-include tests *
recursive-include docs *
28 changes: 10 additions & 18 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@ pyexcel-xlsxr - Let you focus on data, instead of xlsx format
================================================================================

.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png
:target: https://www.patreon.com/pyexcel

.. image:: https://api.bountysource.com/badge/team?team_id=288537
:target: https://salt.bountysource.com/teams/chfw-pyexcel
:target: https://www.patreon.com/chfw

.. image:: https://travis-ci.org/pyexcel/pyexcel-xlsxr.svg?branch=master
:target: http://travis-ci.org/pyexcel/pyexcel-xlsxr

.. image:: https://codecov.io/gh/pyexcel/pyexcel-xlsxr/branch/master/graph/badge.svg
:target: https://codecov.io/gh/pyexcel/pyexcel-xlsxr

.. image:: https://badge.fury.io/py/pyexcel-xlsxr.svg
:target: https://pypi.org/project/pyexcel-xlsxr


.. image:: https://pepy.tech/badge/pyexcel-xlsxr/month
:target: https://pepy.tech/project/pyexcel-xlsxr/month


.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
:target: https://gitter.im/pyexcel/Lobby

Expand Down Expand Up @@ -63,7 +68,7 @@ Support the project
================================================================================

If your company has embedded pyexcel and its components into a revenue generating
product, please support me on `patreon <https://www.patreon.com/bePatron?u=5537627>`_
product, please support me on `github <https://github.com/sponsors/chfw>`_, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
the project and develop it further.

Expand Down Expand Up @@ -330,8 +335,6 @@ How to update test environment and update documentation
Additional steps are required:

#. pip install moban
#. git clone https://github.com/moremoban/setupmobans.git # generic setup
#. git clone https://github.com/pyexcel/pyexcel-commons.git commons
#. make your changes in `.moban.d` directory, then issue command `moban`

What is pyexcel-commons
Expand All @@ -344,17 +347,6 @@ What is .moban.d

`.moban.d` stores the specific meta data for the library.

Acceptance criteria
-------------------

#. Has Test cases written
#. Has all code lines tested
#. Passes all Travis CI builds
#. Has fair amount of documentation if your change is complex
#. Please update CHANGELOG.rst
#. Please add yourself to CONTRIBUTORS.rst
#. Agree on NEW BSD License for your contribution


.. testcode::
:hide:
Expand Down
27 changes: 27 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
releases:
- changes:
- action: Updated
details: []
- action: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
details:
- Fix python 3 compactibility
date: 15.09.2018
version: 0.5.2
- changes:
- action: Updated
details: []
- action: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
details:
- '`#1`: fix xml parsing problem when the microsoft spreadsheetml 2009 ac name
space ''x14ac'' made lxml an idiot'
date: 14.07.2018
version: 0.5.1
- changes:
- action: Added
details: []
- action: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
details:
- Initial release. In order align it with pyexcel 0.5.0 release, its version start
from 0.5.0
date: 24.11.2017
version: 0.5.0
2 changes: 2 additions & 0 deletions lint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pip install flake8
flake8 . --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long
Loading