mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Merge remote-tracking branch 'core/master' into schema-alteration

Browse Source 
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
This commit is contained in:
Andrew Godwin
2013-08-09 14:17:30 +01:00
parent fddc5957c5 b575d690bb
commit de64c4d6e9
489 changed files with 3840 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docs/internals/contributing/writing-code/unit-tests.txt
View File

@@ -25,16 +25,26 @@ Quickstart
~~~~~~~~~~
Running the tests requires a Django settings module that defines the
databases to use. To make it easy to get started, Django provides a
sample settings module that uses the SQLite database. To run the tests
with this sample ``settings`` module:
databases to use. To make it easy to get started, Django provides and uses a
sample settings module that uses the SQLite database. To run the tests:
.. code-block:: bash
git clone git@github.com:django/django.git django-repo
cd django-repo/tests
./runtests.py
.. versionchanged:: 1.7
Older versions of Django required running the tests like this::
PYTHONPATH=..:$PYTHONPATH python ./runtests.py --settings=test_sqlite
``runtests.py`` now uses the Django package found at ``tests/../django`` (there
isn't a need to add this on your ``PYTHONPATH``) and ``test_sqlite`` for the
settings if settings aren't provided through either ``--settings`` or
:envvar:`DJANGO_SETTINGS_MODULE`.
.. _running-unit-tests-settings:
Using another ``settings`` module

14
docs/internals/deprecation.txt
View File

@@ -412,6 +412,8 @@ these changes.
* ``django.utils.dictconfig`` will be removed.
* ``django.utils.importlib`` will be removed.
* ``django.utils.unittest`` will be removed.
* The ``syncdb`` command will be removed.
@@ -425,6 +427,18 @@ these changes.
* ``allow_syncdb`` on database routers will no longer automatically become
``allow_migrate``.
* If models are organized in a package, Django will no longer look for
:ref:`initial SQL data<initial-sql>` in ``myapp/models/sql/``. Move your
custom SQL files to ``myapp/sql/``.
* FastCGI support via the ``runfcgi`` management command will be
removed. Please deploy your project using WSGI.
* ``django.utils.datastructures.SortedDict`` will be removed. Use
:class:`collections.OrderedDict` from the Python standard library instead.
* ``ModelAdmin.declared_fieldsets`` will be removed.
2.0
---