Skip to content

Commit 430f3a9

Browse files
committed
📚 update documentations
1 parent e5c0afd commit 430f3a9

File tree

6 files changed

+68
-38
lines changed

6 files changed

+68
-38
lines changed

.gitignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ ENV/
8989

9090
# Rope project settings
9191
.ropeproject
92+
93+
# emacs
9294
*~
93-
commons/
94-
commons
95+
96+
# moban hashes
9597
.moban.hashes
98+
.DS_store
99+

.moban.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ configuration:
22
configuration_dir: "commons/config"
33
template_dir:
44
- "commons/templates"
5+
- "setupmobans/templates"
56
- ".moban.d"
67
configuration: pyexcel_xlsxw.yml
78
targets:
@@ -10,9 +11,9 @@ targets:
1011
- "docs/source/conf.py": "docs/source/conf.py.jj2"
1112
- .travis.yml: travis.yml
1213
- requirements.txt: requirements.txt
13-
- LICENSE: LICENSE.jj2
14+
- LICENSE: NEW_BSD_LICENSE.jj2
1415
- MANIFEST.in: MANIFEST.in.jj2
15-
- test.sh: test.sh.jj2
16-
- test.bat: test.sh.jj2
17-
- .gitignore: .gitignore.jj2
16+
- test.sh: test.script.jj2
17+
- test.bat: test.script.jj2
18+
- .gitignore: gitignore.jj2
1819
- "tests/requirements.txt": "tests/requirements.txt"

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: python
33
notifications:
44
email: false
55
python:
6-
- pypy
6+
- pypy-5.3.1
77
- 3.6
88
- 3.5
99
- 3.4
@@ -25,9 +25,6 @@ matrix:
2525
- python-openpyxl
2626

2727
before_install:
28-
- cd $HOME
29-
- "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then deactivate && wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2 -O - | tar -jxf - && echo 'Setting up aliases...' && ln -s pypy-5.7.1-linux_x86_64-portable pypy2-latest && export PATH=$HOME/pypy2-latest/bin/:$PATH && virtualenv --no-site-packages --python ~/pypy2-latest/bin/pypy pypy2-env && echo 'Creating custom env...' && source pypy2-env/bin/activate && python -V; fi"
30-
- cd -
3128
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
3229
- pip install --upgrade pip>8 setuptools>21
3330
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi

README.rst

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ pyexcel-xlsxw - Let you focus on data, instead of xlsx format
88
.. image:: https://api.travis-ci.org/pyexcel/pyexcel-xlsxw.svg?branch=master
99
:target: http://travis-ci.org/pyexcel/pyexcel-xlsxw
1010

11-
.. image:: https://codecov.io/github/pyexcel/pyexcel-xlsxw/coverage.png
12-
:target: https://codecov.io/github/pyexcel/pyexcel-xlsxw
11+
.. image:: https://codecov.io/gh/pyexcel/pyexcel-xlsxw/branch/master/graph/badge.svg
12+
:target: https://codecov.io/gh/pyexcel/pyexcel-xlsxw
13+
14+
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
15+
:target: https://gitter.im/pyexcel/Lobby
1316

1417
.. image:: https://readthedocs.org/projects/pyexcel-xlsxw/badge/?version=latest
1518
:target: http://pyexcel-xlsxw.readthedocs.org/en/latest/
@@ -217,19 +220,40 @@ Then install relevant development requirements:
217220
#. pip install -r requirements.txt
218221
#. pip install -r tests/requirements.txt
219222

223+
Once you have finished your changes, please provide test case(s), relevant documentation
224+
and update CHANGELOG.rst.
225+
226+
.. note::
227+
228+
As to rnd_requirements.txt, usually, it is created when a dependent
229+
library is not released. Once the dependecy is installed
230+
(will be released), the future
231+
version of the dependency in the requirements.txt will be valid.
232+
233+
234+
How to test your contribution
235+
------------------------------
236+
237+
Although `nose` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
238+
239+
On Linux/Unix systems, please launch your tests like this::
240+
241+
$ make
242+
243+
On Windows systems, please issue this command::
220244

221-
In order to update test environment, and documentation, additional steps are
222-
required:
245+
> test.bat
246+
247+
How to update test environment and update documentation
248+
---------------------------------------------------------
249+
250+
Additional steps are required:
223251

224252
#. pip install moban
253+
#. git clone https://github.com/moremoban/setupmobans.git # generic setup
225254
#. git clone https://github.com/pyexcel/pyexcel-commons.git commons
226255
#. make your changes in `.moban.d` directory, then issue command `moban`
227256

228-
What is rnd_requirements.txt
229-
-------------------------------
230-
231-
Usually, it is created when a dependent library is not released. Once the dependecy is installed(will be released), the future version of the dependency in the requirements.txt will be valid.
232-
233257
What is pyexcel-commons
234258
---------------------------------
235259

@@ -240,18 +264,16 @@ What is .moban.d
240264

241265
`.moban.d` stores the specific meta data for the library.
242266

243-
How to test your contribution
244-
------------------------------
245-
246-
Although `nose` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
267+
Acceptance criteria
268+
-------------------
247269

248-
On Linux/Unix systems, please launch your tests like this::
249-
250-
$ make
251-
252-
On Windows systems, please issue this command::
253-
254-
> test.bat
270+
#. Has Test cases written
271+
#. Has all code lines tested
272+
#. Passes all Travis CI builds
273+
#. Has fair amount of documentation if your change is complex
274+
#. Please update CHANGELOG.rst
275+
#. Please add yourself to CONTRIBUTORS.rst
276+
#. Agree on NEW BSD License for your contribution
255277

256278

257279
.. testcode::

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
]
1212

1313
intersphinx_mapping = {
14-
'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None),
14+
'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
1515
}
1616
spelling_word_list_filename = 'spelling_wordlist.txt'
1717
templates_path = ['_templates']

setup.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77

88
NAME = 'pyexcel-xlsxw'
99
AUTHOR = 'C.W.'
10-
VERSION = '0.4.0'
10+
VERSION = ''
1111
1212
LICENSE = 'New BSD'
1313
DESCRIPTION = (
1414
'A wrapper library to write data in xlsx and xlsm format' +
1515
''
1616
)
17+
URL = 'https://github.com/pyexcel/pyexcel-xlsxw'
18+
DOWNLOAD_URL = '%s/archive/0.4.0.tar.gz' % URL
19+
FILES = ['README.rst', 'CHANGELOG.rst']
1720
KEYWORDS = [
18-
'excel',
19-
'python',
20-
'pyexcel',
2121
'xlsx'
22+
'python'
2223
]
2324

2425
CLASSIFIERS = [
2526
'Topic :: Office/Business',
2627
'Topic :: Utilities',
2728
'Topic :: Software Development :: Libraries',
2829
'Programming Language :: Python',
29-
'License :: OSI Approved :: BSD License',
3030
'Intended Audience :: Developers',
3131
'Programming Language :: Python :: 2.6',
3232
'Programming Language :: Python :: 2.7',
@@ -83,7 +83,11 @@ def filter_out_test_code(file_handle):
8383
found_test_code = False
8484
yield line
8585
else:
86-
yield line
86+
for keyword in ['|version|', '|today|']:
87+
if keyword in line:
88+
break
89+
else:
90+
yield line
8791

8892

8993
if __name__ == '__main__':
@@ -93,7 +97,9 @@ def filter_out_test_code(file_handle):
9397
version=VERSION,
9498
author_email=EMAIL,
9599
description=DESCRIPTION,
96-
long_description=read_files('README.rst', 'CHANGELOG.rst'),
100+
url=URL,
101+
download_url=DOWNLOAD_URL,
102+
long_description=read_files(*FILES),
97103
license=LICENSE,
98104
keywords=KEYWORDS,
99105
extras_require=EXTRAS_REQUIRE,

0 commit comments

Comments
 (0)