Skip to content

Commit db711dc

Browse files
whtskywhtsky
committed
Merge branch 'develop'
2 parents eb6e392 + 13950bf commit db711dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2271
-470
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<!--
2+
在发布 Pull Request 之前，请花一点时间读一下我们的贡献指南：
3+
https://werobot.readthedocs.io/zh_CN/develop/contribution-guide.html
4+
-->

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ htmlcov/
3434
# Translations
3535
*.mo
3636

37+
# Emacs
38+
.#*
39+
3740
# Mr Developer
3841
.mr.developer.cfg
3942
.project

‎.travis.yml‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,45 @@
11
os: osx
22
language: generic
3-
osx_image: xcode8 # OS X 10.10
3+
osx_image: xcode8.2
44
env:
5-
- PYTHON_VERSION=2 PYTHON_INSTALL_METHOD=system
5+
- PYTHON_VERSION=2 PYTHON_INSTALL_METHOD=system
66
matrix:
77
include:
8-
- env:
9-
- PYTHON_VERSION="2.7.12 3.4.5 3.5.2 pypy-5.0.0"
10-
- PYTHON_INSTALL_METHOD=tox
11-
- env:
12-
- PYTHON_VERSION=2.7
13-
- PYTHON_INSTALL_METHOD=macpython
14-
- env:
15-
- PYTHON_VERSION=3.4
16-
- PYTHON_INSTALL_METHOD=macpython
17-
- env:
18-
- PYTHON_VERSION=3.5
19-
- PYTHON_INSTALL_METHOD=macpython
20-
- osx_image: xcode7.3 # OS X 10.11
21-
- osx_image: xcode8.2 # macOS 10.12
22-
allow_failures:
23-
- osx_image: xcode8.2
8+
- env:
9+
- PYTHON_MAJOR=py3
10+
- PYTHON_VERSION="3.6.0 3.5.2 3.4.5"
11+
- PYTHON_INSTALL_METHOD=tox
12+
- env:
13+
- PYTHON_MAJOR=py2
14+
- PYTHON_VERSION="2.7.12"
15+
- PYTHON_INSTALL_METHOD=tox
16+
- env:
17+
- PYTHON_MAJOR=pypy
18+
- PYTHON_VERSION="pypy-5.0.0"
19+
- PYTHON_INSTALL_METHOD=tox
20+
- env:
21+
- PYTHON_VERSION=2.7
22+
- PYTHON_INSTALL_METHOD=macpython
23+
- env:
24+
- PYTHON_VERSION=3.4
25+
- PYTHON_INSTALL_METHOD=macpython
26+
- env:
27+
- PYTHON_VERSION=3.5
28+
- PYTHON_INSTALL_METHOD=macpython
29+
- osx_image: xcode8
30+
- osx_image: xcode6.4
2431
cache:
2532
directories:
2633
- $HOME/.pyenv
34+
after_script: set +e
2735
install:
28-
- "source travis/install.sh"
29-
36+
- source travis/install.sh
3037
script:
31-
- "source travis/script.sh"
32-
38+
- source travis/script.sh
3339
after_success:
34-
- pip install codecov
35-
- codecov
36-
40+
- pip install codecov
41+
- codecov
3742
notifications:
3843
email: false
44+
slack:
45+
secure: A2AVwYqUoh2hza7eQ2yl5CNWEI6ozLZGolyh1U1Iez4t/lKD9+Y1FrcmsEjYoTYy0B2Q55RHxNZoSq5tVGb5Ap1f/bRakAWOmiedja5obYzIUqI+lJPXZBvxdlobOzuYUxRZOFCMndkN6UAzdJx2gaVdtj4iH/DxoVL6wK2wlfA=

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include requirements.txt
22
include README.rst
33
include LICENSE
4+
include werobot/contrib/error.html
45
recursive-include tests *
56
recursive-exclude tests *.pyc
67
recursive-exclude tests *.pyo

‎README.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ WeRoBot
1010
:target: https://semaphoreci.com/whtsky/werobot
1111
.. image:: https://codecov.io/gh/whtsky/WeRoBot/branch/master/graph/badge.svg
1212
:target: https://codecov.io/gh/whtsky/WeRoBot
13+
.. image:: https://img.shields.io/badge/QQ%20Group-283206829-brightgreen.svg?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTc5MiIgaGVpZ2h0PSIxNzkyIiB2aWV3Qm94PSIwIDAgMTc5MiAxNzkyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0yNzAgODA2cS04LTE5LTgtNTIgMC0yMCAxMS00OXQyNC00NXEtMS0yMiA3LjUtNTN0MjIuNS00M3EwLTEzOSA5Mi41LTI4OC41dDIxNy41LTIwOS41cTEzOS02NiAzMjQtNjYgMTMzIDAgMjY2IDU1IDQ5IDIxIDkwIDQ4dDcxIDU2IDU1IDY4IDQyIDc0IDMyLjUgODQuNSAyNS41IDg5LjUgMjIgOThsMSA1cTU1IDgzIDU1IDE1MCAwIDE0LTkgNDB0LTkgMzhxMCAxIDEuNSAzLjV0My41IDUgMiAzLjVxNzcgMTE0IDEyMC41IDIxNC41dDQzLjUgMjA4LjVxMCA0My0xOS41IDEwMHQtNTUuNSA1N3EtOSAwLTE5LjUtNy41dC0xOS0xNy41LTE5LTI2LTE2LTI2LjUtMTMuNS0yNi05LTE3LjVxLTEtMS0zLTFsLTUgNHEtNTkgMTU0LTEzMiAyMjMgMjAgMjAgNjEuNSAzOC41dDY5IDQxLjUgMzUuNSA2NXEtMiA0LTQgMTZ0LTcgMThxLTY0IDk3LTMwMiA5Ny01MyAwLTExMC41LTl0LTk4LTIwLTEwNC41LTMwcS0xNS01LTIzLTctMTQtNC00Ni00LjV0LTQwLTEuNXEtNDEgNDUtMTI3LjUgNjV0LTE2OC41IDIwcS0zNSAwLTY5LTEuNXQtOTMtOS0xMDEtMjAuNS03NC41LTQwLTMyLjUtNjRxMC00MCAxMC01OS41dDQxLTQ4LjVxMTEtMiA0MC41LTEzdDQ5LjUtMTJxNCAwIDE0LTIgMi0yIDItNGwtMi0zcS00OC0xMS0xMDgtMTA1LjV0LTczLTE1Ni41bC01LTNxLTQgMC0xMiAyMC0xOCA0MS01NC41IDc0LjV0LTc3LjUgMzcuNWgtMXEtNCAwLTYtNC41dC01LTUuNXEtMjMtNTQtMjMtMTAwIDAtMjc1IDI1Mi00NjZ6IiBmaWxsPSIjZmZmIi8%2BPC9zdmc%2B
14+
:target: https://jq.qq.com/?_wv=1027&k=449sXsV
1315

1416

17+
.. image:: http://werobot-slack.whtsky.com/badge.svg
18+
:target: http://werobot-slack.whtsky.com
19+
1520
WeRoBot 是一个微信公众号开发框架，采用MIT协议发布。
1621

1722
文档在这里： https://werobot.readthedocs.org/zh_CN/latest/

‎appveyor.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ install:
1212
- choco install redis-64
1313
- redis-server --service-install
1414
- redis-server --service-start
15-
1615
test_script:
1716
- C:\Python35\python -m tox -c tox-win.ini
1817
on_success:
@@ -22,5 +21,7 @@ on_success:
2221
on_failure:
2322
- ps: dir "env:"
2423
- ps: get-content .tox\*\log\*
25-
#after_test:
26-
# - "%PYTHON%/Scripts/codecov"
24+
notifications:
25+
- provider: Slack
26+
incoming_webhook:
27+
secure: OUWL/ky2abFxup5CTKyGrmQRdqAE/TU5To/6bxxvS6GRaV6/JdyKyfxZHwnB1HOIg805obLeC4ngnSNEUd87to9JLSerBUb5b3VjYieuJVY=

‎dev-requirements.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
-r tox-requirements.txt
22
flake8==2.6.2
33
tox
4-
cryptography
5-
pytest
64
django
7-
flask
8-
tornado
9-
webtest

‎docs/_static/qq.png‎

1.16 KB
Loading

‎docs/_themes/flask/sidebarintro.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{% if theme_github_url %}
2-
<h3>{{ project }}</h3>
2+
<h3><a href="index.html">{{ project }}</a></h3>
33
<a href="http://github.com/{{ theme_github_url }}" class="sidebar-github-link">
44
<img src="https://img.shields.io/github/stars/{{ theme_github_url }}.svg?style=social&label=Star&maxAge=2592000" />
55
<img src="https://img.shields.io/github/forks/{{ theme_github_url }}.svg?style=social&label=Fork&maxAge=2592000" />
66
</a>
7+
8+
<h3>遇到问题了？</h3>
9+
<p>
10+
如果你遇到了问题，请去 <a href="https://github.com/whtsky/WeRoBot/issues/new">发 Issue</a>。
11+
</p>
12+
QQ群： 283206829 <br>
13+
<img src="{{ pathto('_static/qq.png', 1) }}" />
714
{% endif %}

‎docs/changelog.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Changelog
22
=============
33

4+
Version 1.1.0
5+
----------------
6+
7+
+ 为 :class:`werobot.robot.BaseRoBot` 增加 ``client`` property
8+
+ 允许在初始化 :class:`werobot.robot.BaseRoBot` 时传入 :doc:`config` 。注意如果传入了 config ， BaseRoBot 会忽略除 ``config`` 与 ``logger`` 外的其他所有的参数。
9+
+ deprecate :class:`werobot.robot.BaseRoBot` 的 ``enable_session`` 参数
10+
+ Session Storage 现在是惰性加载的了； 如果希望关闭 Session ， 请将 :doc:`config` 中的 ``SESSION_STORAGE`` 设为 ``False`` (`#189 <https://github.com/whtsky/WeRoBot/issues/189>`_)
11+
+ 修复了打包时 `error.html` 被忽略导致的默认错误页面错误的问题 (`#194 <https://github.com/whtsky/WeRoBot/issues/194>`_)
12+
+ 允许使用 ``reply.time`` 的方式快速读取 Reply 属性
13+
+ 完善 :doc:`client` 中自定义菜单、消息管理、素材管理、用户管理、账户管理、素材管理部分的 `API`
14+
+ 修复了直接 GET 访问 Robot 主页返回 500 的问题
15+
416
Version 1.0.0
517
----------------
618

0 commit comments

Comments
 (0)