From 2a9496fcdabc800df5522de8d4df68edfeaba07f Mon Sep 17 00:00:00 2001 From: Channel Cat Date: Sun, 29 Jan 2017 16:25:22 -0800 Subject: [PATCH 1/2] Fix readthedocs build --- docs/index.rst | 3 +-- docs/sanic/index.rst | 25 +++++++++++++++++++++++++ environment.yml | 13 ++++++++++++- requirements-rtd.txt | 2 -- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 docs/sanic/index.rst delete mode 100644 requirements-rtd.txt diff --git a/docs/index.rst b/docs/index.rst index 62cad021..44d0299c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,4 +1,4 @@ -.. include:: ../README.rst +.. include:: sanic/index.rst Guides ====== @@ -22,7 +22,6 @@ Guides sanic/deploying sanic/extensions sanic/contributing - getting_started Module Documentation diff --git a/docs/sanic/index.rst b/docs/sanic/index.rst new file mode 100644 index 00000000..eb9eb286 --- /dev/null +++ b/docs/sanic/index.rst @@ -0,0 +1,25 @@ +Sanic +================================= + +Sanic is a Flask-like Python 3.5+ web server that's written to go fast. It's based on the work done by the amazing folks at magicstack, and was inspired by `this article `_. + +On top of being Flask-like, Sanic supports async request handlers. This means you can use the new shiny async/await syntax from Python 3.5, making your code non-blocking and speedy. + +Sanic is developed `on GitHub `_. Contributions are welcome! + +Sanic aspires to be simple: +------------------- + +.. code:: python + + from sanic import Sanic + from sanic.response import json + + app = Sanic() + + @app.route("/") + async def test(request): + return json({"hello": "world"}) + + if __name__ == "__main__": + app.run(host="0.0.0.0", port=8000) \ No newline at end of file diff --git a/environment.yml b/environment.yml index c74a5137..7eee43a5 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,18 @@ name: py35 dependencies: +- openssl=1.0.2g=0 +- pip=8.1.1=py35_0 +- python=3.5.1=0 +- readline=6.2=2 +- setuptools=20.3=py35_0 +- sqlite=3.9.2=0 +- tk=8.5.18=0 +- wheel=0.29.0=py35_0 +- xz=5.0.5=1 +- zlib=1.2.8=0 - pip: - uvloop>=0.5.3 - httptools>=0.0.9 - ujson>=1.35 - - aiofiles>=0.3.0 \ No newline at end of file + - aiofiles>=0.3.0 + - https://github.com/channelcat/docutils-fork/zipball/master \ No newline at end of file diff --git a/requirements-rtd.txt b/requirements-rtd.txt deleted file mode 100644 index 856b3f4c..00000000 --- a/requirements-rtd.txt +++ /dev/null @@ -1,2 +0,0 @@ -sphinx -sphinx_rtd_theme \ No newline at end of file From c132c4e673acfac18d998dc6e50df9e52e4ab96c Mon Sep 17 00:00:00 2001 From: Channel Cat Date: Sun, 29 Jan 2017 16:32:57 -0800 Subject: [PATCH 2/2] fix conflict part 2 --- environment.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 environment.yml diff --git a/environment.yml b/environment.yml new file mode 100644 index 00000000..7eee43a5 --- /dev/null +++ b/environment.yml @@ -0,0 +1,18 @@ +name: py35 +dependencies: +- openssl=1.0.2g=0 +- pip=8.1.1=py35_0 +- python=3.5.1=0 +- readline=6.2=2 +- setuptools=20.3=py35_0 +- sqlite=3.9.2=0 +- tk=8.5.18=0 +- wheel=0.29.0=py35_0 +- xz=5.0.5=1 +- zlib=1.2.8=0 +- pip: + - uvloop>=0.5.3 + - httptools>=0.0.9 + - ujson>=1.35 + - aiofiles>=0.3.0 + - https://github.com/channelcat/docutils-fork/zipball/master \ No newline at end of file