Skip to content

Commit 8bf2c96

Browse files
committed
📚 sync with latest pypi-mobans
1 parent 372166e commit 8bf2c96

File tree

9 files changed

+41
-80
lines changed

9 files changed

+41
-80
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2018 by Onni Software Ltd. and its contributors
1+
Copyright (c) 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

Pipfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,12 @@ name = 'pypi'
77
python_version= '3.6'
88

99
[packages]
10-
openpyxl>=2.4.4
10+
openpyxl>=2.4.4,<2.6.0
1111
pyexcel-io>=0.5.3
12+
13+
[dev-packages]
14+
nose = "*"
15+
mock = "*"
16+
codecov = "*"
17+
coverage = "*"
18+
flake8 = "*"

README.rst

+1
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ Acceptance criteria
373373
#. Has all code lines tested
374374
#. Passes all Travis CI builds
375375
#. Has fair amount of documentation if your change is complex
376+
#. run 'make format' so as to confirm the pyexcel organisation's coding style
376377
#. Please update CHANGELOG.rst
377378
#. Please add yourself to CONTRIBUTORS.rst
378379
#. Agree on NEW BSD License for your contribution

docs/source/conf.py

+8-73
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
'format' +
55
''
66
)
7-
# -*- coding: utf-8 -*-
8-
#
97
# Configuration file for the Sphinx documentation builder.
108
#
11-
# This file does only contain a selection of the most common options. For a
12-
# full list see the documentation:
9+
# This file only contains a selection of the most common options. For a full
10+
# list see the documentation:
1311
# http://www.sphinx-doc.org/en/master/config
1412

1513
# -- Path setup --------------------------------------------------------------
@@ -24,22 +22,18 @@
2422

2523
# -- Project information -----------------------------------------------------
2624

27-
project = u'pyexcel-xlsx'
28-
copyright = u'2015-2018 Onni Software Ltd.'
29-
author = u'C.W.'
25+
project = 'pyexcel-xlsx'
26+
copyright = 'copyright 2015-2019 Onni Software Ltd.'
27+
author = 'Onni Software Ltd.'
3028

3129
# The short X.Y version
32-
version = u'0.5.2'
30+
version = '0.6.0'
3331
# The full version, including alpha/beta/rc tags
34-
release = u'0.6.0'
32+
release = '0.5.2'
3533

3634

3735
# -- General configuration ---------------------------------------------------
3836

39-
# If your documentation needs a minimal Sphinx version, state it here.
40-
#
41-
# needs_sphinx = '1.0'
42-
4337
# Add any Sphinx extension module names here, as strings. They can be
4438
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4539
# ones.
@@ -69,9 +63,6 @@
6963
# This pattern also affects html_static_path and html_extra_path.
7064
exclude_patterns = []
7165

72-
# The name of the Pygments (syntax highlighting) style to use.
73-
pygments_style = None
74-
7566

7667
# -- Options for HTML output -------------------------------------------------
7768

@@ -102,63 +93,6 @@
10293
# html_sidebars = {}
10394

10495

105-
# -- Options for HTMLHelp output ---------------------------------------------
106-
107-
# Output file base name for HTML help builder.
108-
htmlhelp_basename = 'pyexcel-xlsxdoc'
109-
110-
111-
# -- Options for LaTeX output ------------------------------------------------
112-
113-
latex_elements = {
114-
# The paper size ('letterpaper' or 'a4paper').
115-
#
116-
# 'papersize': 'letterpaper',
117-
118-
# The font size ('10pt', '11pt' or '12pt').
119-
#
120-
# 'pointsize': '10pt',
121-
122-
# Additional stuff for the LaTeX preamble.
123-
#
124-
# 'preamble': '',
125-
126-
# Latex figure (float) alignment
127-
#
128-
# 'figure_align': 'htbp',
129-
}
130-
131-
# Grouping the document tree into LaTeX files. List of tuples
132-
# (source start file, target name, title,
133-
# author, documentclass [howto, manual, or own class]).
134-
latex_documents = [
135-
(master_doc, 'pyexcel-xlsx.tex', u'pyexcel-xlsx Documentation',
136-
u'Onni Software Ltd.', 'manual'),
137-
]
138-
139-
140-
# -- Options for manual page output ------------------------------------------
141-
142-
# One entry per manual page. List of tuples
143-
# (source start file, name, description, authors, manual section).
144-
man_pages = [
145-
(master_doc, 'pyexcel-xlsx', u'pyexcel-xlsx Documentation',
146-
[author], 1)
147-
]
148-
149-
150-
# -- Options for Texinfo output ----------------------------------------------
151-
152-
# Grouping the document tree into Texinfo files. List of tuples
153-
# (source start file, target name, title, author,
154-
# dir menu entry, description, category)
155-
texinfo_documents = [
156-
(master_doc, 'pyexcel-xlsx', u'pyexcel-xlsx Documentation',
157-
author, 'pyexcel-xlsx', 'One line description of project.',
158-
'Miscellaneous'),
159-
]
160-
161-
16296
# -- Options for Epub output -------------------------------------------------
16397

16498
# Bibliographic Dublin Core info.
@@ -181,6 +115,7 @@
181115

182116
# Example configuration for intersphinx: refer to the Python standard library.
183117
intersphinx_mapping = {'https://docs.python.org/': None}
118+
184119
# TODO: html_theme not configurable upstream
185120
html_theme = 'default'
186121

pyexcel_xlsx.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-xlsx"
3+
project: "pyexcel-xlsx"
34
nick_name: xlsx
45
version: 0.6.0
56
current_version: 0.6.0
67
release: 0.5.2
78
file_type: xlsx
9+
gitignore_language: Python
810
dependencies:
9-
- openpyxl>=2.4.4
11+
- openpyxl>=2.4.4,<2.6.0
1012
- pyexcel-io>=0.5.3
1113
description: A wrapper library to read, manipulate and write data in xlsx and xlsm format

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
openpyxl>=2.4.4
1+
openpyxl>=2.4.4,<2.6.0
22
pyexcel-io>=0.5.3

setup.py

+17-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,25 @@
44
import os
55
import sys
66
import codecs
7+
import locale
8+
import platform
79
from shutil import rmtree
810

911
from setuptools import Command, setup, find_packages
1012

13+
# Work around mbcs bug in distutils.
14+
# http://bugs.python.org/issue10945
15+
# This work around is only if a project supports Python < 3.4
16+
17+
# Work around for locale not being set
18+
try:
19+
lc = locale.getlocale()
20+
pf = platform.system()
21+
if pf != 'Windows' and lc == (None, None):
22+
locale.setlocale(locale.LC_ALL, 'C.UTF-8')
23+
except (ValueError, UnicodeError, locale.Error):
24+
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
25+
1126
NAME = 'pyexcel-xlsx'
1227
AUTHOR = 'C.W.'
1328
VERSION = '0.6.0'
@@ -39,7 +54,7 @@
3954
]
4055

4156
INSTALL_REQUIRES = [
42-
'openpyxl>=2.4.4',
57+
'openpyxl>=2.4.4,<2.6.0',
4358
'pyexcel-io>=0.5.3',
4459
]
4560
SETUP_COMMANDS = {}
@@ -161,6 +176,7 @@ def filter_out_test_code(file_handle):
161176

162177
if __name__ == '__main__':
163178
setup(
179+
test_suite="tests",
164180
name=NAME,
165181
author=AUTHOR,
166182
version=VERSION,

tests/test_hidden.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import os
22

3-
from nose.tools import eq_
43
from pyexcel_xlsx import get_data
54

5+
from nose.tools import eq_
6+
67

78
def test_hidden_row():
89
data = get_data(

tests/test_writer.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import os
22

33
from base import PyexcelWriterBase, PyexcelHatWriterBase
4-
54
from pyexcel_xlsx.xlsxr import XLSXBook as Reader
65
from pyexcel_xlsx.xlsxw import XLSXWriter as Writer
76

0 commit comments

Comments
 (0)