Skip to content

Commit a2abf2f

Browse files
chfwchfw
committed
sync with commons
1 parent ad6a530 commit a2abf2f

File tree

11 files changed

+185
-66
lines changed

11 files changed

+185
-66
lines changed

‎.gitignore‎

Lines changed: 92 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,93 @@
1-
*.pyc
2-
*~
1+
# April 2016
2+
# reference: https://github.com/github/gitignore/blob/master/Python.gitignore
3+
# Byte-compiled / optimized / DLL files
4+
__pycache__/
5+
*.py[cod]
6+
*$py.class
7+
8+
# C extensions
9+
*.so
10+
11+
# Distribution / packaging
12+
.Python
13+
env/
14+
build/
15+
develop-eggs/
16+
dist/
17+
downloads/
18+
eggs/
19+
.eggs/
20+
lib/
21+
lib64/
22+
parts/
23+
sdist/
24+
var/
25+
*.egg-info/
26+
.installed.cfg
27+
*.egg
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
342
.coverage
43+
.coverage.*
44+
.cache
45+
nosetests.xml
46+
coverage.xml
47+
*,cover
48+
.hypothesis/
49+
50+
# Translations
51+
*.mo
52+
*.pot
53+
54+
# Django stuff:
55+
*.log
56+
local_settings.py
57+
58+
# Flask stuff:
59+
instance/
60+
.webassets-cache
61+
62+
# Scrapy stuff:
63+
.scrapy
64+
65+
# Sphinx documentation
66+
docs/_build/
67+
68+
# PyBuilder
69+
target/
70+
71+
# IPython Notebook
72+
.ipynb_checkpoints
73+
74+
# pyenv
75+
.python-version
76+
77+
# celery beat schedule file
78+
celerybeat-schedule
79+
80+
# dotenv
81+
.env
82+
83+
# virtualenv
84+
venv/
85+
ENV/
86+
87+
# Spyder project settings
88+
.spyderproject
89+
90+
# Rope project settings
91+
.ropeproject
92+
*~
93+
commons/

‎.moban.d/travis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{% extends "travis.yml.jj2" %}
2-
3-
{%block test_other_python_versions%} - 2.6
2+
{%block custom_python_versions%}
3+
python:
4+
- 2.6
5+
- 2.7
46
- 3.3
57
- 3.4
68
- 3.5
7-
- pypy
89
{%endblock%}
10+

‎.moban.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
configuration:
2+
configuration_dir: "commons/config"
3+
template_dir:
4+
- "commons/templates"
5+
- ".moban.d"
6+
configuration: pyexcel_webio.yaml
7+
targets:
8+
- setup.py: setup.py
9+
- "docs/source/conf.py": "docs/source/conf.py.jj2"
10+
- .travis.yml: travis.yml
11+
- requirements.txt: requirements.txt
12+
- LICENSE: LICENSE.jj2
13+
- MANIFEST.in: MANIFEST.in.jj2
14+
- .gitignore: .gitignore.jj2

‎.travis.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ sudo: false
22
language: python
33
notifications:
44
email: false
5-
env:
6-
global:
75
python:
8-
- 2.7
96
- 2.6
7+
- 2.7
108
- 3.3
119
- 3.4
1210
- 3.5
13-
- pypy
14-
install:
15-
- rm applymoban.py
16-
- pip install -r requirements.txt
11+
before_install:
12+
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
13+
mv min_requirements.txt requirements.txt ;
14+
fi
15+
- test ! -f rnd_requirements.txt || pip install --upgrade "setuptools" "pip==7.1"
16+
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
17+
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
1718
- pip install -r tests/requirements.txt
1819
script:
1920
make test
2021
after_success:
21-
codecov
22+
codecov

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
include README.rst
2+
include CHANGELOG.rst

‎applymoban.py‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,4 @@
248248
#texinfo_show_urls = 'footnote'
249249

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

‎moban.yaml‎ renamed to ‎pyexcel_webio.yaml‎

File renamed without changes.

‎rnd_requirements.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
https://github.com/pyexcel/pyexcel-io/archive/master.zip
2+
https://github.com/pyexcel/pyexcel/archive/master.zip
3+
https://github.com/pyexcel/pyexcel-xls/archive/master.zip
4+

‎setup.py‎

Lines changed: 59 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,34 @@
55
use_setuptools()
66
from setuptools import setup, find_packages
77

8-
with open("README.rst", 'r') as readme:
9-
README_txt = readme.read()
8+
NAME = 'pyexcel-webio'
9+
AUTHOR = 'C.W.'
10+
VERSION = '0.0.6'
11+
EMAIL = 'wangc_2011 (at) hotmail.com'
12+
LICENSE = 'New BSD'
13+
PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
14+
DESCRIPTION = 'A generic request and response interface for pyexcel web extensions.'
15+
KEYWORDS = [
16+
'excel',
17+
'python',
18+
'pyexcel',
19+
'http'
20+
]
1021

11-
dependencies = [
22+
INSTALL_REQUIRES = [
1223
'pyexcel>=0.2.0',
1324
]
1425

15-
extras = {}
16-
17-
18-
setup(
19-
name='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',
24-
description='A generic request and response interface for pyexcel web extensions.',
25-
install_requires=dependencies,
26-
extras_require=extras,
27-
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
28-
include_package_data=True,
29-
long_description=README_txt,
30-
zip_safe=False,
31-
tests_require=['nose'],
32-
keywords=[
33-
'excel',
34-
'python',
35-
'pyexcel',
36-
'http'
37-
],
38-
license='New BSD',
39-
classifiers=[
40-
'Topic :: Office/Business',
41-
'Topic :: Utilities',
42-
'Topic :: Software Development :: Libraries',
43-
'Programming Language :: Python',
44-
'License :: OSI Approved :: BSD License',
45-
'Intended Audience :: Developers',
26+
EXTRAS_REQUIRE = {
27+
}
28+
29+
CLASSIFIERS = [
30+
'Topic :: Office/Business',
31+
'Topic :: Utilities',
32+
'Topic :: Software Development :: Libraries',
33+
'Programming Language :: Python',
34+
'License :: OSI Approved :: BSD License',
35+
'Intended Audience :: Developers',
4636
'Environment :: Web Environment',
4737
'Topic :: Internet :: WWW/HTTP',
4838
'Topic :: Software Development :: Libraries :: Python Modules',
@@ -55,5 +45,38 @@
5545
'Programming Language :: Python :: 3.4',
5646
'Programming Language :: Python :: 3.5',
5747
'Programming Language :: Python :: Implementation :: PyPy'
58-
]
59-
)
48+
]
49+
50+
51+
def read_files(*files):
52+
"""Read files into setup"""
53+
text = ""
54+
for single_file in files:
55+
text = text + read(single_file) + "\n"
56+
return text
57+
58+
59+
def read(afile):
60+
"""Read a file into setup"""
61+
with open(afile, 'r') as opened_file:
62+
return opened_file.read()
63+
64+
65+
if __name__ == '__main__':
66+
setup(
67+
name=NAME,
68+
author=AUTHOR,
69+
version=VERSION,
70+
author_email=EMAIL,
71+
description=DESCRIPTION,
72+
install_requires=INSTALL_REQUIRES,
73+
keywords=KEYWORDS,
74+
extras_require=EXTRAS_REQUIRE,
75+
packages=PACKAGES,
76+
include_package_data=True,
77+
long_description=read_files('README.rst', 'CHANGELOG.rst'),
78+
zip_safe=False,
79+
tests_require=['nose'],
80+
license=LICENSE,
81+
classifiers=CLASSIFIERS
82+
)

0 commit comments

Comments
 (0)