Skip to content

Commit cd8c4e3

Browse files
chfwchfw
authored
Merge pull request #7 from pyexcel/dev
release 0.6.0
2 parents 7c46a05 + 6ee2a10 commit cd8c4e3

27 files changed

+235
-210
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
With your PR, here is a check list:
22

3-
- [ ] Has Test cases written
4-
- [ ] Has all code lines tested
3+
- [ ] Has test cases written?
4+
- [ ] Has all code lines tested?
55
- [ ] Has `make format` been run?
6-
- [ ] Has `moban` been run?
6+
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
77
- [ ] Passes all Travis CI builds
88
- [ ] 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
129
- [ ] Agree on NEW BSD License for your contribution

‎.github/workflows/moban-update.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
on: [push]
2+
3+
jobs:
4+
run_moban:
5+
runs-on: ubuntu-latest
6+
name: synchronize templates via moban
7+
steps:
8+
- uses: actions/checkout@v2
9+
with:
10+
ref: ${{ github.head_ref }}
11+
- name: Set up Python
12+
uses: actions/setup-python@v1
13+
with:
14+
python-version: '3.7'
15+
- name: check changes
16+
run: |
17+
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
18+
moban
19+
git status
20+
git diff --exit-code
21+
- name: Auto-commit
22+
if: failure()
23+
uses: docker://cdssnc/auto-commit-github-action
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
with:
27+
args: >-
28+
This is an auto-commit, updating project meta data,
29+
such as changelog.rst, contributors.rst

‎.isort.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[settings]
2+
line_length=79
3+
known_first_party=lxml, pyexcel_io, pyexcel
4+
known_third_party=mock,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

‎CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Change log
22
================================================================================
33

4+
0.6.0 - 10.10.2020
5+
--------------------------------------------------------------------------------
6+
7+
**Updated**
8+
9+
#. New style xlsx plugins, promoted by pyexcel-io v0.6.2.
10+
411
0.5.3 - 23.06.2020
512
--------------------------------------------------------------------------------
613

‎CONTRIBUTORS.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
3+
No contributors yet
4+
=======================
5+
6+
* Your github link will be listed here after your PR is merged

‎LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2020 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
@@ -13,7 +13,7 @@ that the following conditions are met:
1313
and/or other materials provided with the distribution.
1414

1515
* Neither the name of 'pyexcel-xlsxr' nor the names of the contributors
16-
may be used to endorse or promote products derived from this software
16+
may not be used to endorse or promote products derived from this software
1717
without specific prior written permission.
1818

1919
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND

‎Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ test: lint
66
install_test:
77
pip install -r tests/requirements.txt
88

9-
git-diff-check:
10-
git diff --exit-code
11-
129
lint:
1310
bash lint.sh
1411

‎README.rst

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ pyexcel-xlsxr - Let you focus on data, instead of xlsx format
2525
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
2626
:target: https://gitter.im/pyexcel/Lobby
2727

28+
.. image:: https://img.shields.io/static/v1?label=continuous%20templating&message=%E6%A8%A1%E7%89%88%E6%9B%B4%E6%96%B0&color=blue&style=flat-square
29+
:target: https://moban.readthedocs.io/en/latest/#at-scale-continous-templating-for-open-source-projects
30+
31+
.. image:: https://img.shields.io/static/v1?label=coding%20style&message=black&color=black&style=flat-square
32+
:target: https://github.com/psf/black
2833

2934
**pyexcel-xlsxr** is a specialized xlsx reader using lxml. It does partial reading, meaning
3035
it wont load all content into memory.
@@ -343,22 +348,6 @@ Please run::
343348
so as to beautify your code otherwise travis-ci may fail your unit test.
344349

345350

346-
And make sure you would have run moban command
347-
---------------------------------------------------------
348-
349-
Additional steps are required:
350-
351-
#. pip install moban
352-
#. make your changes in `.moban.d` directory, then issue command `moban`
353-
#. moban
354-
355-
otherwise travis-ci may also fail your unit test.
356-
357-
What is .moban.d
358-
---------------------------------
359-
360-
`.moban.d` stores the specific meta data for the library.
361-
362351

363352
.. testcode::
364353
:hide:

‎changelog.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: pyexcel-xlsxr
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: Updated
6+
details:
7+
- 'New style xlsx plugins, promoted by pyexcel-io v0.6.2.'
8+
date: 10.10.2020
9+
version: 0.6.0
410
- changes:
511
- action: Fixed
612
details:

‎format.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
isort -y $(find pyexcel_xlsxr -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
1+
isort $(find pyexcel_xlsxr -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
22
black -l 79 pyexcel_xlsxr
33
black -l 79 tests

0 commit comments

Comments
 (0)