From 93521da0050aee3ee919fd482c7c7e84a65a4e1c Mon Sep 17 00:00:00 2001 From: florimondmanca Date: Sun, 28 Apr 2019 17:26:46 +0200 Subject: [PATCH] upgrade to bocadillo 0.15 --- Pipfile.lock | 89 +++++++++++++++++++++++++++------------------------- README.md | 4 +-- app.py | 7 ++--- 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index ee0ef65..b0907b1 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -16,20 +16,27 @@ ] }, "default": { + "aiodine": { + "hashes": [ + "sha256:5c18dca9e5398e8dd0f9cbc728c00207de71e2d132c33005e38454f33fb5a82f", + "sha256:7f58bdec4a33918c1f610f4491694cc6b547075f51c3a303077b722f777ca79d" + ], + "version": "==1.2.5" + }, "bocadillo": { "hashes": [ - "sha256:82e813eca55a25efad1153182333f9bb269d2443b94010ce370fb884b0960afc", - "sha256:c694cc752316818b13dd12cf72c5f8e5e382aa5cdea68c1de776b72d6052f625" + "sha256:34bbb14c7995900eff88cb3a4a3e89da5e68a57577b896a45679a4778447cbd1", + "sha256:588f7a9ca42999c87c17df36afb26314ba06894f44c976c55a2747ac15f86ae4" ], "index": "pypi", - "version": "==0.12.5" + "version": "==0.15.0" }, "certifi": { "hashes": [ - "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", - "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033" + "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", + "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" ], - "version": "==2018.11.29" + "version": "==2019.3.9" }, "chardet": { "hashes": [ @@ -56,7 +63,6 @@ "hashes": [ "sha256:e00cbd7ba01ff748e494248183abc6e153f49181169d8a3d41bb49132ca01dfc" ], - "markers": "sys_platform != 'win32' and sys_platform != 'cygwin' and platform_python_implementation != 'pypy'", "version": "==0.0.13" }, "idna": { @@ -68,10 +74,10 @@ }, "jinja2": { "hashes": [ - "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", - "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" + "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", + "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" ], - "version": "==2.10" + "version": "==2.10.1" }, "markupsafe": { "hashes": [ @@ -106,18 +112,12 @@ ], "version": "==1.1.1" }, - "parse": { - "hashes": [ - "sha256:870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2" - ], - "version": "==1.11.1" - }, "python-engineio": { "hashes": [ - "sha256:b3a0816dbd58b2870ab42240f8a375e981f9ae529c41b861b95aa2cbd86fa169", - "sha256:efe95e61f77be5392626935e5d4b361889abd7c66d4c07c5b29ddaefff628fed" + "sha256:a89d2cff7f9b447d37c450c2666101d97043b4b22524bf4efaafcb9784c9f7f4", + "sha256:fd14357f0b854de729cc2dba960ceba1d20da973c91f289110807f0bb2f69935" ], - "version": "==3.4.3" + "version": "==3.5.1" }, "python-multipart": { "hashes": [ @@ -127,11 +127,11 @@ }, "python-socketio": { "hashes": [ - "sha256:aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3", - "sha256:cd225eb0bb3b348665727cfaafad1e455ee13b8fd9ea9ff2691082b88b9a9444" + "sha256:8035604105058195dfa1c8ca1aff0435f08bbbdc3f72bb1f4b81723d129a4ecf", + "sha256:e19e1682fe4e69be74c2481c3330a366e394438073f919334a5d6362bd40f815" ], "index": "pypi", - "version": "==3.1.2" + "version": "==4.0.1" }, "requests": { "hashes": [ @@ -149,38 +149,43 @@ }, "starlette": { "hashes": [ - "sha256:223b03b2a294c43fa0a4e3c1e108200b0663c15800144f94142fcdcbd67a79c2" + "sha256:4e28c52d2830d03ee412df67d3b2d5ca2c6e24e939980dfd43987dc491f616f2" + ], + "version": "==0.12.0b3" + }, + "typesystem": { + "hashes": [ + "sha256:aa01ac52370a7e5996960c8a899da0f939753bc49d405e92dea5cb1f6bc3700a" ], - "version": "==0.11.3" + "version": "==0.2.2" }, "urllib3": { "hashes": [ - "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", - "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" + "sha256:4c291ca23bbb55c76518905869ef34bdd5f0e46af7afe6861e8375643ffee1a0", + "sha256:9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3" ], - "version": "==1.24.1" + "version": "==1.24.2" }, "uvicorn": { "hashes": [ - "sha256:8d523d0a003a874245025295b0c1233a762402c0d4c3988017401c6b461c83e9" + "sha256:181d47abddedd0f6e23eaeed97976bdce9ea1dbff0ec12385309cf4835783f6a" ], - "version": "==0.5.1" + "version": "==0.7.0" }, "uvloop": { "hashes": [ - "sha256:198fe0c196056930ec6c4a0a878e531a66d15467ca7c74a875aa90271f0c6e3f", - "sha256:1c175f47d34b84e33c0e312f4987c927ea004afc3a5f05d2f0f610d71d0e4c89", - "sha256:1c47f197be8f0a3c651dd20be1e1bd43268186246f246d4e86c91e95a89e4865", - "sha256:3fd4943570d20e8cd4d9f0a3190ebd5cf040e5610b685e05c878128a11f7ad14", - "sha256:435e232869923fd2248e4ca0ad73e24a5b4debf40bed9dcde133cfe1bef98a7a", - "sha256:9cfdb966ae804c46b96c92207dfd2174935ffc70e706e42e1c94c60d16dbe860", - "sha256:a585781443eeb2edb858f8c08c503aac237a5f1bebf0c84ea8340cc337afa408", - "sha256:b296493e033846e46488a6aa227a75c790091f5ee5456ec637bb0badad1e8851", - "sha256:c684047c6cf6d697ba37872fb1b4489012ea91f3f802c8fbb9c367c4902e88dc", - "sha256:da5a59d8812188b57b5783c7fb78891d14dd1050b6259680e0dbd4253d7d0f64" - ], - "markers": "sys_platform != 'win32' and sys_platform != 'cygwin' and platform_python_implementation != 'pypy'", - "version": "==0.12.1" + "sha256:0fcd894f6fc3226a962ee7ad895c4f52e3f5c3c55098e21efb17c071849a0573", + "sha256:2f31de1742c059c96cb76b91c5275b22b22b965c886ee1fced093fa27dde9e64", + "sha256:459e4649fcd5ff719523de33964aa284898e55df62761e7773d088823ccbd3e0", + "sha256:67867aafd6e0bc2c30a079603a85d83b94f23c5593b3cc08ec7e58ac18bf48e5", + "sha256:8c200457e6847f28d8bb91c5e5039d301716f5f2fce25646f5fb3fd65eda4a26", + "sha256:958906b9ca39eb158414fbb7d6b8ef1b7aee4db5c8e8e5d00fcbb69a1ce9dca7", + "sha256:ac1dca3d8f3ef52806059e81042ee397ac939e5a86c8a3cea55d6b087db66115", + "sha256:b284c22d8938866318e3b9d178142b8be316c52d16fcfe1560685a686718a021", + "sha256:c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f", + "sha256:fefc3b2b947c99737c348887db2c32e539160dcbeb7af9aa6b53db7a283538fe" + ], + "version": "==0.12.2" }, "websockets": { "hashes": [ diff --git a/README.md b/README.md index 5e0cf45..cbf7035 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Requires Python 3.6+. ```bash pip install bocadillo python-socketio # OR -pipenv install +pipenv install --pre ``` - Node.js dependencies: @@ -30,7 +30,7 @@ npm install 1. Fire off the server: ```bash -python app.py +uvicorn app:app ``` 2. Open up a web browser at http://localhost:8000, and start chatting! diff --git a/app.py b/app.py index cb7e92f..4aa5d00 100644 --- a/app.py +++ b/app.py @@ -1,7 +1,8 @@ import socketio -from bocadillo import App, Templates, static +from bocadillo import App, configure, Templates, static app = App() +configure(app) templates = Templates(app) # Create a socket.io async server. @@ -39,7 +40,3 @@ async def handle_message(sid, data: str): # Broadcast the received message to all connected clients. # See: https://python-socketio.readthedocs.io/en/latest/server.html#emitting-events await sio.emit("response", data) - - -if __name__ == "__main__": - app.run()