Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs + travis #146

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update docs + travis #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93540b5
update docs for running under apache
nanuxbe Dec 30, 2015
0332ad5
Mention Python 3 support in README
nanuxbe Dec 30, 2015
9140ed6
Add Django 1.9 and Python 3.5 to supported list in `setup.py`
nanuxbe Dec 30, 2015
862bf2a
add Python 3.5 to `.travis.yml`
nanuxbe Jan 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ python:
- 2.7
- 3.3
- 3.4
- 3.5

env:
- DJANGO=1.5.12 MIGRATE='true'
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/running.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Configuration section for Apache:
.. code-block:: guess

<VirtualHost IPADDR:80>
ProxyPass /ws/ ws://127.0.0.1:9090/
ProxyPass /ws/ ws://127.0.0.1:9090/ws/
</VirtualHost>


Expand Down
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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(
Expand Down