Skip to content

Commit d11b6ca

Browse files
committed
Merge branch 'develop'
2 parents 2d7ecb1 + 2fb77a4 commit d11b6ca

30 files changed

Lines changed: 537 additions & 336 deletions

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.4.0
2+
current_version = 1.4.1
33
commit = True
44
tag = True
55

.flake8

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug Report / Bug 反馈
3+
about: 反馈 WeRoBot 的 bug
4+
5+
---
6+
7+
<!--
8+
请注意:不规范的问题会被部署的 issue bot 自动关闭。
9+
Issue tracker 只用于反馈 bug 和 feature request。
10+
与 WeRoBot 用法相关的问题请加入主页上的 QQ 群讨论或在 SegmentFault 社区提问。
11+
在提问前请仔细阅读我们的文档,并推荐阅读《提问的智慧》:
12+
https://github.com/ruby-china/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md
13+
-->
14+
* **对 Bug 的描述**
15+
* 当前行为:
16+
* 正确的行为:
17+
18+
* **环境**
19+
* 平台:
20+
* WeRoBot 版本号:
21+
* Python 版本:
22+
23+
* **复现代码或 repo 链接**
24+
25+
```python
26+
from werobot import WeRoBot
27+
28+
# 请在这里给出 bug 的复现代码。如有必要,可以创建一个复现 repo 并将链接粘贴到这里。
29+
```
30+
31+
* **复现步骤**
32+
33+
* **其他信息**
34+
<!-- 如对 bug 修复的建议、相关 issue 或 PR 的引用等信息 -->
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Feature request
3+
about: 为 WeRoBot 的功能提出建议
4+
5+
---
6+
7+
<!--
8+
Issue tracker 只用于反馈 bug 和 feature request 。
9+
与 WeRoBot 用法相关的问题请加入主页上的 QQ 群讨论或在 SegmentFault 社区提问。
10+
在提问前请仔细阅读我们的文档,并推荐阅读《提问的智慧》:
11+
https://github.com/ruby-china/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md
12+
-->
13+
14+
* **遇到的问题**
15+
<!-- feature 总是要解决问题,来讲讲遇到的问题吧 -->
16+
17+
* **解决方案**
18+
<!-- 描述为了解决这个问题需要 WeRoBot 添加的 feature -->
19+
20+
* **其他内容**
21+
<!-- 如相关 issue 或 PR 的引用等信息 -->

.style.yapf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[style]
2+
based_on_style = pep8
3+
align_closing_bracket_with_visual_indent = true
4+
allow_multiline_dictionary_keys = false
5+
allow_split_before_dict_value = false
6+
dedent_closing_brackets = true
7+
each_dict_entry_on_separate_line = true
8+
coalesce_brackets = false
9+
spaces_before_comment = 2
10+
split_before_logical_operator = true

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"python.linting.flake8Enabled": true
2+
"python.linting.flake8Enabled": false,
3+
"python.formatting.provider": "yapf",
4+
"python.linting.pylintEnabled": false,
5+
"python.unitTest.pyTestEnabled": true
36
}

README.rst

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
WeRoBot
33
====================================
44

5-
.. image:: https://img.shields.io/travis/whtsky/WeRoBot/master.svg?maxAge=3600&label=macOS
6-
:target: https://travis-ci.org/whtsky/WeRoBot
5+
.. image:: https://img.shields.io/travis/offu/WeRoBot/master.svg?maxAge=3600&label=macOS
6+
:target: https://travis-ci.org/offu/WeRoBot
77
.. image:: https://img.shields.io/appveyor/ci/whtsky/WeRoBot/master.svg?maxAge=3600&label=Windows
88
:target: https://ci.appveyor.com/project/whtsky/WeRoBot
9-
.. image:: https://semaphoreci.com/api/v1/whtsky/werobot/branches/master/shields_badge.svg
10-
:target: https://semaphoreci.com/whtsky/werobot
11-
.. image:: https://codecov.io/gh/whtsky/WeRoBot/branch/master/graph/badge.svg
12-
:target: https://codecov.io/gh/whtsky/WeRoBot
9+
.. image:: https://semaphoreci.com/api/v1/offu/werobot/branches/master/shields_badge.svg
10+
:target: https://semaphoreci.com/offu/werobot
11+
.. image:: https://codecov.io/gh/offu/WeRoBot/branch/master/graph/badge.svg
12+
:target: https://codecov.io/gh/offu/WeRoBot
1313
.. image:: https://img.shields.io/badge/QQ%20Group-283206829-brightgreen.svg?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTc5MiIgaGVpZ2h0PSIxNzkyIiB2aWV3Qm94PSIwIDAgMTc5MiAxNzkyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0yNzAgODA2cS04LTE5LTgtNTIgMC0yMCAxMS00OXQyNC00NXEtMS0yMiA3LjUtNTN0MjIuNS00M3EwLTEzOSA5Mi41LTI4OC41dDIxNy41LTIwOS41cTEzOS02NiAzMjQtNjYgMTMzIDAgMjY2IDU1IDQ5IDIxIDkwIDQ4dDcxIDU2IDU1IDY4IDQyIDc0IDMyLjUgODQuNSAyNS41IDg5LjUgMjIgOThsMSA1cTU1IDgzIDU1IDE1MCAwIDE0LTkgNDB0LTkgMzhxMCAxIDEuNSAzLjV0My41IDUgMiAzLjVxNzcgMTE0IDEyMC41IDIxNC41dDQzLjUgMjA4LjVxMCA0My0xOS41IDEwMHQtNTUuNSA1N3EtOSAwLTE5LjUtNy41dC0xOS0xNy41LTE5LTI2LTE2LTI2LjUtMTMuNS0yNi05LTE3LjVxLTEtMS0zLTFsLTUgNHEtNTkgMTU0LTEzMiAyMjMgMjAgMjAgNjEuNSAzOC41dDY5IDQxLjUgMzUuNSA2NXEtMiA0LTQgMTZ0LTcgMThxLTY0IDk3LTMwMiA5Ny01MyAwLTExMC41LTl0LTk4LTIwLTEwNC41LTMwcS0xNS01LTIzLTctMTQtNC00Ni00LjV0LTQwLTEuNXEtNDEgNDUtMTI3LjUgNjV0LTE2OC41IDIwcS0zNSAwLTY5LTEuNXQtOTMtOS0xMDEtMjAuNS03NC41LTQwLTMyLjUtNjRxMC00MCAxMC01OS41dDQxLTQ4LjVxMTEtMiA0MC41LTEzdDQ5LjUtMTJxNCAwIDE0LTIgMi0yIDItNGwtMi0zcS00OC0xMS0xMDgtMTA1LjV0LTczLTE1Ni41bC01LTNxLTQgMC0xMiAyMC0xOCA0MS01NC41IDc0LjV0LTc3LjUgMzcuNWgtMXEtNCAwLTYtNC41dC01LTUuNXEtMjMtNTQtMjMtMTAwIDAtMjc1IDI1Mi00NjZ6IiBmaWxsPSIjZmZmIi8%2BPC9zdmc%2B
1414
:target: https://jq.qq.com/?_wv=1027&k=449sXsV
1515

@@ -28,13 +28,6 @@ WeRoBot 是一个微信公众号开发框架,采用MIT协议发布。
2828

2929
pip install werobot
3030

31-
如果你没有安装 pip 而且正在使用一台 OS X / Linux 电脑,那么你应该运行 ::
32-
33-
curl http://peak.telecommunity.com/dist/ez_setup.py | python
34-
curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | python
35-
36-
如果你是 Windows 用户, 那么下载 http://peak.telecommunity.com/dist/ez_setup.py 和 https://raw.github.com/pypa/pip/master/contrib/get-pip.py 这两个文件,双击运行。
37-
3831
Hello World
3932
=============
4033

@@ -49,23 +42,3 @@ Hello World
4942
return 'Hello World!'
5043

5144
robot.run()
52-
53-
Session
54-
===========
55-
56-
WeRoBot 在 0.4.0 版本中开始支持 Session , Session 可以用来方便的记录用户数据 ::
57-
58-
import werobot
59-
60-
robot = werobot.WeRoBot(token='tokenhere')
61-
62-
@robot.text
63-
def session(message, session):
64-
last = session.get("last", None)
65-
if last:
66-
return last
67-
session["last"] = message.content
68-
return '这是你第一次和我说话'
69-
70-
robot.run()
71-

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ install:
1515
- redis-server --service-start
1616
- set DATABASE_MYSQL_USERNAME=root
1717
- set DATABASE_MYSQL_PASSWORD=Password12!
18+
- set PYTHONIOENCODING=utf-8
1819
before_test:
1920
- ps: $env:MYSQL_PWD="Password12!"
2021
- ps: $cmd = '"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -e "create database werobot;" --user=root'
@@ -31,4 +32,4 @@ on_failure:
3132
notifications:
3233
- provider: Slack
3334
incoming_webhook:
34-
secure: OUWL/ky2abFxup5CTKyGrmQRdqAE/TU5To/6bxxvS6GRaV6/JdyKyfxZHwnB1HOIg805obLeC4ngnSNEUd87to9JLSerBUb5b3VjYieuJVY=
35+
secure: OUWL/ky2abFxup5CTKyGrmQRdqAE/TU5To/6bxxvS6GRaV6/JdyKyfxZHwnB1HOIg805obLeC4ngnSNEUd87to9JLSerBUb5b3VjYieuJVY=

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-r tox-requirements.txt
2-
flake8==3.5.0
2+
yapf
33
tox
44
django
55
bumpversion

docs/changelog.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Changelog
22
=============
3+
Version 1.4.1
4+
----------------
5+
+ 修复 :func:`werobot.client.Client.post` 中文文件名的 bug (`#292 <https://github.com/offu/WeRoBot/issues/292>`_)
36

47
Version 1.4.0
58
----------------

0 commit comments

Comments
 (0)