Skip to content

Commit f23456d

Browse files
committed
🤝 sync with latest pypi-mobans
1 parent 7d0122e commit f23456d

File tree

11 files changed

+441
-91
lines changed

11 files changed

+441
-91
lines changed

.gitignore

Lines changed: 383 additions & 12 deletions
Large diffs are not rendered by default.

.moban.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ targets:
1616
- test.bat: test.script.jj2
1717
- .travis.yml: travis.yml.jj2
1818
- .gitignore: gitignore.jj2
19-
- "docs/source/conf.py": "docs/source/conf.py.jj2"
2019
- "pyexcel_xlsxr/_version.py": version.py.jj2
21-
- "tests/test_filter.py": "tests/test_filter.py.jj2"
22-
- "tests/test_formatters.py": "tests/test_formatters.py"
23-
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"
24-
- "tests/base.py": "tests/base.py"
20+
- output: CHANGELOG.rst
21+
configuration: changelog.yml
22+
template: CHANGELOG.rst.jj2

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ notifications:
44
email: false
55
python:
66
- pypy-5.3.1
7+
- 3.7-dev
78
- 3.6
89
- 3.5
910
- 3.4
10-
- 3.3
1111
- 2.7
1212
before_install:
13+
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1314
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
1415
mv min_requirements.txt requirements.txt ;
1516
fi

CHANGELOG.rst

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
Change log
2-
===========
2+
================================================================================
3+
4+
0.5.1 - 24.11.2018
5+
--------------------------------------------------------------------------------
6+
7+
Added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#1 <https://github.com/pyexcel/pyexcel-xlsxr/issues/1>`_: fix xml parsing
11+
problem when the microsoft spreadsheetml 2009 ac name space 'x14ac' made lxml
12+
an idiot
313

414
0.5.0 - 24.11.2017
5-
---------------------------
15+
--------------------------------------------------------------------------------
16+
17+
Added
18+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
619

7-
Initial release
20+
#. Initial release. In order align it with pyexcel 0.5.0 release, its version
21+
start from 0.5.0

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2017 by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2018 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 not be used to endorse or promote products derived from this software
16+
may 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
@@ -27,4 +27,4 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
2727
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
2828
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2929
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
30-
DAMAGE.
30+
DAMAGE.

README.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ pyexcel-xlsxr - Let you focus on data, instead of xlsx format
55
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png
66
:target: https://www.patreon.com/pyexcel
77

8-
.. image:: https://api.travis-ci.org/pyexcel/pyexcel-xlsxr.svg?branch=master
8+
.. image:: https://api.bountysource.com/badge/team?team_id=288537
9+
:target: https://salt.bountysource.com/teams/chfw-pyexcel
10+
11+
.. image:: https://travis-ci.org/pyexcel/pyexcel-xlsxr.svg?branch=master
912
:target: http://travis-ci.org/pyexcel/pyexcel-xlsxr
1013

1114
.. image:: https://codecov.io/gh/pyexcel/pyexcel-xlsxr/branch/master/graph/badge.svg
@@ -47,13 +50,16 @@ Support the project
4750
================================================================================
4851

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

53-
If you are an individual, you are welcome to support me too on patreon and for however long
54-
you feel like. As a patreon, you will receive
57+
If you are an individual, you are welcome to support me too and for however long
58+
you feel like. As my backer, you will receive
5559
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
5660

61+
And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.
62+
5763
With your financial support, I will be able to invest
5864
a little bit more time in coding, documentation and writing interesting posts.
5965

docs/source/conf.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

pyexcel_xlsxr/_version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = "0.5.0"
2-
__author__ = "C.W."
1+
__version__ = '0.5.0'
2+
__author__ = 'C.W.'

pyexcel_xlsxr/messy_xlsx.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
)
2121
SHEET_FMT_MATCHER = re.compile(b".*?(<sheet .*?\/>).*?", re.MULTILINE)
2222
DATE_1904_MATCHER = re.compile(b".*?(<workbookPr.*?\/>).*?", re.MULTILINE)
23-
# X14AC_NAMESPACE="xmlns:x14ac=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac\""
23+
#"xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac"
24+
#But it not used for now
2425
X14AC_NAMESPACE = 'xmlns:x14ac="http://not.used.com/"'
2526

2627
# see also ruby-roo lib at: http://github.com/hmcgowan/roo

setup.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Template by setupmobans
1+
#!/usr/bin/env python3
2+
3+
# Template by pypi-mobans
24
import os
35
import sys
46
import codecs
@@ -13,19 +15,16 @@
1315
1416
LICENSE = 'New BSD'
1517
DESCRIPTION = (
16-
'Read xlsx file using partial xml' +
17-
''
18+
'Read xlsx file using partial xml'
1819
)
1920
URL = 'https://github.com/pyexcel/pyexcel-xlsxr'
2021
DOWNLOAD_URL = '%s/archive/0.5.0.tar.gz' % URL
21-
FILES = ['README.rst', 'CHANGELOG.rst']
22+
FILES = ['README.rst', 'CHANGELOG.rst']
2223
KEYWORDS = [
23-
'python'
24+
'python',
2425
]
2526

2627
CLASSIFIERS = [
27-
'Topic :: Office/Business',
28-
'Topic :: Utilities',
2928
'Topic :: Software Development :: Libraries',
3029
'Programming Language :: Python',
3130
'Intended Audience :: Developers',
@@ -41,6 +40,7 @@
4140
'lxml >= 3.4.4',
4241
'pyexcel-io >= 0.5.4',
4342
]
43+
SETUP_COMMANDS = {}
4444

4545

4646
PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
@@ -79,6 +79,8 @@ def run(self):
7979
try:
8080
self.status('Removing previous builds...')
8181
rmtree(os.path.join(HERE, 'dist'))
82+
rmtree(os.path.join(HERE, 'build'))
83+
rmtree(os.path.join(HERE, 'pyexcel_xlsxr.egg-info'))
8284
except OSError:
8385
pass
8486

@@ -95,6 +97,11 @@ def run(self):
9597
sys.exit()
9698

9799

100+
SETUP_COMMANDS.update({
101+
'publish': PublishCommand
102+
})
103+
104+
98105
def has_gease():
99106
"""
100107
test if github release command is installed
@@ -119,7 +126,8 @@ def read_files(*files):
119126

120127
def read(afile):
121128
"""Read a file into setup"""
122-
with codecs.open(afile, 'r', 'utf-8') as opened_file:
129+
the_relative_file = os.path.join(HERE, afile)
130+
with codecs.open(the_relative_file, 'r', 'utf-8') as opened_file:
123131
content = filter_out_test_code(opened_file)
124132
content = "".join(list(content))
125133
return content
@@ -168,7 +176,5 @@ def filter_out_test_code(file_handle):
168176
include_package_data=True,
169177
zip_safe=False,
170178
classifiers=CLASSIFIERS,
171-
cmdclass={
172-
'publish': PublishCommand,
173-
}
179+
cmdclass=SETUP_COMMANDS
174180
)

0 commit comments

Comments
 (0)