From 93540b5fa8eca8780bf31338c1598bc45c390413 Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Wed, 30 Dec 2015 16:17:36 +0100 Subject: [PATCH 1/4] update docs for running under apache --- docs/running.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/running.rst b/docs/running.rst index 09a010cd..abc2d9a0 100644 --- a/docs/running.rst +++ b/docs/running.rst @@ -200,7 +200,7 @@ Configuration section for Apache: .. code-block:: guess - ProxyPass /ws/ ws://127.0.0.1:9090/ + ProxyPass /ws/ ws://127.0.0.1:9090/ws/ From 0332ad5d686d02045937d6fb2c4177869daec0c2 Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Wed, 30 Dec 2015 16:18:01 +0100 Subject: [PATCH 2/4] Mention Python 3 support in README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index c551b634..81698822 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ messaging it uses the [Redis](http://redis.io/) datastore and in a production en intended to work under [uWSGI](http://projects.unbit.it/uwsgi/) and behind [NGiNX](http://nginx.com/) or [Apache](http://httpd.apache.org/docs/2.4/mod/mod_proxy_wstunnel.html) version 2.4.5 or later. +New in 0.4.5 +------------ +* Added support for Python 3 + New in 0.4.4 ------------ * Added method ``release()`` to ``RedisSubscriber`` and calling this method each time a Websocket From 9140ed66b68d91c3ae0212145086f42d1c91878e Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Wed, 30 Dec 2015 16:19:01 +0100 Subject: [PATCH 3/4] Add Django 1.9 and Python 3.5 to supported list in `setup.py` --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 4418aca3..94e112ee 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ def convert(filename, fmt): 'Framework :: Django :: 1.6', 'Framework :: Django :: 1.7', 'Framework :: Django :: 1.8', + 'Framework :: Django :: 1.9', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', @@ -31,6 +32,7 @@ def convert(filename, fmt): 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ] setup( From 862bf2ac892f2ddf0ac2cf543d786e94706443bd Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Mon, 4 Jan 2016 10:54:21 +0100 Subject: [PATCH 4/4] add Python 3.5 to `.travis.yml` --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index f1814edb..d61aec04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - 2.7 - 3.3 - 3.4 + - 3.5 env: - DJANGO=1.5.12 MIGRATE='true' @@ -21,6 +22,14 @@ matrix: # Django 1.9 does not support python 3.3 - env: DJANGO=1.9.1 MIGRATE='./manage.py migrate' python: 3.3 + # Python 3.5 is only officially supported by Django 1.8 & 1.9 + - env: DJANGO=1.5.12 MIGRATE='true' + python: 3.5 + - env: DJANGO=1.6.11 MIGRATE='true' + python: 3.5 + - env: DJANGO=1.7.11 MIGRATE='./manage.py migrate' + python: 3.5 + install: - pip install -r examples/requirements.txt