Skip to content

Commit 2855e37

Browse files
committed
🤝 synchronize the organisational meta data
1 parent b850c2a commit 2855e37

File tree

5 files changed

+93
-53
lines changed

5 files changed

+93
-53
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ With your PR, here is a check list:
22

33
- [ ] Has Test cases written
44
- [ ] Has all code lines tested
5+
- [ ] Has `make format` been run?
6+
- [ ] Has `moban` been run?
57
- [ ] Passes all Travis CI builds
68
- [ ] Has fair amount of documentation if your change is complex
79
- [ ] run 'make format' so as to confirm the pyexcel organisation's coding style

.gitignore

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ parts/
2525
sdist/
2626
var/
2727
wheels/
28-
pip-wheel-metadata/
2928
share/python-wheels/
3029
*.egg-info/
3130
.installed.cfg
@@ -52,8 +51,10 @@ htmlcov/
5251
nosetests.xml
5352
coverage.xml
5453
*.cover
54+
*.py,cover
5555
.hypothesis/
5656
.pytest_cache/
57+
cover/
5758

5859
# Translations
5960
*.mo
@@ -63,6 +64,7 @@ coverage.xml
6364
*.log
6465
local_settings.py
6566
db.sqlite3
67+
db.sqlite3-journal
6668

6769
# Flask stuff:
6870
instance/
@@ -75,6 +77,7 @@ instance/
7577
docs/_build/
7678

7779
# PyBuilder
80+
.pybuilder/
7881
target/
7982

8083
# Jupyter Notebook
@@ -85,17 +88,23 @@ profile_default/
8588
ipython_config.py
8689

8790
# pyenv
88-
.python-version
91+
# For a library or package, you might want to ignore these files since the code is
92+
# intended to run in multiple environments; otherwise, check them in:
93+
# .python-version
8994

9095
# pipenv
9196
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
9297
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93-
# having no cross-platform support, pipenv may install dependencies that dont work, or not
98+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
9499
# install all needed dependencies.
95100
#Pipfile.lock
96101

97-
# celery beat schedule file
102+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
103+
__pypackages__/
104+
105+
# Celery stuff
98106
celerybeat-schedule
107+
celerybeat.pid
99108

100109
# SageMath parsed files
101110
*.sage.py
@@ -127,6 +136,12 @@ dmypy.json
127136
# Pyre type checker
128137
.pyre/
129138

139+
# pytype static type analyzer
140+
.pytype/
141+
142+
# Cython debug symbols
143+
cython_debug/
144+
130145
# VirtualEnv rules
131146
# Virtualenv
132147
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -159,6 +174,7 @@ pip-selfcheck.json
159174
# Windows rules
160175
# Windows thumbnail cache files
161176
Thumbs.db
177+
Thumbs.db:encryptable
162178
ehthumbs.db
163179
ehthumbs_vista.db
164180

@@ -264,13 +280,15 @@ flycheck_*.el
264280
# Vim rules
265281
# Swap
266282
[._]*.s[a-v][a-z]
283+
!*.svg # comment out if you don't need vector files
267284
[._]*.sw[a-p]
268285
[._]s[a-rt-v][a-z]
269286
[._]ss[a-gi-z]
270287
[._]sw[a-p]
271288

272289
# Session
273290
Session.vim
291+
Sessionx.vim
274292

275293
# Temporary
276294
.netrwhist
@@ -281,7 +299,7 @@ tags
281299
[._]*.un~
282300

283301
# JetBrains rules
284-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
302+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
285303
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
286304

287305
# User-specific stuff
@@ -311,9 +329,14 @@ tags
311329
# When using Gradle or Maven with auto-import, you should exclude module files,
312330
# since they will be recreated, and may cause churn. Uncomment if using
313331
# auto-import.
332+
# .idea/artifacts
333+
# .idea/compiler.xml
334+
# .idea/jarRepositories.xml
314335
# .idea/modules.xml
315336
# .idea/*.iml
316337
# .idea/modules
338+
# *.iml
339+
# *.ipr
317340

318341
# CMake
319342
cmake-build-*/
@@ -363,6 +386,7 @@ fabric.properties
363386

364387
# SFTP configuration file
365388
sftp-config.json
389+
sftp-config-alt*.json
366390

367391
# Package control specific files
368392
Package Control.last-run
@@ -400,6 +424,10 @@ tmtags
400424
!.vscode/tasks.json
401425
!.vscode/launch.json
402426
!.vscode/extensions.json
427+
*.code-workspace
428+
429+
# Local History for Visual Studio Code
430+
.history/
403431

404432
# Xcode rules
405433
# Xcode
@@ -426,6 +454,9 @@ DerivedData/
426454
*.perspectivev3
427455
!default.perspectivev3
428456

457+
## Gcc Patch
458+
/*.gcno
459+
429460
# Eclipse rules
430461
.metadata
431462
bin/
@@ -477,12 +508,17 @@ local.properties
477508

478509
# Annotation Processing
479510
.apt_generated/
511+
.apt_generated_test/
480512

481513
# Scala IDE specific (Scala & Java development for Eclipse)
482514
.cache-main
483515
.scala_dependencies
484516
.worksheet
485517

518+
# Uncomment this line if you wish to ignore the project description file.
519+
# Typically, this file would be tracked if it contains build/dependency configurations:
520+
#.project
521+
486522
# TortoiseGit rules
487523
# Project-level settings
488524
/.tgitconfig

.travis.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ notifications:
66
python:
77
- &pypy2 pypy2.7-6.0
88
- &pypy3 pypy3.5-6.0
9-
- 3.8-dev
9+
- 3.8
1010
- 3.7
1111
- 3.6
1212
- 3.5
@@ -17,33 +17,22 @@ stages:
1717
- moban
1818
- test
1919

20-
.disable_global: &disable_global
21-
addons: false
22-
cache: false
23-
env: {}
24-
python: false
25-
before_install: false
26-
install: false
27-
before_script: false
28-
script: false
29-
after_success: false
30-
after_failure: false
31-
before_deploy: false
32-
deploy: false
3320

3421
.lint: &lint
35-
<<: *disable_global
3622
git:
3723
submodules: false
3824
python: 3.6
25+
env:
26+
- MINREQ=0
3927
stage: lint
4028
script: make lint
4129

4230
.moban: &moban
43-
<<: *disable_global
4431
python: 3.6
32+
env:
33+
- MINREQ=0
4534
stage: moban
46-
install: pip install moban>=0.0.4
35+
install: pip install moban>=0.0.4 gitfs2 pypifs
4736
script:
4837
- moban
4938
- git diff --exit-code

README.rst

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ pyexcel-htmlr - Let you focus on data, instead of html format
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
9+
:target: https://awesome-python.com/#specific-formats-processing
10+
811
.. image:: https://travis-ci.org/pyexcel/pyexcel-htmlr.svg?branch=master
912
:target: http://travis-ci.org/pyexcel/pyexcel-htmlr
1013

@@ -26,6 +29,24 @@ pyexcel-htmlr - Let you focus on data, instead of html format
2629
:target: http://pyexcel-htmlr.readthedocs.org/en/latest/
2730

2831

32+
Support the project
33+
================================================================================
34+
35+
If your company has embedded pyexcel and its components into a revenue generating
36+
product, please support me on github, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
37+
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
38+
the project and develop it further.
39+
40+
If you are an individual, you are welcome to support me too and for however long
41+
you feel like. As my backer, you will receive
42+
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
43+
44+
And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.
45+
46+
With your financial support, I will be able to invest
47+
a little bit more time in coding, documentation and writing interesting posts.
48+
49+
2950
Known constraints
3051
==================
3152

@@ -50,24 +71,6 @@ or clone it and install it:
5071
$ cd pyexcel-htmlr
5172
$ python setup.py install
5273
53-
Support the project
54-
================================================================================
55-
56-
If your company has embedded pyexcel and its components into a revenue generating
57-
product, please support me on `github <https://github.com/sponsors/chfw>`_, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
58-
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
59-
the project and develop it further.
60-
61-
If you are an individual, you are welcome to support me too and for however long
62-
you feel like. As my backer, you will receive
63-
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
64-
65-
And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.
66-
67-
With your financial support, I will be able to invest
68-
a little bit more time in coding, documentation and writing interesting posts.
69-
70-
7174
Usage
7275
================================================================================
7376

@@ -284,18 +287,27 @@ On Windows systems, please issue this command::
284287

285288
> test.bat
286289

287-
How to update test environment and update documentation
290+
291+
Before you commit
292+
------------------------------
293+
294+
Please run::
295+
296+
$ make format
297+
298+
so as to beautify your code otherwise travis-ci may fail your unit test.
299+
300+
301+
And make sure you would have run moban command
288302
---------------------------------------------------------
289303

290304
Additional steps are required:
291305

292306
#. pip install moban
293307
#. make your changes in `.moban.d` directory, then issue command `moban`
308+
#. moban
294309

295-
What is pyexcel-commons
296-
---------------------------------
297-
298-
Many information that are shared across pyexcel projects, such as: this developer guide, license info, etc. are stored in `pyexcel-commons` project.
310+
otherwise travis-ci may also fail your unit test.
299311

300312
What is .moban.d
301313
---------------------------------

setup.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
#!/usr/bin/env python3
22

3-
# Template by pypi-mobans
3+
"""
4+
Template by pypi-mobans
5+
"""
6+
7+
import os
8+
import sys
49
import codecs
510
import locale
6-
import os
711
import platform
8-
import sys
912
from shutil import rmtree
1013

11-
from setuptools import Command, find_packages, setup
14+
from setuptools import Command, setup, find_packages
1215

1316
PY2 = sys.version_info[0] == 2
1417
PY26 = PY2 and sys.version_info[1] < 7
@@ -52,23 +55,21 @@
5255
"Programming Language :: Python :: 3.4",
5356
"Programming Language :: Python :: 3.5",
5457
"Programming Language :: Python :: 3.6",
55-
5658
"Programming Language :: Python :: 3.7",
57-
5859
"Programming Language :: Python :: 3.8",
5960

6061
'License :: OSI Approved :: BSD License',
6162
]
6263

64+
6365
INSTALL_REQUIRES = [
6466
"html5lib",
6567
"lxml",
6668
"pyexcel-io>=0.5.3",
6769
]
6870
SETUP_COMMANDS = {}
6971

70-
71-
PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests"])
72+
PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests", "tests.*"])
7273
EXTRAS_REQUIRE = {
7374
}
7475
# You do not need to read beyond this line

0 commit comments

Comments
 (0)