📚 update with pyexcel commons and build on python 3.7 and 3.8-dev. resolve #29
This commit is contained in:
parent
f61c9ebd43
commit
a4d5874cab
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
{%block custom_python_versions%}
|
{%block custom_python_versions%}
|
||||||
python:
|
python:
|
||||||
- 3.7-dev
|
- &pypy2 pypy2.7-6.0
|
||||||
|
- &pypy3 pypy3.5-6.0
|
||||||
|
- 3.8-dev
|
||||||
|
- 3.7
|
||||||
- 3.6
|
- 3.6
|
||||||
- 3.5
|
- 3.5
|
||||||
- 3.4
|
|
||||||
- 3.3
|
|
||||||
- 2.7
|
- 2.7
|
||||||
- 2.6
|
|
||||||
{%endblock%}
|
{%endblock%}
|
||||||
|
|
||||||
|
|
23
.travis.yml
23
.travis.yml
|
@ -1,15 +1,30 @@
|
||||||
sudo: false
|
sudo: false
|
||||||
|
dist: xenial
|
||||||
language: python
|
language: python
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
python:
|
python:
|
||||||
- 3.7-dev
|
- &pypy2 pypy2.7-6.0
|
||||||
|
- &pypy3 pypy3.5-6.0
|
||||||
|
- 3.8-dev
|
||||||
|
- 3.7
|
||||||
- 3.6
|
- 3.6
|
||||||
- 3.5
|
- 3.5
|
||||||
- 3.4
|
|
||||||
- 3.3
|
|
||||||
- 2.7
|
- 2.7
|
||||||
- 2.6
|
|
||||||
|
stages:
|
||||||
|
- test
|
||||||
|
- lint
|
||||||
|
jobs:
|
||||||
|
include:
|
||||||
|
- stage: lint
|
||||||
|
python: 3.6
|
||||||
|
script: make lint
|
||||||
|
|
||||||
|
stage: test
|
||||||
|
|
||||||
|
script: make test
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
|
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
|
||||||
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
|
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
|
||||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
||||||
Copyright (c) 2015-2018 by Onni Software Ltd. and its contributors
|
Copyright (c) by Onni Software Ltd. and its contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms of the software as well
|
Redistribution and use in source and binary forms of the software as well
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
include README.rst
|
include README.rst
|
||||||
include LICENSE
|
include LICENSE
|
||||||
include CHANGELOG.rst
|
include CHANGELOG.rst
|
||||||
|
recursive-include tests *
|
||||||
|
recursive-include docs *
|
||||||
|
|
|
@ -375,6 +375,7 @@ Acceptance criteria
|
||||||
#. Has all code lines tested
|
#. Has all code lines tested
|
||||||
#. Passes all Travis CI builds
|
#. Passes all Travis CI builds
|
||||||
#. Has fair amount of documentation if your change is complex
|
#. Has fair amount of documentation if your change is complex
|
||||||
|
#. run 'make format' so as to confirm the pyexcel organisation's coding style
|
||||||
#. Please update CHANGELOG.rst
|
#. Please update CHANGELOG.rst
|
||||||
#. Please add yourself to CONTRIBUTORS.rst
|
#. Please add yourself to CONTRIBUTORS.rst
|
||||||
#. Agree on NEW BSD License for your contribution
|
#. Agree on NEW BSD License for your contribution
|
||||||
|
|
|
@ -3,12 +3,10 @@ DESCRIPTION = (
|
||||||
'A wrapper library to read, manipulate and write data in ods format' +
|
'A wrapper library to read, manipulate and write data in ods format' +
|
||||||
''
|
''
|
||||||
)
|
)
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# Configuration file for the Sphinx documentation builder.
|
# Configuration file for the Sphinx documentation builder.
|
||||||
#
|
#
|
||||||
# This file does only contain a selection of the most common options. For a
|
# This file only contains a selection of the most common options. For a full
|
||||||
# full list see the documentation:
|
# list see the documentation:
|
||||||
# http://www.sphinx-doc.org/en/master/config
|
# http://www.sphinx-doc.org/en/master/config
|
||||||
|
|
||||||
# -- Path setup --------------------------------------------------------------
|
# -- Path setup --------------------------------------------------------------
|
||||||
|
@ -23,44 +21,24 @@ DESCRIPTION = (
|
||||||
|
|
||||||
# -- Project information -----------------------------------------------------
|
# -- Project information -----------------------------------------------------
|
||||||
|
|
||||||
project = u'pyexcel-ods'
|
project = 'pyexcel'
|
||||||
copyright = u'2015-2018 Onni Software Ltd.'
|
copyright = 'copyright 2015-2019 Onni Software Ltd.'
|
||||||
author = u'C.W.'
|
author = 'Onni Software Ltd.'
|
||||||
|
|
||||||
# The short X.Y version
|
# The short X.Y version
|
||||||
version = u'0.4.1'
|
version = '0.4.1'
|
||||||
# The full version, including alpha/beta/rc tags
|
# The full version, including alpha/beta/rc tags
|
||||||
release = u'0.4.1'
|
release = '0.4.1'
|
||||||
|
|
||||||
|
|
||||||
# -- General configuration ---------------------------------------------------
|
# -- General configuration ---------------------------------------------------
|
||||||
|
|
||||||
# If your documentation needs a minimal Sphinx version, state it here.
|
|
||||||
#
|
|
||||||
# needs_sphinx = '1.0'
|
|
||||||
|
|
||||||
# Add any Sphinx extension module names here, as strings. They can be
|
# Add any Sphinx extension module names here, as strings. They can be
|
||||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
||||||
# ones.
|
# ones.
|
||||||
extensions = [
|
extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode',]
|
||||||
'sphinx.ext.autodoc',
|
|
||||||
'sphinx.ext.doctest',
|
|
||||||
'sphinx.ext.intersphinx',
|
|
||||||
'sphinx.ext.viewcode',
|
|
||||||
]
|
|
||||||
|
|
||||||
# Add any paths that contain templates here, relative to this directory.
|
# Add any paths that contain templates here, relative to this directory.
|
||||||
templates_path = ['_templates']
|
templates_path = ['_templates']
|
||||||
|
|
||||||
# The suffix(es) of source filenames.
|
|
||||||
# You can specify multiple suffix as a list of string:
|
|
||||||
#
|
|
||||||
# source_suffix = ['.rst', '.md']
|
|
||||||
source_suffix = '.rst'
|
|
||||||
|
|
||||||
# The master toctree document.
|
|
||||||
master_doc = 'index'
|
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
#
|
#
|
||||||
|
@ -73,9 +51,6 @@ language = 'en'
|
||||||
# This pattern also affects html_static_path and html_extra_path.
|
# This pattern also affects html_static_path and html_extra_path.
|
||||||
exclude_patterns = []
|
exclude_patterns = []
|
||||||
|
|
||||||
# The name of the Pygments (syntax highlighting) style to use.
|
|
||||||
pygments_style = 'sphinx'
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTML output -------------------------------------------------
|
# -- Options for HTML output -------------------------------------------------
|
||||||
|
|
||||||
|
@ -84,84 +59,11 @@ pygments_style = 'sphinx'
|
||||||
#
|
#
|
||||||
html_theme = 'alabaster'
|
html_theme = 'alabaster'
|
||||||
|
|
||||||
# Theme options are theme-specific and customize the look and feel of a theme
|
|
||||||
# further. For a list of options available for each theme, see the
|
|
||||||
# documentation.
|
|
||||||
#
|
|
||||||
# html_theme_options = {}
|
|
||||||
|
|
||||||
# Add any paths that contain custom static files (such as style sheets) here,
|
# Add any paths that contain custom static files (such as style sheets) here,
|
||||||
# relative to this directory. They are copied after the builtin static files,
|
# relative to this directory. They are copied after the builtin static files,
|
||||||
# so a file named "default.css" will overwrite the builtin "default.css".
|
# so a file named "default.css" will overwrite the builtin "default.css".
|
||||||
html_static_path = ['_static']
|
html_static_path = ['_static']
|
||||||
|
|
||||||
# Custom sidebar templates, must be a dictionary that maps document names
|
|
||||||
# to template names.
|
|
||||||
#
|
|
||||||
# The default sidebars (for documents that don't match any pattern) are
|
|
||||||
# defined by theme itself. Builtin themes are using these templates by
|
|
||||||
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
|
|
||||||
# 'searchbox.html']``.
|
|
||||||
#
|
|
||||||
# html_sidebars = {}
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTMLHelp output ---------------------------------------------
|
|
||||||
|
|
||||||
# Output file base name for HTML help builder.
|
|
||||||
htmlhelp_basename = 'pyexcel-odsdoc'
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for LaTeX output ------------------------------------------------
|
|
||||||
|
|
||||||
latex_elements = {
|
|
||||||
# The paper size ('letterpaper' or 'a4paper').
|
|
||||||
#
|
|
||||||
# 'papersize': 'letterpaper',
|
|
||||||
|
|
||||||
# The font size ('10pt', '11pt' or '12pt').
|
|
||||||
#
|
|
||||||
# 'pointsize': '10pt',
|
|
||||||
|
|
||||||
# Additional stuff for the LaTeX preamble.
|
|
||||||
#
|
|
||||||
# 'preamble': '',
|
|
||||||
|
|
||||||
# Latex figure (float) alignment
|
|
||||||
#
|
|
||||||
# 'figure_align': 'htbp',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Grouping the document tree into LaTeX files. List of tuples
|
|
||||||
# (source start file, target name, title,
|
|
||||||
# author, documentclass [howto, manual, or own class]).
|
|
||||||
latex_documents = [
|
|
||||||
(master_doc, 'pyexcel-ods.tex', u'pyexcel-ods Documentation',
|
|
||||||
u'Onni Software Ltd.', 'manual'),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for manual page output ------------------------------------------
|
|
||||||
|
|
||||||
# One entry per manual page. List of tuples
|
|
||||||
# (source start file, name, description, authors, manual section).
|
|
||||||
man_pages = [
|
|
||||||
(master_doc, 'pyexcel-ods', u'pyexcel-ods Documentation',
|
|
||||||
[author], 1)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for Texinfo output ----------------------------------------------
|
|
||||||
|
|
||||||
# Grouping the document tree into Texinfo files. List of tuples
|
|
||||||
# (source start file, target name, title, author,
|
|
||||||
# dir menu entry, description, category)
|
|
||||||
texinfo_documents = [
|
|
||||||
(master_doc, 'pyexcel-ods', u'pyexcel-ods Documentation',
|
|
||||||
author, 'pyexcel-ods', 'One line description of project.',
|
|
||||||
'Miscellaneous'),
|
|
||||||
]
|
|
||||||
|
|
||||||
# -- Extension configuration -------------------------------------------------
|
# -- Extension configuration -------------------------------------------------
|
||||||
# -- Options for intersphinx extension ---------------------------------------
|
# -- Options for intersphinx extension ---------------------------------------
|
||||||
|
|
||||||
|
|
22
setup.py
22
setup.py
|
@ -4,8 +4,25 @@
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import codecs
|
import codecs
|
||||||
|
import locale
|
||||||
|
import platform
|
||||||
from shutil import rmtree
|
from shutil import rmtree
|
||||||
from setuptools import setup, find_packages, Command
|
|
||||||
|
from setuptools import Command, setup, find_packages
|
||||||
|
|
||||||
|
|
||||||
|
# Work around mbcs bug in distutils.
|
||||||
|
# http://bugs.python.org/issue10945
|
||||||
|
# This work around is only if a project supports Python < 3.4
|
||||||
|
|
||||||
|
# Work around for locale not being set
|
||||||
|
try:
|
||||||
|
lc = locale.getlocale()
|
||||||
|
pf = platform.system()
|
||||||
|
if pf != 'Windows' and lc == (None, None):
|
||||||
|
locale.setlocale(locale.LC_ALL, 'C.UTF-8')
|
||||||
|
except (ValueError, UnicodeError, locale.Error):
|
||||||
|
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
|
||||||
|
|
||||||
NAME = 'pyexcel-ods'
|
NAME = 'pyexcel-ods'
|
||||||
AUTHOR = 'C.W.'
|
AUTHOR = 'C.W.'
|
||||||
|
@ -19,7 +36,7 @@ URL = 'https://github.com/pyexcel/pyexcel-ods'
|
||||||
DOWNLOAD_URL = '%s/archive/0.4.1.tar.gz' % URL
|
DOWNLOAD_URL = '%s/archive/0.4.1.tar.gz' % URL
|
||||||
FILES = ['README.rst', 'CHANGELOG.rst']
|
FILES = ['README.rst', 'CHANGELOG.rst']
|
||||||
KEYWORDS = [
|
KEYWORDS = [
|
||||||
'python'
|
'python',
|
||||||
]
|
]
|
||||||
|
|
||||||
CLASSIFIERS = [
|
CLASSIFIERS = [
|
||||||
|
@ -157,6 +174,7 @@ def filter_out_test_code(file_handle):
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
setup(
|
setup(
|
||||||
|
test_suite="tests",
|
||||||
name=NAME,
|
name=NAME,
|
||||||
author=AUTHOR,
|
author=AUTHOR,
|
||||||
version=VERSION,
|
version=VERSION,
|
||||||
|
|
2
test.bat
2
test.bat
|
@ -1,2 +1,2 @@
|
||||||
pip freeze
|
pip freeze
|
||||||
nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_ods && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
|
nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods
|
||||||
|
|
2
test.sh
2
test.sh
|
@ -1,2 +1,2 @@
|
||||||
pip freeze
|
pip freeze
|
||||||
nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_ods && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
|
nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods
|
||||||
|
|
Loading…
Reference in New Issue