Skip to content

Commit fce39a6

Browse files
committed
✨ use inherited mobanfile. moremoban/moban#348
1 parent f564ff6 commit fce39a6

File tree

11 files changed

+77
-148
lines changed

11 files changed

+77
-148
lines changed

.gitignore

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ parts/
2525
sdist/
2626
var/
2727
wheels/
28+
pip-wheel-metadata/
29+
share/python-wheels/
2830
*.egg-info/
2931
.installed.cfg
3032
*.egg
@@ -43,6 +45,7 @@ pip-delete-this-directory.txt
4345
# Unit test / coverage reports
4446
htmlcov/
4547
.tox/
48+
.nox/
4649
.coverage
4750
.coverage.*
4851
.cache
@@ -77,9 +80,20 @@ target/
7780
# Jupyter Notebook
7881
.ipynb_checkpoints
7982

83+
# IPython
84+
profile_default/
85+
ipython_config.py
86+
8087
# pyenv
8188
.python-version
8289

90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don’t work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
8397
# celery beat schedule file
8498
celerybeat-schedule
8599

@@ -107,6 +121,11 @@ venv.bak/
107121

108122
# mypy
109123
.mypy_cache/
124+
.dmypy.json
125+
dmypy.json
126+
127+
# Pyre type checker
128+
.pyre/
110129

111130
# VirtualEnv rules
112131
# Virtualenv
@@ -238,6 +257,10 @@ flycheck_*.el
238257
# directory configuration
239258
.dir-locals.el
240259

260+
# network security
261+
/network-security.data
262+
263+
241264
# Vim rules
242265
# Swap
243266
[._]*.s[a-v][a-z]
@@ -268,6 +291,9 @@ tags
268291
.idea/**/dictionaries
269292
.idea/**/shelf
270293

294+
# Generated files
295+
.idea/**/contentModel.xml
296+
271297
# Sensitive or high-churn files
272298
.idea/**/dataSources/
273299
.idea/**/dataSources.ids
@@ -281,6 +307,14 @@ tags
281307
.idea/**/gradle.xml
282308
.idea/**/libraries
283309

310+
# Gradle and Maven with auto-import
311+
# When using Gradle or Maven with auto-import, you should exclude module files,
312+
# since they will be recreated, and may cause churn. Uncomment if using
313+
# auto-import.
314+
# .idea/modules.xml
315+
# .idea/*.iml
316+
# .idea/modules
317+
284318
# CMake
285319
cmake-build-*/
286320

@@ -311,6 +345,9 @@ fabric.properties
311345
# Editor-based Rest Client
312346
.idea/httpRequests
313347

348+
# Android studio 3.1+ serialized cache file
349+
.idea/caches/build_file_checksums.ser
350+
314351
# SublimeText rules
315352
# Cache files for Sublime Text
316353
*.tmlanguage.cache
@@ -390,7 +427,6 @@ DerivedData/
390427
!default.perspectivev3
391428

392429
# Eclipse rules
393-
394430
.metadata
395431
bin/
396432
tmp/

.moban.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
1-
requires:
2-
- type: git
3-
url: https://github.com/moremoban/pypi-mobans
4-
submodule: true
5-
- https://github.com/pyexcel/pyexcel-mobans
1+
overrides: "git://github.com/pyexcel/pyexcel-mobans!/mobanfile.yaml"
62
configuration:
7-
configuration_dir: "pyexcel-mobans:config"
8-
template_dir:
9-
- "pyexcel-mobans:templates"
10-
- "pypi-mobans:templates"
11-
- ".moban.d"
123
configuration: pyexcel-xlsx.yml
134
targets:
145
- Pipfile: Pipfile.jj2
156
- README.rst: README.rst
167
- setup.py: setup.py
178
- "docs/source/conf.py": "docs/source/conf.py.jj2"
189
- .travis.yml: travis.yml
19-
- requirements.txt: requirements.txt
20-
- LICENSE: NEW_BSD_LICENSE.jj2
2110
- MANIFEST.in: MANIFEST.in.jj2
2211
- .gitignore: gitignore.jj2
23-
- test.sh: test.script.jj2
24-
- test.bat: test.script.jj2
2512
- "tests/requirements.txt": "tests/requirements.txt"
2613
- "tests/test_filter.py": "tests/test_filter.py.jj2"
2714
- "tests/test_formatters.py": "tests/test_formatters.py"
2815
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"
2916
- "tests/test_writer.py": "tests/test_writer.py.jj2"
3017
- "tests/base.py": "tests/base.py"
31-
- output: CHANGELOG.rst
32-
configuration: changelog.yml
33-
template: CHANGELOG.rst.jj2

.travis.yml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
1-
sudo: false
2-
dist: xenial
3-
language: python
4-
notifications:
5-
email: false
6-
python:
7-
- &pypy2 pypy2.7-6.0
8-
- &pypy3 pypy3.5-6.0
9-
- 3.8-dev
10-
- 3.7
11-
- 3.6
12-
- 3.5
13-
- 2.7
14-
before_install:
15-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
1+
{% extends "travis.yml.jj2" %}
2+
3+
{%block custom_install %} - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
164
- pip install --upgrade pip>8 setuptools>21
17-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
18-
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
19-
mv min_requirements.txt requirements.txt ;
20-
fi
21-
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
22-
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
23-
- pip install -r tests/requirements.txt
24-
script:
25-
- make test
26-
after_success:
27-
codecov
5+
{%endblock%}

CHANGELOG.rst

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,45 @@ Change log
44
0.5.7 - 15.02.2019
55
--------------------------------------------------------------------------------
66

7-
Added
8-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7+
**Added**
98

109
#. pyexcel-io#66 pin openpyxl < 2.6.0
1110

1211
0.5.6 - 26.03.2018
1312
--------------------------------------------------------------------------------
1413

15-
Added
16-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14+
**Added**
1715

1816
#. `#24 <https://github.com/pyexcel/pyexcel-xlsx/issues/24>`_, remove deprecated
1917
warning from merged_cell_ranges and get_sheet_by_name
2018

2119
0.5.5 - 18.12.2017
2220
--------------------------------------------------------------------------------
2321

24-
Added
25-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
22+
**Added**
2623

2724
#. `#22 <https://github.com/pyexcel/pyexcel-xlsx/issues/22>`_, to detect merged
2825
cell in xlsx - fast tracked patreon request.
2926

3027
0.5.4 - 2.11.2017
3128
--------------------------------------------------------------------------------
3229

33-
Updated
34-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30+
**Updated**
3531

3632
#. Align the behavior of skip_hidden_row_and_column. Default it to True.
3733

3834
0.5.3 - 2.11.2017
3935
--------------------------------------------------------------------------------
4036

41-
Added
42-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
37+
**Added**
4338

4439
#. `#20 <https://github.com/pyexcel/pyexcel-xlsx/issues/20>`_, skip hidden rows
4540
and columns under 'skip_hidden_row_and_column' flag.
4641

4742
0.5.2 - 23.10.2017
4843
--------------------------------------------------------------------------------
4944

50-
updated
51-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
45+
**updated**
5246

5347
#. pyexcel `pyexcel#105 <https://github.com/pyexcel/pyexcel/issues/105>`_,
5448
remove gease from setup_requires, introduced by 0.5.1.
@@ -58,8 +52,7 @@ updated
5852
0.5.1 - 20.10.2017
5953
--------------------------------------------------------------------------------
6054

61-
added
62-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
55+
**added**
6356

6457
#. `pyexcel#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include
6558
LICENSE file in MANIFEST.in, meaning LICENSE file will appear in the released
@@ -68,40 +61,35 @@ added
6861
0.5.0 - 30.08.2017
6962
--------------------------------------------------------------------------------
7063

71-
Updated
72-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
64+
**Updated**
7365

7466
#. put dependency on pyexcel-io 0.5.0, which uses cStringIO instead of StringIO.
7567
Hence, there will be performance boost in handling files in memory.
7668

77-
Removed
78-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
69+
**Removed**
7970

8071
#. `#18 <https://github.com/pyexcel/pyexcel-xlsx/issues/18>`_, is handled in
8172
pyexcel-io
8273

8374
0.4.2 - 25.08.2017
8475
--------------------------------------------------------------------------------
8576

86-
Updated
87-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
77+
**Updated**
8878

8979
#. `#18 <https://github.com/pyexcel/pyexcel-xlsx/issues/18>`_, handle unseekable
9080
stream given by http response
9181

9282
0.4.1 - 16.07.2017
9383
--------------------------------------------------------------------------------
9484

95-
Removed
96-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
85+
**Removed**
9786

9887
#. Removed useless code
9988

10089
0.4.0 - 19.06.2017
10190
--------------------------------------------------------------------------------
10291

103-
Updated
104-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
92+
**Updated**
10593

10694
#. `#14 <https://github.com/pyexcel/pyexcel-xlsx/issues/14>`_, close file handle
10795
#. pyexcel-io plugin interface now updated to use `lml
@@ -110,8 +98,7 @@ Updated
11098
0.3.0 - 22.12.2016
11199
--------------------------------------------------------------------------------
112100

113-
Updated
114-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
101+
**Updated**
115102

116103
#. Code refactoring with pyexcel-io v 0.3.0
117104
#. `#13 <https://github.com/pyexcel/pyexcel-xlsx/issues/13>`_, turn read_only
@@ -120,8 +107,7 @@ Updated
120107
0.2.3 - 05.11.2016
121108
--------------------------------------------------------------------------------
122109

123-
Updated
124-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
110+
**Updated**
125111

126112
#. `#12 <https://github.com/pyexcel/pyexcel-xlsx/issues/12>`_, remove
127113
UserWarning: Using a coordinate with ws.cell is deprecated. Use
@@ -130,17 +116,15 @@ Updated
130116
0.2.2 - 31.08.2016
131117
--------------------------------------------------------------------------------
132118

133-
Added
134-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
119+
**Added**
135120

136121
#. support pagination. two pairs: start_row, row_limit and start_column,
137122
column_limit help you deal with large files.
138123

139124
0.2.1 - 12.07.2016
140125
--------------------------------------------------------------------------------
141126

142-
Added
143-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
127+
**Added**
144128

145129
#. `#8 <https://github.com/pyexcel/pyexcel-xlsx/issues/8>`__,
146130
`skip_hidden_sheets` is added. By default, hidden sheets are skipped when
@@ -149,29 +133,25 @@ Added
149133
0.2.0 - 01.06.2016
150134
--------------------------------------------------------------------------------
151135

152-
Added
153-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
136+
**Added**
154137

155138
#. 'library=pyexcel-xlsx' was added to inform pyexcel to use it instead of other
156139
libraries, in the situation where there are more than one plugin for a file
157140
type, e.g. xlsm
158141

159-
Updated
160-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
142+
**Updated**
161143

162144
#. support the auto-import feature of pyexcel-io 0.2.0
163145

164146
0.1.0 - 17.01.2016
165147
--------------------------------------------------------------------------------
166148

167-
Added
168-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
149+
**Added**
169150

170151
#. Passing "streaming=True" to get_data, you will get the two dimensional array
171152
as a generator
172153
#. Passing "data=your_generator" to save_data is acceptable too.
173154

174-
Updated
175-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
155+
**Updated**
176156

177157
#. compatibility with pyexcel-io 0.1.0

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
22
All rights reserved.
33

44
Redistribution and use in source and binary forms of the software as well

MANIFEST.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ include README.rst
22
include LICENSE
33
include CHANGELOG.rst
44
recursive-include tests *
5-
include docs/source/*
6-
include Makefile
7-
include test.sh
5+
recursive-include docs *

Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ name = 'pypi'
77
python_version= '3.6'
88

99
[packages]
10-
openpyxl>=2.5.0,<2.6.0
11-
pyexcel-io>=0.5.3
10+
openpyxl = '>=2.5.0,<2.6.0'
11+
pyexcel-io = '>=0.5.3'
1212

1313
[dev-packages]
1414
nose = "*"

0 commit comments

Comments
 (0)