Skip to content

Commit

Permalink
docs: Remove mentions of Django 1.6
Browse files Browse the repository at this point in the history
We'll exclusively use Django 1.7+ migrations, so remove 1.6 from the
documentation.

I didn't actually remove Django 1.6 code nor testing. No reason to break
things too much without good reason. That means code can still be shared
with a version of patchwork caring about 1.6.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
  • Loading branch information
Damien Lespiau committed Nov 10, 2015
1 parent 7b6de15 commit c0ba985
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You'll need the following (applications used for patchwork development
are in brackets):

- A Python interpreter
- `Django <https://www.djangoproject.com/>`__ >= 1.6. The latest
- `Django <https://www.djangoproject.com/>`__ >= 1.7. The latest
version is recommended
- A webserver and suitable WSGI plugin. Options include
`Apache <http://httpd.apache.org/>`__ with the
Expand Down Expand Up @@ -126,9 +126,9 @@ If you're using MySQL, only the ``ENGINE`` changes:
},
}

**NOTE:** ``TEST_CHARSET`` (``TEST/CHARSET`` in Django >= 1.7) is used
when creating tables for the test suite. Without it, tests checking for
the correct handling of non-ASCII characters fail.
**NOTE:** ``TEST/CHARSET`` is used when creating tables for the test
suite. Without it, tests checking for the correct handling of non-ASCII
characters fail.

Django Setup
------------
Expand All @@ -145,7 +145,7 @@ Set up some initial directories in the patchwork base directory:
``lib/packages`` is for stuff we'll download, ``lib/python`` is to add
to our Python path. We'll symlink Python modules into ``lib/python``.

At the time of release, patchwork depends on Django version 1.6 or
At the time of release, patchwork depends on Django version 1.7 or
later. Where possible, try to use the latest stable version (currently
1.8). Your distro probably provides this. If not, install it manually:

Expand Down Expand Up @@ -200,16 +200,7 @@ file:
Configure Database Tables
~~~~~~~~~~~~~~~~~~~~~~~~~

Then, get patchwork to create its tables in your configured database.
For Django 1.6 and below:

::

PYTHONPATH=../lib/python ./manage.py syncdb

For Django 1.7+:

::
Then, get patchwork to create its tables in your configured database::

PYTHONPATH=../lib/python ./manage.py migrate

Expand Down

0 comments on commit c0ba985

Please sign in to comment.