Merge pull request #1 from wechaty/master

merge maste code

Author: wj-Mcat

.github/workflows/python-app.yml

@@ -22,15 +22,11 @@ jobs:
         python-version: 3.8
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        python3 -m pip install --upgrade pip
+        make install
     - name: Lint with flake8
       run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        make lint
     - name: Test with pytest
       run: |
-        pytest
+        make test

Makefile

@@ -4,11 +4,19 @@ all: install example
 .PHONY: install
 install:
 	pip3 install -r requirements.txt
+	pip3 install -r requirements-dev.txt
 
 .PHONY: bot
 bot:
 	python3 examples/ding-dong-bot.py
 
+.PHONY: lint
+lint:
+	# stop the build if there are Python syntax errors or undefined names
+	flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+	# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+	flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
 .PHONY: test
 test: pytest
 

README.md

@@ -17,6 +17,10 @@ Wechaty is a RPA SDK for Wechat **Individual** Account that can help you create
 
 1. python3.7+
 
+## Live Coding Video Tutorial
+
+Here's a great live coding video tutorial from our Python Wechaty creator @wj-Mcat: <https://wechaty.js.org/2020/10/26/python-wechaty-live-coding/>
+
 ## Quick Start
 
 1. Clone python-wechaty-getting-started repository
@@ -59,8 +63,8 @@ from wechaty import Wechaty
 import asyncio
 async def main():
     bot = Wechaty()
-    bot.on('scan', lambda status, qrcode, data: print('Scan QR Code to login: {}\nhttps://wechaty.github.io/qrcode/{}'.format(status, qrcode)))
-    bot.on('login', lambda user: print('User {} logined'.format(user)))
+    bot.on('scan', lambda status, qrcode, data: print('Scan QR Code to login: {}\nhttps://wechaty.wechaty.js/qrcode/{}'.format(status, qrcode)))
+    bot.on('login', lambda user: print('User {} logged in'.format(user)))
     bot.on('message', lambda message: print('Message: {}'.format(message)))
     await bot.start()
 asyncio.run(main())

VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

examples/ding-dong-bot.py

@@ -21,6 +21,7 @@
     FileBox,
     Message,
     Wechaty,
+    ScanStatus,
 )
 
 
@@ -39,11 +40,16 @@ async def on_message(msg: Message):
         await msg.say(file_box)
 
 
-async def on_scan(qrcode: str, status: int, data):
+async def on_scan(
+        qrcode: str,
+        status: ScanStatus,
+        _data,
+):
     """
     Scan Handler for the Bot
     """
-    print('Status: ' + status + ', View QR Code Online: https://wechaty.github.io/qrcode/' + qrcode)
+    print('Status: ' + str(status))
+    print('View QR Code Online: https://wechaty.js.org/qrcode/' + qrcode)
 
 
 async def on_login(user: Contact):

requirements-dev.txt

@@ -0,0 +1,2 @@
+flake8
+pytest

requirements.txt

@@ -1,2 +1 @@
-wechaty~=0.6
-wechaty-puppet-service~=0.5.0dev
+wechaty~=0.7dev15

tests/smoke_testing_test.py

@@ -7,12 +7,14 @@
 #     Iterable,
 # )
 from wechaty import (
-    Wechaty
+    Wechaty,
+    Contact,
 )
 
 
 def test_smoke_testing() -> None:
     """ wechaty """
     # os.environ['WECHATY_PUPPET_SERVICE_TOKEN'] = 'test'
     # bot = Wechaty()
-    assert Wechaty, 'should be imported successfully'
+    assert Wechaty, 'should be imported successfully for Wechaty'
+    assert Contact, 'should be imported successfully for Contact'