Skip to content

Commit

Permalink
Docs reformatting
Browse files Browse the repository at this point in the history
  • Loading branch information
justquick committed Mar 6, 2016
1 parent 76dc3c2 commit 17e4a9c
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 26 deletions.
16 changes: 9 additions & 7 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
.. _changelog:

Changelog
=========

0.6.1
-----

- Python 3.5 support
- Django 1.9 support
- **Python 3.5 support**
- **Django 1.9 support**
- Better AppConf compatibility
- More gracefully 404 handling in feeds
- New urlpatterns support
Expand All @@ -15,7 +17,7 @@ Changelog
0.6.0
-----

- Django 1.8 support
- **Django 1.8 support**
- Migrated to new migrations framework in Django core
- Improved db field indexing for models
- Optional django-generic-admin widgets integration (if installed)
Expand All @@ -40,10 +42,10 @@ Changelog
0.5.0
-----

- Django 1.6 and 1.7 support
- Python 3 and PyPy support
- **Django 1.6 and 1.7 support**
- **Python 3 and PyPy support**
- **Dropped support for Django 1.3 or older**
- Added new activity_stream templatetag
- Dropping support for Django<=1.3 and rely on prefetch_related.
- Added register method for actionable models
- Dropped support for ACTSTREAM_SETTINGS['MODELS'] setting
- Added AppConf to support Django>=1.7
Expand All @@ -52,7 +54,7 @@ Changelog
0.4.5
-----

- Django 1.5 support including custom User model
- **Django 1.5 support** including custom User model
- Translations and templates install fixes
- Fixes for MySQL migrations
- Tox testing for Py 2.6, 2.7 and Django 1.3, 1.4, 1.5
Expand Down
52 changes: 33 additions & 19 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,36 @@ You can learn more at :ref:`custom-data`
Supported Environments
----------------------

The following Python/Django versions and database configurations have been tested to work with the latest version of django-activity-stream.

* PostgreSQL 9.1, 9.2 and 9.3
* **Psy** = `psycopg2 2.6 <http://initd.org/psycopg/docs/>`_
* **PCffi** = `psycopg2cffi 2.6.1 <https://github.com/chtd/psycopg2cffi>`_
* MySQL 5.5 and 5.6
* **My** = `MySQL-python 1.2.5 <https://github.com/farcepest/MySQLdb1>`_
* **PyMy** = `PyMySQL 0.6.6 <https://github.com/PyMySQL/PyMySQL/>`_
* **S** = `Sqlite 3.7 <https://docs.python.org/2/library/sqlite3.html>`_

+----------------+------------+------------+------------+---------+
| | Py 2.6-2.7 | Py 3.2-3.5 | PyPy 2 | PyPy 3 |
+================+============+============+============+=========+
| Django 1.4 | Psy/My/S | | PCffi/My/S | |
+----------------+------------+------------+------------+---------+
| Django 1.5-1.9 | Psy/My/S | Psy/PyMy/S | PCffi/My/S | My/S |
+----------------+------------+------------+------------+---------+

Always make sure that you choose a Django version that is supported by your Python platform version. `See here for details <https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django>`_
The following Python/Django versions and database configurations are supported by django-activity-stream.
Make sure to pick the version of Django and django-activity-stream that supports the environment you are using.

.. note::

For Django compatibility details, `read the Django docs <https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django>`_.
For django-activity-stream compatibility details, see the :ref:`changelog`.

Python
******

* **Python 2**: 2.6 and 2.7
* **Python 3**: 3.2, 3.3, 3.4, and 3.5
* **PyPy**: 2 and 3

Django
******

* **Django**: 1.3, 1.4, 1.5, 1.6, 1.7, 1.8 and 1.9

Databases
*********

django-activity-stream has been tested to work with the following databases but may work on other platforms (YMMV)

* **Sqlite**: 3
* **PostgreSQL**: 9.1, 9.2 and 9.3
* Python: `psycopg2 <http://initd.org/psycopg/docs/>`_
* PyPy: `psycopg2cffi <https://github.com/chtd/psycopg2cffi>`_
* **MySQL**: 5.5 and 5.6
* Python/PyPy: `MySQL-python <https://github.com/farcepest/MySQLdb1>`_
* Python 3: `PyMySQL <https://github.com/PyMySQL/PyMySQL/>`_

0 comments on commit 17e4a9c

Please sign in to comment.