Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
helloqiu committed May 9, 2018
2 parents 2d7ecb1 + 2fb77a4 commit d11b6ca
Show file tree
Hide file tree
Showing 30 changed files with 537 additions and 336 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.4.0
current_version = 1.4.1
commit = True
tag = True

Expand Down
11 changes: 0 additions & 11 deletions .flake8

This file was deleted.

34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,34 @@
---
name: Bug Report / Bug 反馈
about: 反馈 WeRoBot 的 bug

---

<!--
请注意:不规范的问题会被部署的 issue bot 自动关闭。
Issue tracker 只用于反馈 bug 和 feature request。
与 WeRoBot 用法相关的问题请加入主页上的 QQ 群讨论或在 SegmentFault 社区提问。
在提问前请仔细阅读我们的文档,并推荐阅读《提问的智慧》:
https://github.com/ruby-china/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md
-->
* **对 Bug 的描述**
* 当前行为:
* 正确的行为:

* **环境**
* 平台:
* WeRoBot 版本号:
* Python 版本:

* **复现代码或 repo 链接**

```python
from werobot import WeRoBot

# 请在这里给出 bug 的复现代码。如有必要,可以创建一个复现 repo 并将链接粘贴到这里。
```

* **复现步骤**

* **其他信息**
<!-- 如对 bug 修复的建议、相关 issue 或 PR 的引用等信息 -->
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,21 @@
---
name: Feature request
about: 为 WeRoBot 的功能提出建议

---

<!--
Issue tracker 只用于反馈 bug 和 feature request 。
与 WeRoBot 用法相关的问题请加入主页上的 QQ 群讨论或在 SegmentFault 社区提问。
在提问前请仔细阅读我们的文档,并推荐阅读《提问的智慧》:
https://github.com/ruby-china/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md
-->

* **遇到的问题**
<!-- feature 总是要解决问题,来讲讲遇到的问题吧 -->

* **解决方案**
<!-- 描述为了解决这个问题需要 WeRoBot 添加的 feature -->

* **其他内容**
<!-- 如相关 issue 或 PR 的引用等信息 -->
10 changes: 10 additions & 0 deletions .style.yapf
@@ -0,0 +1,10 @@
[style]
based_on_style = pep8
align_closing_bracket_with_visual_indent = true
allow_multiline_dictionary_keys = false
allow_split_before_dict_value = false
dedent_closing_brackets = true
each_dict_entry_on_separate_line = true
coalesce_brackets = false
spaces_before_comment = 2
split_before_logical_operator = true
5 changes: 4 additions & 1 deletion .vscode/settings.json
@@ -1,3 +1,6 @@
{
"python.linting.flake8Enabled": true
"python.linting.flake8Enabled": false,
"python.formatting.provider": "yapf",
"python.linting.pylintEnabled": false,
"python.unitTest.pyTestEnabled": true
}
39 changes: 6 additions & 33 deletions README.rst
Expand Up @@ -2,14 +2,14 @@
WeRoBot
====================================

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

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

pip install werobot

如果你没有安装 pip 而且正在使用一台 OS X / Linux 电脑,那么你应该运行 ::

curl http://peak.telecommunity.com/dist/ez_setup.py | python
curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | python

如果你是 Windows 用户, 那么下载 http://peak.telecommunity.com/dist/ez_setup.py 和 https://raw.github.com/pypa/pip/master/contrib/get-pip.py 这两个文件,双击运行。

Hello World
=============

Expand All @@ -49,23 +42,3 @@ Hello World
return 'Hello World!'

robot.run()

Session
===========

WeRoBot 在 0.4.0 版本中开始支持 Session , Session 可以用来方便的记录用户数据 ::

import werobot

robot = werobot.WeRoBot(token='tokenhere')

@robot.text
def session(message, session):
last = session.get("last", None)
if last:
return last
session["last"] = message.content
return '这是你第一次和我说话'

robot.run()

3 changes: 2 additions & 1 deletion appveyor.yml
Expand Up @@ -15,6 +15,7 @@ install:
- redis-server --service-start
- set DATABASE_MYSQL_USERNAME=root
- set DATABASE_MYSQL_PASSWORD=Password12!
- set PYTHONIOENCODING=utf-8
before_test:
- ps: $env:MYSQL_PWD="Password12!"
- ps: $cmd = '"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -e "create database werobot;" --user=root'
Expand All @@ -31,4 +32,4 @@ on_failure:
notifications:
- provider: Slack
incoming_webhook:
secure: OUWL/ky2abFxup5CTKyGrmQRdqAE/TU5To/6bxxvS6GRaV6/JdyKyfxZHwnB1HOIg805obLeC4ngnSNEUd87to9JLSerBUb5b3VjYieuJVY=
secure: OUWL/ky2abFxup5CTKyGrmQRdqAE/TU5To/6bxxvS6GRaV6/JdyKyfxZHwnB1HOIg805obLeC4ngnSNEUd87to9JLSerBUb5b3VjYieuJVY=
2 changes: 1 addition & 1 deletion dev-requirements.txt
@@ -1,5 +1,5 @@
-r tox-requirements.txt
flake8==3.5.0
yapf
tox
django
bumpversion
3 changes: 3 additions & 0 deletions docs/changelog.rst
@@ -1,5 +1,8 @@
Changelog
=============
Version 1.4.1
----------------
+ 修复 :func:`werobot.client.Client.post` 中文文件名的 bug (`#292 <https://github.com/offu/WeRoBot/issues/292>`_)

Version 1.4.0
----------------
Expand Down
21 changes: 7 additions & 14 deletions docs/contribution-guide.rst
Expand Up @@ -41,22 +41,15 @@

代码风格
~~~~~~~~~~~
请遵循 ``PEP8`` 标准进行代码书写。
我们使用 `yapf <https://github.com/google/yapf>`_ 进行代码格式化。
在提交代码之前,请格式化一下你的代码 ::

https://www.python.org/dev/peps/pep-0008/
# Install yapf
pip install yapf
# format code
yapf -p --recursive -i werobot/

为了统一代码风格我们推荐使用 ``flake8`` 进行代码风格检查, 并为代码提交添加钩子。 ::

# Install git hook for flake8.
flake8 --install-hook
# flake8 will automatically run before commit.

添加钩子之后会在每次代码提交时运行 ``flake8`` 进行检查。

若要单独运行 ``flake8``。 ::

# Run flake8 immediately.
flake8 werobot
你也可以 `安装 yapf Pre-Commit Hook <https://github.com/google/yapf/tree/master/plugins#git-pre-commit-hook>`_ 来自动进行代码格式化工作。

测试
~~~~~~~~~~~
Expand Down

0 comments on commit d11b6ca

Please sign in to comment.