Skip to content

Commit b15806e

Browse files
committed
📚 🤝 sync with evolving pyexcel metat data.
1 parent 637a3c0 commit b15806e

File tree

9 files changed

+76
-5
lines changed

9 files changed

+76
-5
lines changed

.moban.d/tests/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ pyexcel-xls>=0.1.0
66
pyexcel-xlsx>=0.1.0
77
pyexcel-handsontable
88
pyexcel-pygal
9+
moban
10+
black;python_version>="3.6"
11+
isort;python_version>="3.6"
912
{%endblock%}

.moban.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
requires:
2+
- type: git
3+
url: https://github.com/moremoban/pypi-mobans
4+
submodule: true
5+
- https://github.com/pyexcel/pyexcel-mobans
16
configuration:
2-
configuration_dir: "commons/config"
7+
configuration_dir: "pyexcel-mobans:config"
38
template_dir:
4-
- "commons/templates"
5-
- "setupmobans/templates"
9+
- "pyexcel-mobans:templates"
10+
- "pypi-mobans:templates"
611
- ".moban.d"
712
configuration: django_excel.yml
813
targets:
@@ -16,3 +21,4 @@ targets:
1621
- output: CHANGELOG.rst
1722
configuration: changelog.yml
1823
template: CHANGELOG.rst.jj2
24+
- lint.sh: lint.script.jj2

.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sudo: false
2+
dist: xenial
23
language: python
34
notifications:
45
email: false
@@ -70,6 +71,20 @@ matrix:
7071
env: DJANGO_VERSION=1.8.18
7172
- python: 3.7-dev
7273
env: DJANGO_VERSION=1.11.15
74+
75+
stages:
76+
- test
77+
- lint
78+
jobs:
79+
include:
80+
- stage: lint
81+
python: 3.6
82+
script: make lint
83+
84+
stage: test
85+
86+
script: make test
87+
7388
before_install:
7489
- pip install Django==$DJANGO_VERSION
7590
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
include README.rst
22
include LICENSE
33
include CHANGELOG.rst
4+
recursive-include tests *
5+
recursive-include docs *
46
prune mysite
57
prune polls

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ spelling:
88

99
doc:
1010
sphinx-build -b html docs/source docs/build
11+
12+
format:
13+
isort -y $(find pyexcel -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
14+
black -l 79 pyexcel
15+
black -l 79 tests
16+
17+
lint:
18+
bash lint.sh

README.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,11 @@ The highlighted features are:
109109
======================== ======================= ================= ==================
110110
`pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3
111111
`pyexcel-xlsxr`_ xlsx(read only) lxml same as above
112+
`pyexcel-xlsbr`_ xlsx(read only) pyxlsb same as above
112113
`pyexcel-odsr`_ read only for ods, fods lxml same as above
114+
`pyexcel-odsw`_ write only for ods loxun same as above
113115
`pyexcel-htmlr`_ html(read only) lxml,html5lib same as above
116+
`pyexcel-pdfr`_ pdf(read only) pdftables Python 2 only.
114117
======================== ======================= ================= ==================
115118

116119

@@ -120,8 +123,12 @@ The highlighted features are:
120123
.. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods
121124
.. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3
122125
.. _pyexcel-odsr: https://github.com/pyexcel/pyexcel-odsr
126+
.. _pyexcel-odsw: https://github.com/pyexcel/pyexcel-odsw
127+
.. _pyexcel-pdfr: https://github.com/pyexcel/pyexcel-pdfr
128+
123129
.. _pyexcel-xlsxw: https://github.com/pyexcel/pyexcel-xlsxw
124130
.. _pyexcel-xlsxr: https://github.com/pyexcel/pyexcel-xlsxr
131+
.. _pyexcel-xlsbr: https://github.com/pyexcel/pyexcel-xlsbr
125132
.. _pyexcel-htmlr: https://github.com/pyexcel/pyexcel-htmlr
126133

127134
.. _xlrd: https://github.com/python-excel/xlrd
@@ -346,6 +353,7 @@ Acceptance criteria
346353
#. Has all code lines tested
347354
#. Passes all Travis CI builds
348355
#. Has fair amount of documentation if your change is complex
356+
#. run 'make format' so as to confirm the pyexcel organisation's coding style
349357
#. Please update CHANGELOG.rst
350358
#. Please add yourself to CONTRIBUTORS.rst
351359
#. Agree on NEW BSD License for your contribution

docs/source/index.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ The highlighted features are:
7777
======================== ======================= ================= ==================
7878
`pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3
7979
`pyexcel-xlsxr`_ xlsx(read only) lxml same as above
80+
`pyexcel-xlsbr`_ xlsx(read only) pyxlsb same as above
8081
`pyexcel-odsr`_ read only for ods, fods lxml same as above
82+
`pyexcel-odsw`_ write only for ods loxun same as above
8183
`pyexcel-htmlr`_ html(read only) lxml,html5lib same as above
84+
`pyexcel-pdfr`_ pdf(read only) pdftables Python 2 only.
8285
======================== ======================= ================= ==================
8386

8487

@@ -88,8 +91,12 @@ The highlighted features are:
8891
.. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods
8992
.. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3
9093
.. _pyexcel-odsr: https://github.com/pyexcel/pyexcel-odsr
94+
.. _pyexcel-odsw: https://github.com/pyexcel/pyexcel-odsw
95+
.. _pyexcel-pdfr: https://github.com/pyexcel/pyexcel-pdfr
96+
9197
.. _pyexcel-xlsxw: https://github.com/pyexcel/pyexcel-xlsxw
9298
.. _pyexcel-xlsxr: https://github.com/pyexcel/pyexcel-xlsxr
99+
.. _pyexcel-xlsbr: https://github.com/pyexcel/pyexcel-xlsbr
93100
.. _pyexcel-htmlr: https://github.com/pyexcel/pyexcel-htmlr
94101

95102
.. _xlrd: https://github.com/python-excel/xlrd

setup.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,28 @@
44
import os
55
import sys
66
import codecs
7+
import locale
8+
import platform
79
from shutil import rmtree
8-
from setuptools import setup, find_packages, Command
10+
11+
from setuptools import Command, setup, find_packages
12+
913
PY2 = sys.version_info[0] == 2
1014
PY26 = PY2 and sys.version_info[1] < 7
15+
PY33 = sys.version_info < (3, 4)
16+
17+
# Work around mbcs bug in distutils.
18+
# http://bugs.python.org/issue10945
19+
# This work around is only if a project supports Python < 3.4
20+
21+
# Work around for locale not being set
22+
try:
23+
lc = locale.getlocale()
24+
pf = platform.system()
25+
if pf != 'Windows' and lc == (None, None):
26+
locale.setlocale(locale.LC_ALL, 'C.UTF-8')
27+
except (ValueError, UnicodeError, locale.Error):
28+
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
1129

1230
NAME = 'django-excel'
1331
AUTHOR = 'C.W.'
@@ -22,9 +40,9 @@
2240
DOWNLOAD_URL = '%s/archive/0.0.10.tar.gz' % URL
2341
FILES = ['README.rst', 'CHANGELOG.rst']
2442
KEYWORDS = [
43+
'python',
2544
'API',
2645
'Django',
27-
'python',
2846
]
2947

3048
CLASSIFIERS = [
@@ -180,6 +198,7 @@ def filter_out_test_code(file_handle):
180198

181199
if __name__ == '__main__':
182200
setup(
201+
test_suite="tests",
183202
name=NAME,
184203
author=AUTHOR,
185204
version=VERSION,

tests/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ pyexcel-xls>=0.1.0
99
pyexcel-xlsx>=0.1.0
1010
pyexcel-handsontable
1111
pyexcel-pygal
12+
moban
13+
black;python_version>="3.6"
14+
isort;python_version>="3.6"

0 commit comments

Comments
 (0)