Skip to content

Commit 4ba48ef

Browse files
committed
📚 update documentation
1 parent de0c7a6 commit 4ba48ef

File tree

10 files changed

+130
-60
lines changed

10 files changed

+130
-60
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ With your PR, here is a check list:
44
- [ ] Has all code lines tested?
55
- [ ] Has `make format` been run?
66
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
7-
- [ ] Passes all Travis CI builds
87
- [ ] Has fair amount of documentation if your change is complex
98
- [ ] Agree on NEW BSD License for your contribution

.github/workflows/lint.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
name: lint code
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Set up Python
12+
uses: actions/setup-python@v1
13+
with:
14+
python-version: 3.8
15+
- name: lint
16+
run: |
17+
pip --use-deprecated=legacy-resolver install flake8
18+
pip --use-deprecated=legacy-resolver install -r tests/requirements.txt
19+
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long .
20+
python setup.py checkdocs

.github/workflows/moban-update.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
- uses: actions/checkout@v2
99
with:
1010
ref: ${{ github.head_ref }}
11+
token: ${{ secrets.PAT }}
1112
- name: Set up Python
1213
uses: actions/setup-python@v1
1314
with:
1415
python-version: '3.7'
1516
- name: check changes
1617
run: |
18+
pip install markupsafe==2.0.1
1719
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
1820
moban
1921
git status
2022
git diff --exit-code
2123
- name: Auto-commit
2224
if: failure()
23-
uses: docker://cdssnc/auto-commit-github-action
24-
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
uses: stefanzweifel/git-auto-commit-action@v4
2626
with:
27-
args: >-
27+
commit_message: >-
2828
This is an auto-commit, updating project meta data,
2929
such as changelog.rst, contributors.rst

.github/workflows/pythonpublish.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@ on:
55
types: [created]
66

77
jobs:
8-
deploy:
8+
pypi-publish:
9+
name: upload release to PyPI
910
runs-on: ubuntu-latest
11+
# Specifying a GitHub environment is optional, but strongly encouraged
12+
environment: pypi
13+
permissions:
14+
# IMPORTANT: this permission is mandatory for trusted publishing
15+
id-token: write
1016
steps:
17+
# retrieve your distributions here
1118
- uses: actions/checkout@v1
1219
- name: Set up Python
1320
uses: actions/setup-python@v1
@@ -16,11 +23,9 @@ jobs:
1623
- name: Install dependencies
1724
run: |
1825
python -m pip install --upgrade pip
19-
pip install setuptools wheel twine
20-
- name: Build and publish
21-
env:
22-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
26+
pip install setuptools wheel
27+
- name: Build
2428
run: |
2529
python setup.py sdist bdist_wheel
26-
twine upload dist/*
30+
- name: Publish package distributions to PyPI
31+
uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Run unit tests on Windows, Ubuntu and Mac
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
7+
test:
8+
name: ${{ matrix.os }} / ${{ matrix.python_version }}
9+
runs-on: ${{ matrix.os }}-latest
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
os: [Ubuntu]
14+
python_version: ["3.9.16"]
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Set up Python
19+
uses: actions/setup-python@v5
20+
with:
21+
python-version: ${{ matrix.python_version }}
22+
architecture: x64
23+
24+
- name: install
25+
run: |
26+
pip --use-deprecated=legacy-resolver install -r requirements.txt
27+
pip --use-deprecated=legacy-resolver install -r tests/requirements.txt
28+
- name: test
29+
run: |
30+
pip freeze
31+
nosetests --verbosity=3 --with-coverage --cover-package pyramid_excel --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyramid_excel
32+
- name: Upload coverage
33+
uses: codecov/codecov-action@v1
34+
with:
35+
name: ${{ matrix.os }} Python ${{ matrix.python-version }}

.readthedocs.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.12"
12+
13+
# Build documentation in the docs/ directory with Sphinx
14+
sphinx:
15+
configuration: docs/source/conf.py
16+
17+
# Optionally build your docs in additional formats such as PDF
18+
formats:
19+
- pdf
20+
21+
python:

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2020 by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2022 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
@@ -13,7 +13,7 @@ that the following conditions are met:
1313
and/or other materials provided with the distribution.
1414

1515
* Neither the name of 'pyramid-excel' nor the names of the contributors
16-
may not be used to endorse or promote products derived from this software
16+
may be used to endorse or promote products derived from this software
1717
without specific prior written permission.
1818

1919
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND

README.rst

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,19 @@ pyramid-excel - Let you focus on data, instead of file formats
55
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png
66
:target: https://www.patreon.com/chfw
77

8-
.. image:: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg
8+
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel-mobans/master/images/awesome-badge.svg
99
:target: https://awesome-python.com/#specific-formats-processing
1010

11-
.. image:: https://travis-ci.org/pyexcel-webwares/pyramid-excel.svg?branch=master
12-
:target: http://travis-ci.org/pyexcel-webwares/pyramid-excel
13-
1411
.. image:: https://codecov.io/gh/pyexcel-webwares/pyramid-excel/branch/master/graph/badge.svg
1512
:target: https://codecov.io/gh/pyexcel-webwares/pyramid-excel
1613

1714
.. image:: https://badge.fury.io/py/pyramid-excel.svg
1815
:target: https://pypi.org/project/pyramid-excel
1916

2017

18+
2119
.. image:: https://pepy.tech/badge/pyramid-excel/month
22-
:target: https://pepy.tech/project/pyramid-excel/month
20+
:target: https://pepy.tech/project/pyramid-excel
2321

2422

2523
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
@@ -37,25 +35,20 @@ Support the project
3735
================================================================================
3836

3937
If your company has embedded pyexcel and its components into a revenue generating
40-
product, please support me on github, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
41-
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
42-
the project and develop it further.
43-
44-
If you are an individual, you are welcome to support me too and for however long
45-
you feel like. As my backer, you will receive
46-
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
38+
product, please support me on github, or `patreon <https://www.patreon.com/bePatron?u=5537627>`_
39+
maintain the project and develop it further.
4740

48-
And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.
49-
50-
With your financial support, I will be able to invest
51-
a little bit more time in coding, documentation and writing interesting posts.
41+
With your financial support, I will be able to invest a little bit more time in coding,
42+
documentation and writing interesting posts.
5243

5344

5445
Known constraints
5546
==================
5647

5748
Fonts, colors and charts are not supported.
5849

50+
Nor to read password protected xls, xlsx and ods files.
51+
5952
Introduction
6053
================================================================================
6154
Here is a typical conversation between the developer and the user::
@@ -105,7 +98,7 @@ The highlighted features are:
10598
======================== ======================= =================
10699
Package name Supported file formats Dependencies
107100
======================== ======================= =================
108-
`pyexcel-io`_ csv, csvz [#f1]_, tsv,
101+
`pyexcel-io`_ csv, csvz [#f1]_, tsv, csvz,tsvz readers depends on `chardet`
109102
tsvz [#f2]_
110103
`pyexcel-xls`_ xls, xlsx(read only), `xlrd`_,
111104
xlsm(read only) `xlwt`_
@@ -134,9 +127,9 @@ The highlighted features are:
134127
Plugin shopping guide
135128
------------------------
136129

137-
Since 2020, all pyexcel-io plugins have dropped the support for python version
138-
lower than 3.6. If you want to use any python versions, please use pyexcel-io
139-
and its plugins version lower than 0.6.0.
130+
Since 2020, all pyexcel-io plugins have dropped the support for python versions
131+
which are lower than 3.6. If you want to use any of those Python versions, please use pyexcel-io
132+
and its plugins versions that are lower than 0.6.0.
140133

141134

142135
Except csv files, xls, xlsx and ods files are a zip of a folder containing a lot of
@@ -305,7 +298,7 @@ Then install relevant development requirements:
305298
#. pip install -r tests/requirements.txt
306299

307300
Once you have finished your changes, please provide test case(s), relevant documentation
308-
and update CHANGELOG.rst.
301+
and update changelog.yml
309302

310303
.. note::
311304

@@ -316,15 +309,18 @@ and update CHANGELOG.rst.
316309

317310

318311
How to test your contribution
319-
------------------------------
312+
--------------------------------------------------------------------------------
320313

321-
Although `nose` and `doctest` are both used in code testing, it is advisable 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.
314+
Although `nose` and `doctest` are both used in code testing, it is advisable
315+
that unit tests are put in tests. `doctest` is incorporated only to make sure
316+
the code examples in documentation remain valid across different development
317+
releases.
322318

323319
On Linux/Unix systems, please launch your tests like this::
324320

325321
$ make
326322

327-
On Windows systems, please issue this command::
323+
On Windows, please issue this command::
328324

329325
> test.bat
330326

@@ -336,7 +332,7 @@ Please run::
336332

337333
$ make format
338334

339-
so as to beautify your code otherwise travis-ci may fail your unit test.
335+
so as to beautify your code otherwise your build may fail your unit test.
340336

341337

342338

docs/source/index.rst

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
`pyramid-excel` - Let you focus on data, instead of file formats
77
================================================================================
88

9-
:Author: chfw
9+
:Author: C.W.
1010
:Source code: http://github.com/pyexcel-webwares/pyramid-excel.git
1111
:Issues: http://github.com/pyexcel-webwares/pyramid-excel/issues
1212
:License: New BSD License
@@ -60,7 +60,7 @@ The highlighted features are:
6060
======================== ======================= =================
6161
Package name Supported file formats Dependencies
6262
======================== ======================= =================
63-
`pyexcel-io`_ csv, csvz [#f1]_, tsv,
63+
`pyexcel-io`_ csv, csvz [#f1]_, tsv, csvz,tsvz readers depends on `chardet`
6464
tsvz [#f2]_
6565
`pyexcel-xls`_ xls, xlsx(read only), `xlrd`_,
6666
xlsm(read only) `xlwt`_
@@ -89,9 +89,9 @@ The highlighted features are:
8989
Plugin shopping guide
9090
------------------------
9191

92-
Since 2020, all pyexcel-io plugins have dropped the support for python version
93-
lower than 3.6. If you want to use any python verions, please use pyexcel-io
94-
and its plugins version lower than 0.6.0.
92+
Since 2020, all pyexcel-io plugins have dropped the support for python versions
93+
which are lower than 3.6. If you want to use any of those Python versions, please use pyexcel-io
94+
and its plugins versions that are lower than 0.6.0.
9595

9696

9797
Except csv files, xls, xlsx and ods files are a zip of a folder containing a lot of
@@ -200,9 +200,9 @@ or clone it and install it:
200200
$ cd pyramid-excel
201201
$ python setup.py install
202202
203-
Installation of individual plugins , please refer to individual plugin page. For example, if you need xls file support, please install pyexcel-xls::
203+
Installation of individual plugins , please refer to individual plugin page. For example, if you need xlsx file support, please install pyexcel-xlsx::
204204

205-
$ pip install pyexcel-xls
205+
$ pip install pyexcel-xlsx
206206

207207

208208
Setup
@@ -295,18 +295,11 @@ Support the project
295295
-----------------------
296296

297297
If your company has embedded pyexcel and its components into a revenue generating
298-
product, please support me on github, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
299-
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
300-
the project and develop it further.
298+
product, please support me on github, or `patreon <https://www.patreon.com/bePatron?u=5537627>`_
299+
maintain the project and develop it further.
301300

302-
If you are an individual, you are welcome to support me too and for however long
303-
you feel like. As my backer, you will receive
304-
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
305-
306-
And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.
307-
308-
With your financial support, I will be able to invest
309-
a little bit more time in coding, documentation and writing interesting posts.
301+
With your financial support, I will be able to invest a little bit more time in coding,
302+
documentation and writing interesting posts.
310303

311304

312305

setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
locale.setlocale(locale.LC_ALL, "en_US.UTF-8")
3232

3333
NAME = "pyramid-excel"
34-
AUTHOR = "chfw"
34+
AUTHOR = "C.W."
3535
VERSION = "0.0.5"
3636
3737
LICENSE = "New BSD"
@@ -41,7 +41,7 @@
4141
)
4242
URL = "https://github.com/pyexcel-webwares/pyramid-excel"
4343
DOWNLOAD_URL = "%s/archive/0.0.5.tar.gz" % URL
44-
FILES = ["README.rst", "CHANGELOG.rst"]
44+
FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
4545
KEYWORDS = [
4646
"python",
4747
"API",
@@ -76,6 +76,7 @@
7676
'Programming Language :: Python :: 3.3',
7777
'Programming Language :: Python :: 3.4',
7878
'Programming Language :: Python :: 3.5'
79+
7980
]
8081

8182

@@ -96,7 +97,7 @@
9697
PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
9798
HERE = os.path.abspath(os.path.dirname(__file__))
9899

99-
GS_COMMAND = ("gs pyramid-excel v0.0.5 " +
100+
GS_COMMAND = ("gease pyramid-excel v0.0.5 " +
100101
"Find 0.0.5 in changelog for more details")
101102
NO_GS_MESSAGE = ("Automatic github release is disabled. " +
102103
"Please install gease to enable it.")

0 commit comments

Comments
 (0)