Skip to content

Commit

Permalink
📚 sync with latest pypi-mobans
Browse files Browse the repository at this point in the history
  • Loading branch information
chfw committed Feb 15, 2019
1 parent 372166e commit 8bf2c96
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 80 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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.

Redistribution and use in source and binary forms of the software as well
Expand Down
9 changes: 8 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,12 @@ name = 'pypi'
python_version= '3.6'

[packages]
openpyxl>=2.4.4
openpyxl>=2.4.4,<2.6.0
pyexcel-io>=0.5.3

[dev-packages]
nose = "*"
mock = "*"
codecov = "*"
coverage = "*"
flake8 = "*"
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ Acceptance criteria
#. Has all code lines tested
#. Passes all Travis CI builds
#. 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 add yourself to CONTRIBUTORS.rst
#. Agree on NEW BSD License for your contribution
Expand Down
81 changes: 8 additions & 73 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
'format' +
''
)
# -*- coding: utf-8 -*-
#
# Configuration file for the Sphinx documentation builder.
#
# This file does only contain a selection of the most common options. For a
# full list see the documentation:
# This file only contains a selection of the most common options. For a full
# list see the documentation:
# http://www.sphinx-doc.org/en/master/config

# -- Path setup --------------------------------------------------------------
Expand All @@ -24,22 +22,18 @@

# -- Project information -----------------------------------------------------

project = u'pyexcel-xlsx'
copyright = u'2015-2018 Onni Software Ltd.'
author = u'C.W.'
project = 'pyexcel-xlsx'
copyright = 'copyright 2015-2019 Onni Software Ltd.'
author = 'Onni Software Ltd.'

# The short X.Y version
version = u'0.5.2'
version = '0.6.0'
# The full version, including alpha/beta/rc tags
release = u'0.6.0'
release = '0.5.2'


# -- 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
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
Expand Down Expand Up @@ -69,9 +63,6 @@
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = []

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = None


# -- Options for HTML output -------------------------------------------------

Expand Down Expand Up @@ -102,63 +93,6 @@
# html_sidebars = {}


# -- Options for HTMLHelp output ---------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = 'pyexcel-xlsxdoc'


# -- 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-xlsx.tex', u'pyexcel-xlsx 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-xlsx', u'pyexcel-xlsx 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-xlsx', u'pyexcel-xlsx Documentation',
author, 'pyexcel-xlsx', 'One line description of project.',
'Miscellaneous'),
]


# -- Options for Epub output -------------------------------------------------

# Bibliographic Dublin Core info.
Expand All @@ -181,6 +115,7 @@

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}

# TODO: html_theme not configurable upstream
html_theme = 'default'

Expand Down
4 changes: 3 additions & 1 deletion pyexcel_xlsx.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
overrides: "pyexcel.yaml"
name: "pyexcel-xlsx"
project: "pyexcel-xlsx"
nick_name: xlsx
version: 0.6.0
current_version: 0.6.0
release: 0.5.2
file_type: xlsx
gitignore_language: Python
dependencies:
- openpyxl>=2.4.4
- openpyxl>=2.4.4,<2.6.0
- pyexcel-io>=0.5.3
description: A wrapper library to read, manipulate and write data in xlsx and xlsm format
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
openpyxl>=2.4.4
openpyxl>=2.4.4,<2.6.0
pyexcel-io>=0.5.3
18 changes: 17 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,25 @@
import os
import sys
import codecs
import locale
import platform
from shutil import rmtree

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-xlsx'
AUTHOR = 'C.W.'
VERSION = '0.6.0'
Expand Down Expand Up @@ -39,7 +54,7 @@
]

INSTALL_REQUIRES = [
'openpyxl>=2.4.4',
'openpyxl>=2.4.4,<2.6.0',
'pyexcel-io>=0.5.3',
]
SETUP_COMMANDS = {}
Expand Down Expand Up @@ -161,6 +176,7 @@ def filter_out_test_code(file_handle):

if __name__ == '__main__':
setup(
test_suite="tests",
name=NAME,
author=AUTHOR,
version=VERSION,
Expand Down
3 changes: 2 additions & 1 deletion tests/test_hidden.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import os

from nose.tools import eq_
from pyexcel_xlsx import get_data

from nose.tools import eq_


def test_hidden_row():
data = get_data(
Expand Down
1 change: 0 additions & 1 deletion tests/test_writer.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import os

from base import PyexcelWriterBase, PyexcelHatWriterBase

from pyexcel_xlsx.xlsxr import XLSXBook as Reader
from pyexcel_xlsx.xlsxw import XLSXWriter as Writer

Expand Down

0 comments on commit 8bf2c96

Please sign in to comment.