8000 :handshake: sync with latest pypi-mobans and pyexcel-mobans · pyexcel/pyexcel-xlsbr@c083a73 · GitHub
[go: up one dir, main page]
Skip to content

Commit c083a73

Browse files
chfwchfw
committed
🤝 sync with latest pypi-mobans and pyexcel-mobans
1 parent 969b73a commit c083a73

File tree

9 files changed

+68
-122
lines changed

9 files changed

+68
-122
lines changed

‎.moban.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
requires:
2+
- type: git
3+
url: https://github.com/moremoban/pypi-mobans
4+
submodule: true
5+
- https://github.com/pyexcel/pyexcel-mobans
16
configuration:
2-
configuration_dir: "commons/config"
7+
configuration_dir: "pyexcel-mobans:config"
38
template_dir:
4-
- "commons/templates"
5-
- "setupmobans/templates"
6-
- ".moban.d"
9+
- "pyexcel-mobans:templates"
10+
- "pypi-mobans:templates"
11+
- ".moban.d"
712
configuration: pyexcel-xlsbr.yml
813
targets:
914
- README.rst: README.rst

‎.travis.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
sudo: false
2+
dist: xenial
23
language: python
34
notifications:
45
email: false
56
python:
6-
- pypy-5.3.1
7-
- 3.7-dev
7+
- &pypy2 pypy2.7-6.0
8+
- &pypy3 pypy3.5-6.0
9+
- 3.8-dev
10+
- 3.7
811
- 3.6
912
- 3.5
10-
- 3.4
1113
- 2.7
14+
15+
stages:
16+
- test
17+
- lint
18+
jobs:
19+
include:
20+
- stage: lint
21+
python: 3.6
22+
script: make lint
23+
24+
stage: test
25+
26+
script: make test
27+
1228
before_install:
1329
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1430
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then

‎LICENSE

Lines changed: 1 addition & 1 deletion
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

‎MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
include README.rst
22
include LICENSE
33
include CHANGELOG.rst
4+
recursive-include tests *
5+
recursive-include docs *

‎README.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ Support the project
2424
================================================================================
2525

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

30-
If you are an individual, you are welcome to support me too on patreon and for however long
31-
you feel like. As a patreon, you will receive
31+
If you are an individual, you are welcome to support me too and for however long
32+
you feel like. As my backer, you will receive
3233
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
3334

3435
And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.
@@ -133,6 +134,7 @@ Acceptance criteria
133134
#. Has all code lines tested
134135
#. Passes all Travis CI builds
135136
#. Has fair amount of documentation if your change is complex
137+
#. run 'make format' so as to confirm the pyexcel organisation's coding style
136138
#. Please update CHANGELOG.rst
137139
#. Please add yourself to CONTRIBUTORS.rst
138140
#. Agree on NEW BSD License for your contribution

‎docs/source/conf.py

Lines changed: 8 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
'read Microsoft Excel tm xlsb file' +
44
''
55
)
6-
# -*- coding: utf-8 -*-
7-
#
86
# Configuration file for the Sphinx documentation builder.
97
#
10-
# This file does only contain a selection of the most common options. For a
11-
# full list see the documentation:
8+
# This file only contains a selection of the most common options. For a full
9+
# list see the documentation:
1210
# http://www.sphinx-doc.org/en/master/config
1311

1412
# -- Path setup --------------------------------------------------------------
@@ -23,44 +21,24 @@
2321

2422
# -- Project information -----------------------------------------------------
2523

26-
project = u'pyexcel-xlsbr'
27-
copyright = u'2015-2018 Onni Software Ltd.'
28-
author = u'C.W.'
29-
24+
project = 'pyexcel'
25+
copyright = 'copyright 2015-2019 Onni Software Ltd.'
26+
author = 'Onni Software Ltd.'
3027
# The short X.Y version
31-
version = u'0.0.1'
28+
version = '0.0.1'
3229
# The full version, including alpha/beta/rc tags
33-
release = u'0.0.1'
34-
30+
release = '0.0.1'
3531

3632
# -- General configuration ---------------------------------------------------
3733

38-
# If your documentation needs a minimal Sphinx version, state it here.
39-
#
40-
# needs_sphinx = '1.0'
41-
4234
# Add any Sphinx extension module names here, as strings. They can be
4335
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4436
# ones.
45-
extensions = [
46-
'sphinx.ext.autodoc',
47-
'sphinx.ext.doctest',
48-
'sphinx.ext.intersphinx',
49-
'sphinx.ext.viewcode',
50-
]
37+
extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode',]
5138

5239
# Add any paths that contain templates here, relative to this directory.
5340
templates_path = ['_templates']
5441

55-
# The suffix(es) of source filenames.
56-
# You can specify multiple suffix as a list of string:
57-
#
58-
# source_suffix = ['.rst', '.md']
59-
source_suffix = '.rst'
60-
61-
# The master toctree document.
62-
master_doc = 'index'
63-
6442
# The language for content autogenerated by Sphinx. Refer to documentation
6543
# for a list of supported languages.
6644
#
@@ -73,9 +51,6 @@
7351
# This pattern also affects html_static_path and html_extra_path.
7452
exclude_patterns = []
7553

76-
# The name of the Pygments (syntax highlighting) style to use.
77-
pygments_style = 'sphinx'
78-
7954

8055
# -- Options for HTML output -------------------------------------------------
8156

@@ -84,84 +59,11 @@
8459
#
8560
html_theme = 'alabaster'
8661

87-
# Theme options are theme-specific and customize the look and feel of a theme
88-
# further. For a list of options available for each theme, see the
89-
# documentation.
90-
#
91-
# html_theme_options = {}
92-
9362
# Add any paths that contain custom static files (such as style sheets) here,
9463
# relative to this directory. They are copied after the builtin static files,
9564
# so a file named "default.css" will overwrite the builtin "default.css".
9665
html_static_path = ['_static']
9766

98-
# Custom sidebar templates, must be a dictionary that maps document names
99-
# to template names.
100-
#
101-
# The default sidebars (for documents that don't match any pattern) are
102-
# defined by theme itself. Builtin themes are using these templates by
103-
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
104-
# 'searchbox.html']``.
105-
#
106-
# html_sidebars = {}
107< F42D /code>-
108-
109-
# -- Options for HTMLHelp output ---------------------------------------------
110-
111-
# Output file base name for HTML help builder.
112-
htmlhelp_basename = 'pyexcel-xlsbrdoc'
113-
114-
115-
# -- Options for LaTeX output ------------------------------------------------
116-
117-
latex_elements = {
118-
# The paper size ('letterpaper' or 'a4paper').
119-
#
120-
# 'papersize': 'letterpaper',
121-
122-
# The font size ('10pt', '11pt' or '12pt').
123-
#
124-
# 'pointsize': '10pt',
125-
126-
# Additional stuff for the LaTeX preamble.
127-
#
128-
# 'preamble': '',
129-
130-
# Latex figure (float) alignment
131-
#
132-
# 'figure_align': 'htbp',
133-
}
134-
135-
# Grouping the document tree into LaTeX files. List of tuples
136-
# (source start file, target name, title,
137-
# author, documentclass [howto, manual, or own class]).
138-
latex_documents = [
139-
(master_doc, 'pyexcel-xlsbr.tex', u'pyexcel-xlsbr Documentation',
140-
u'Onni Software Ltd.', 'manual'),
141-
]
142-
143-
144-
# -- Options for manual page output ------------------------------------------
145-
146-
# One entry per manual page. List of tuples
147-
# (source start file, name, description, authors, manual section).
148-
man_pages = [
149-
(master_doc, 'pyexcel-xlsbr', u'pyexcel-xlsbr Documentation',
150-
[author], 1)
151-
]
152-
153-
154-
# -- Options for Texinfo output ----------------------------------------------
155-
156-
# Grouping the document tree into Texinfo files. List of tuples
157-
# (source start file, target name, title, author,
158-
# dir menu entry, description, category)
159-
texinfo_documents = [
160-
(master_doc, 'pyexcel-xlsbr', u'pyexcel-xlsbr Documentation',
161-
author, 'pyexcel-xlsbr', 'One line description of project.',
162-
'Miscellaneous'),
163-
]
164-
16567
# -- Extension configuration -------------------------------------------------
16668
# -- Options for intersphinx extension ---------------------------------------
16769

‎setup.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,28 @@
44
import os
55
import sys
66
import codecs
7+
import locale
8+
import platform
79
from shutil import rmtree
8-
from setuptools import setup, find_packages, Command
10+
11+
from setuptools import Command, setup, find_packages
12+
913
PY2 = sys.version_info[0] == 2
1014
PY26 = PY2 and sys.version_info[1] < 7
15+
PY33 = sys.version_info < (3, 4)
16+
17+
# Work around mbcs bug in distutils.
18+
# http://bugs.python.org/issue10945
19+
# This work around is only if a project supports Python < 3.4
20+
21+
# Work around for locale not being set
22+
try:
23+
lc = locale.getlocale()
24+
pf = platform.system()
25+
if pf != 'Windows' and lc == (None, None):
26+
locale.setlocale(locale.L 10333 C_ALL, 'C.UTF-8')
27+
except (ValueError, UnicodeError, locale.Error):
28+
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
1129

1230
NAME = 'pyexcel-xlsbr'
1331
AUTHOR = 'C.W.'
@@ -21,7 +39,7 @@
2139
DOWNLOAD_URL = '%s/archive/0.0.1.tar.gz' % URL
2240
FILES = ['README.rst', 'CHANGELOG.rst']
2341
KEYWORDS = [
24-
'python'
42+
'python',
2543
]
2644

2745
CLASSIFIERS = [
@@ -159,6 +177,7 @@ def filter_out_test_code(file_handle):
159177

160178
if __name__ == '__main__':
161179
setup(
180+
test_suite="tests",
162181
name=NAME,
163182
author=AUTHOR,
164183
version=VERSION,

‎test.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pip freeze
2-
nosetests --with-coverage --cover-package pyexcel_xlsbr --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_xlsbr && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
2+
nosetests --with-coverage --cover-package pyexcel_xlsbr --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_xlsbr

‎test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pip freeze
2-
nosetests --with-coverage --cover-package pyexcel_xlsbr --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_xlsbr && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
2+
nosetests --with-coverage --cover-package pyexcel_xlsbr --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_xlsbr

0 commit comments

Comments
 (0)
0