Skip to content

Commit 27b830d

Browse files
authored
Merge pull request #35 from pyexcel/dev
release 0.5.8
2 parents 3a08c32 + be718ba commit 27b830d

24 files changed

+247
-185
lines changed

Diff for: .github/FUNDING.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
github: chfw
4+
patreon: chfw

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
With your PR, here is a check list:
2+
3+
- [ ] Has Test cases written
4+
- [ ] Has all code lines tested
5+
- [ ] Has `make format` been run?
6+
- [ ] Has `moban` been run?
7+
- [ ] Passes all Travis CI builds
8+
- [ ] Has fair amount of documentation if your change is complex
9+
- [ ] run 'make format' so as to confirm the pyexcel organisation's coding style
10+
- [ ] Please update CHANGELOG.rst
11+
- [ ] Please add yourself to CONTRIBUTORS.rst
12+
- [ ] Agree on NEW BSD License for your contribution

Diff for: .github/workflows/pythonpublish.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Upload Python Package
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v1
12+
- name: Set up Python
13+
uses: actions/setup-python@v1
14+
with:
15+
python-version: '3.x'
16+
- name: Install dependencies
17+
run: |
18+
python -m pip install --upgrade pip
19+
pip install setuptools wheel twine
20+
- name: Build and publish
21+
env:
22+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
24+
run: |
25+
python setup.py sdist bdist_wheel
26+
twine upload dist/*

Diff for: .gitignore

+37-1
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/

Diff for: .isort.cfg

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[settings]
2+
line_length=79
3+
known_first_party=lml, pyexcel, openpyxl
4+
known_third_party=nose
5+
indent=' '
6+
multi_line_output=3
7+
length_sort=1
8+
default_section=FIRSTPARTY
9+
no_lines_before=LOCALFOLDER
10+
sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER

Diff for: .moban.d/README.rst renamed to .moban.d/custom_README.rst.jj2

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{%extends 'README.rst.jj2' %}
22

3+
{%block documentation_link%}
4+
{%endblock%}
5+
36
{%block description%}
47
**{{name}}** is a tiny wrapper library to read, manipulate and write data in xlsx and xlsm format using `read_only` mode reader, `write_only` mode writer from openpyxl. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`__.
58

File renamed without changes.

Diff for: .moban.yml

+3-24
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,12 @@
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
15-
- README.rst: README.rst
6+
- README.rst: custom_README.rst.jj2
167
- setup.py: setup.py
178
- "docs/source/conf.py": "docs/source/conf.py.jj2"
18-
- .travis.yml: travis.yml
19-
- requirements.txt: requirements.txt
20-
- LICENSE: NEW_BSD_LICENSE.jj2
9+
- .travis.yml: custom_travis.yml.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"
26-
- "tests/test_filter.py": "tests/test_filter.py.jj2"
27-
- "tests/test_formatters.py": "tests/test_formatters.py"
28-
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"
29-
- "tests/test_writer.py": "tests/test_writer.py.jj2"
30-
- "tests/base.py": "tests/base.py"
31-
- output: CHANGELOG.rst
32-
configuration: changelog.yml
33-
template: CHANGELOG.rst.jj2

Diff for: .travis.yml

+46-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,58 @@ python:
1111
- 3.6
1212
- 3.5
1313
- 2.7
14+
15+
stages:
16+
- lint
17+
- moban
18+
- test
19+
20+
.disable_global: &disable_global
21+
addons: false
22+
cache: false
23+
env: {}
24+
python: false
25+
before_install: false
26+
install: false
27+
before_script: false
28+
script: false
29+
after_success: false
30+
after_failure: false
31+
before_deploy: false
32+
deploy: false
33+
34+
.lint: &lint
35+
<<: *disable_global
36+
git:
37+
submodules: false
38+
python: 3.6
39+
stage: lint
40+
script: make lint
41+
42+
.moban: &moban
43+
<<: *disable_global
44+
python: 3.6
45+
stage: moban
46+
install: pip install moban>=0.0.4
47+
script:
48+
- moban
49+
- git diff --exit-code
50+
51+
jobs:
52+
include:
53+
- *moban
54+
- *lint
55+
56+
stage: test
57+
1458
before_install:
1559
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
1660
- pip install --upgrade pip>8 setuptools>21
17-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1861
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
1962
mv min_requirements.txt requirements.txt ;
2063
fi
21-
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
64+
- test ! -f rnd_requirements.txt ||
65+
pip install --no-deps -r rnd_requirements.txt
2266
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
2367
- pip install -r tests/requirements.txt
2468
script:

0 commit comments

Comments
 (0)