Skip to content

Commit 4761522

Browse files
chfwchfw
committed
remove duplicated information scattered around pyexcel components
1 parent 4e9ca81 commit 4761522

16 files changed

+134
-57
lines changed

‎.moban.d/README.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{%extends 'README.rst.jj2' %}
2+
3+
{%block description%}
4+
**pyexcel-ods** is a tiny wrapper library to read, manipulate and write data in
5+
ods fromat using python 2.6 and python 2.7. You are likely to use it with
6+
`pyexcel <https://github.com/pyexcel/pyexcel>`_.
7+
`pyexcel-ods3 <https://github.com/pyexcel/pyexcel-ods3>`_ is a sister library that
8+
does the same thing but supports Python 3.3 and 3.4 and depends on lxml.
9+
{%endblock%}
10+
11+
{%block extras %}
12+
Credits
13+
================================================================================
14+
15+
ODSReader is originally written by `Marco Conti <https://github.com/marcoconti83/read-ods-with-odfpy>`_
16+
{%endblock%}

‎.moban.d/docs/source/.#conf.py.jj2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{% extends 'docs\source\conf.py.jj2'%}
2+

‎.moban.d/docs/source/conf.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{% extends 'docs/source/conf.py.jj2'%}
2+
3+
{%block custom_doc_theme%}
4+
html_theme = 'default'
5+
def setup(app):
6+
app.add_stylesheet('theme_overrides.css')
7+
{%endblock%}
8+

‎.moban.d/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% for dependency in dependencies: %}
2+
{{dependency}}
3+
{% endfor %}

‎.moban.d/setup.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{% extends 'setup.py.jj2' %}
2+
{%block additional_keywords%}
3+
'http'
4+
{%endblock %}
5+
6+
{%block additional_classifiers%}
7+
'Environment :: Web Environment',
8+
'Topic :: Internet :: WWW/HTTP',
9+
'Topic :: Software Development :: Libraries :: Python Modules',
10+
'Development Status :: 3 - Alpha',
11+
'Programming Language :: Python :: 2',
12+
'Programming Language :: Python :: 2.6',
13+
'Programming Language :: Python :: 2.7',
14+
'Programming Language :: Python :: 3',
15+
'Programming Language :: Python :: 3.3',
16+
'Programming Language :: Python :: 3.4',
17+
'Programming Language :: Python :: 3.5',
18+
'Programming Language :: Python :: Implementation :: PyPy'
19+
{%endblock%}}
20+

‎.moban.d/tests/requirements.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% extends 'tests/requirements.txt.jj2' %}
2+
{%block extras %}
3+
SQLAlchemy
4+
pyexcel-xls>=0.1.0
5+
{%endblock%}

‎.moban.d/travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{% extends "travis.yml.jj2" %}
2+
3+
{%block test_other_python_versions%} - 2.6
4+
- 3.3
5+
- 3.4
6+
- 3.5
7+
- pypy
8+
{%endblock%}

‎.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ notifications:
55
env:
66
global:
77
python:
8-
- 2.6
98
- 2.7
9+
- 2.6
1010
- 3.3
1111
- 3.4
1212
- 3.5
1313
- pypy
1414
install:
15+
- rm applymoban.py
16+
- pip install -r requirements.txt
1517
- pip install -r tests/requirements.txt
1618
script:
1719
make test
1820
after_success:
19-
codecov
21+
codecov

‎LICENSE

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
Copyright (c) 2015 by Onni Software Ltd.
1+
Copyright (c) 2015-2016 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
55
as documentation, with or without modification, are permitted provided
66
that the following conditions are met:
77

8-
* Redistributions of source code must retain the above copyright
9-
notice, this list of conditions and the following disclaimer.
8+
* Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
1010

11-
* Redistributions in binary form must reproduce the above
12-
copyright notice, this list of conditions and the following
13-
disclaimer in the documentation and/or other materials provided
14-
with the distribution.
11+
* Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
1514

16-
* The names of the contributors may not be used to endorse or
17-
promote products derived from this software without specific
18-
prior written permission.
15+
* Neither the name of 'pyexcel-webio' nor the names of the contributors
16+
may not be used to endorse or promote products derived from this software
17+
without specific prior written permission.
1918

2019
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
2120
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include VERSION
1+
include README.rst

‎VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎applymoban.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from os import path, system
2+
3+
config_dir = 'commons/config'
4+
template_dir = 'commons/templates'
5+
6+
if not path.exists("commons"):
7+
system("git clone https://github.com/pyexcel/pyexcel-commons.git commons")
8+
system("moban -cd {0} -td {1} -t docs/source/conf.py.jj2 -o docs/source/conf.py -c moban.yaml".format(config_dir, template_dir))
9+
system("moban -cd {0} -td {1} .moban.d -t setup.py -o setup.py -c moban.yaml".format(config_dir, template_dir))
10+
system("moban -cd {0} -td {1} .moban.d -t travis.yml -o .travis.yml -c moban.yaml".format(config_dir, template_dir))
11+
system("moban -cd {0} -td {1} -t LICENSE.jj2 -o LICENSE -c moban.yaml".format(config_dir, template_dir))
12+
system("moban -cd {0} -td {1} .moban.d -t tests/requirements.txt -o tests/requirements.txt -c moban.yaml".format(config_dir, template_dir))
13+
system("moban -cd {0} -td {1} .moban.d -t MANIFEST.in.jj2 -o MANIFEST.in -c moban.yaml".format(config_dir, template_dir))

‎docs/source/conf.py

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
#
3-
# pyexcel-webio documentation build configuration file, created by
4-
# sphinx-quickstart on Mon Aug 24 22:32:39 2015.
5-
#
6-
# This file is execfile()d with the current directory set to its
7-
# containing dir.
8-
#
9-
# Note that not all possible configuration values are present in this
10-
# autogenerated file.
11-
#
12-
# All configuration values have a default; values that are commented out
13-
# serve to show the default.
14-
152
import sys
163
import os
174

18-
try:
19-
with open(os.path.join("..", "..", "VERSION"), "r") as version:
20-
version_txt = version.read().rstrip()
21-
except:
22-
version_txt = "not_in_sphinx"
23-
245
# If extensions (or modules to document with autodoc) are in another directory,
256
# add these directories to sys.path here. If the directory is relative to the
267
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -36,8 +17,13 @@
3617
# ones.
3718
extensions = [
3819
'sphinx.ext.autodoc',
20+
'sphinx.ext.doctest',
21+
'sphinx.ext.intersphinx',
22+
'sphinx.ext.viewcode',
3923
]
4024

25+
intersphinx_mapping = {'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None)}
26+
4127
# Add any paths that contain templates here, relative to this directory.
4228
templates_path = ['_templates']
4329

@@ -52,16 +38,16 @@
5238

5339
# General information about the project.
5440
project = u'pyexcel-webio'
55-
copyright = u'2015, Onni Software ltd'
41+
copyright = u'2015-2016 Onni Software Ltd.'
5642

5743
# The version info for the project you're documenting, acts as replacement for
5844
# |version| and |release|, also used in various other places throughout the
5945
# built documents.
6046
#
6147
# The short X.Y version.
62-
version = version_txt
48+
version = '0.0.6'
6349
# The full version, including alpha/beta/rc tags.
64-
release = version_txt
50+
release = '0.0.6'
6551

6652
# The language for content autogenerated by Sphinx. Refer to documentation
6753
# for a list of supported languages.
@@ -112,7 +98,6 @@
11298
# further. For a list of options available for each theme, see the
11399
# documentation.
114100
#html_theme_options = {}
115-
116101
# Add any paths that contain custom themes here, relative to this directory.
117102
#html_theme_path = []
118103

@@ -205,7 +190,7 @@
205190
# author, documentclass [howto, manual, or own class]).
206191
latex_documents = [
207192
('index', 'pyexcel-webio.tex', u'pyexcel-webio Documentation',
208-
u'Onni Software ltd', 'manual'),
193+
u'Onni Software Ltd.', 'manual'),
209194
]
210195

211196
# The name of an image file (relative to this directory) to place at the top of
@@ -235,7 +220,7 @@
235220
# (source start file, name, description, authors, manual section).
236221
man_pages = [
237222
('index', 'pyexcel-webio', u'pyexcel-webio Documentation',
238-
[u'Onni Software ltd'], 1)
223+
[u'Onni Software Ltd.'], 1)
239224
]
240225

241226
# If true, show URL addresses after external links.
@@ -249,7 +234,7 @@
249234
# dir menu entry, description, category)
250235
texinfo_documents = [
251236
('index', 'pyexcel-webio', u'pyexcel-webio Documentation',
252-
u'Onni Software ltd', 'pyexcel-webio', 'One line description of project.',
237+
u'Onni Software Ltd.', 'pyexcel-webio', 'One line description of project.',
253238
'Miscellaneous'),
254239
]
255240

@@ -263,4 +248,4 @@
263248
#texinfo_show_urls = 'footnote'
264249

265250
# If true, do not generate a @detailmenu in the "Top" node's menu.
266-
#texinfo_no_detailmenu = False
251+
#texinfo_no_detailmenu = False

‎moban.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
overrides: "pyexcel.yaml"
2+
name: "pyexcel-webio"
3+
nick_name: webio
4+
version: 0.0.6
5+
dependencies:
6+
- pyexcel>=0.2.0
7+
description: |
8+
A generic request and response interface for pyexcel web extensions.

‎setup.py

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,51 @@
99
README_txt = readme.read()
1010

1111
dependencies = [
12-
'pyexcel>=0.2.0'
12+
'pyexcel>=0.2.0',
1313
]
1414

15-
with open("VERSION", "r") as version:
16-
version_txt = version.read().rstrip()
15+
extras = {}
16+
1717

1818
setup(
1919
name='pyexcel-webio',
20-
author="C. W.",
21-
version=version_txt,
22-
author_email="wangc_2011@hotmail.com",
23-
url="https://github.com/chfw/pyexcel-webio",
20+
author='C. W.',
21+
version='0.0.6',
22+
author_email='wangc_2011 (at) hotmail.com',
23+
url='https://github.com/pyexcel/pyexcel-webio',
2424
description='A generic request and response interface for pyexcel web extensions.',
2525
install_requires=dependencies,
26+
extras_require=extras,
2627
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
2728
include_package_data=True,
2829
long_description=README_txt,
2930
zip_safe=False,
3031
tests_require=['nose'],
31-
keywords=['API', 'pyexcel', 'Excel', 'HTTP'],
32-
license='BSD',
32+
keywords=[
33+
'excel',
34+
'python',
35+
'pyexcel',
36+
'http'
37+
],
38+
license='New BSD',
3339
classifiers=[
34-
'Development Status :: 3 - Alpha',
35-
'Environment :: Web Environment',
36-
'Topic :: Internet :: WWW/HTTP',
37-
'Topic :: Software Development :: Libraries :: Python Modules',
40+
'Topic :: Office/Business',
41+
'Topic :: Utilities',
42+
'Topic :: Software Development :: Libraries',
3843
'Programming Language :: Python',
3944
'License :: OSI Approved :: BSD License',
4045
'Intended Audience :: Developers',
46+
'Environment :: Web Environment',
47+
'Topic :: Internet :: WWW/HTTP',
48+
'Topic :: Software Development :: Libraries :: Python Modules',
49+
'Development Status :: 3 - Alpha',
4150
'Programming Language :: Python :: 2',
4251
'Programming Language :: Python :: 2.6',
4352
'Programming Language :: Python :: 2.7',
4453
'Programming Language :: Python :: 3',
4554
'Programming Language :: Python :: 3.3',
4655
'Programming Language :: Python :: 3.4',
56+
'Programming Language :: Python :: 3.5',
4757
'Programming Language :: Python :: Implementation :: PyPy'
4858
]
49-
)
59+
)

‎tests/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ rednose
33
nose-cov
44
codecov
55
coverage
6-
pyexcel-xls>=0.1.0
7-
pyexcel>=0.2.0
86
SQLAlchemy
7+
pyexcel-xls>=0.1.0

0 commit comments

Comments
 (0)