Merge branch 'master' into fixturefix

This merge is very broken and needs further fixing

Conflicts:
	pytest_django/compat.py
	pytest_django/db_reuse.py
	pytest_django/fixtures.py
	pytest_django/plugin.py
	tests/test_database.py

Author: pelme

.gitignore

@@ -13,4 +13,5 @@ _build
 /bin/
 /include/
 /lib/
+/src/
 .cache

.travis.yml

@@ -1,123 +1,22 @@
-language: python
 
+language: python
 python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
   - "3.3"
-  - "pypy"
-
-# Django 1.3 is only compatible with psycopg2 version <= 2.4.1
-# Django 1.4 is compatible with newer versions
 env:
-  - DB=sqlite DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-  - DB=sqlite DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-  - DB=sqlite DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-  - DB=sqlite DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
-  - DB=sqlite DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-  - DB=mysql DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-  - DB=mysql DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-  - DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-  - DB=mysql DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
-  - DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-  - DB=postgres DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-  - DB=postgres DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-  - DB=postgres DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-  - DB=postgres DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
-  - DB=postgres DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-
-
+  - TESTENV=pypy-master-sqlite
+  - TESTENV=python2.6-1.6-sqlite
+  - TESTENV=python2.7-1.3-sqlite
+  - TESTENV=python2.7-1.4-sqlite
+  - TESTENV=python2.7-master-mysql_innodb
+  - TESTENV=python2.7-master-mysql_myisam
+  - TESTENV=python2.7-master-sqlite
+  - TESTENV=python3.2-master-sqlite
+  - TESTENV=python3.3-master-sqlite
+  - TESTENV=python3.4-1.5-sqlite
+  - TESTENV=python3.4-1.6-sqlite
+  - TESTENV=python3.4-1.7-sqlite
+  - TESTENV=python3.4-master-postgres
+  - TESTENV=python3.4-master-sqlite
 install:
-  - pip install pytest
-  - pip install django-configurations>=0.2.1
-  - 'if [ "$DJANGO_VERSION" != "master" ]; then pip install django==$DJANGO_VERSION; fi'
-  - 'if [ "$DJANGO_VERSION" == "master" ]; then pip install -e git+https://github.com/django/django@master#egg=Django; fi'
-  - 'if [ "$TRAVIS_PYTHON_VERSION" == "pypy" -a "$DB" == postgres ]; then pip install psycopg2ct; fi'
-  - 'if [ "$TRAVIS_PYTHON_VERSION" != "pypy" -a "$DB" == postgres ]; then pip install psycopg2==$PSYCOPG_VERSION; fi'
-  - 'if [ "$DB" == mysql ]; then pip install mysql-python; fi'
-  - pip install -r requirements.txt
-
-before_script:
-  - psql -c 'create database pytest_django;' -U postgres
-  - psql -c 'create database pytest_django_reuse;' -U postgres
-
-  - mysql -e 'create database pytest_django;'
-  - mysql -e 'create database pytest_django_reuse;'
-
-script: py.test --ds=tests.settings_$DB
-
-
-matrix:
-  exclude:
-    # pypy + postgres
-    - python: pypy
-      env: DB=postgres DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    - python: pypy
-      env: DB=postgres DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    - python: pypy
-      env: DB=postgres DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-    - python: pypy
-      env: DB=postgres DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
-    # pypy + mysql
-    - python: pypy
-      env: DB=mysql DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    - python: pypy
-      env: DB=mysql DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    - python: pypy
-      env: DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-    # python 3.2 + django 1.3
-    - python: "3.2"
-      env: DB=sqlite DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    - python: "3.2"
-      env: DB=mysql DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    - python: "3.2"
-      env: DB=postgres DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    # python 3.2 + django 1.4
-    - python: "3.2"
-      env: DB=sqlite DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    - python: "3.2"
-      env: DB=mysql DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    - python: "3.2"
-      env: DB=postgres DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    # python 3.2 + mysql
-    - python: "3.2"
-      env: DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-    - python: "3.2"
-      env: DB=mysql DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
-    - python: "3.2"
-      env: DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-    # python 3.3 + django 1.3
-    - python: "3.3"
-      env: DB=sqlite DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    - python: "3.3"
-      env: DB=mysql DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    - python: "3.3"
-      env: DB=postgres DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
-    # python 3.3 + django 1.4
-    - python: "3.3"
-      env: DB=sqlite DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    - python: "3.3"
-      env: DB=mysql DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    - python: "3.3"
-      env: DB=postgres DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
-    # python 3.3 + mysql
-    - python: "3.3"
-      env: DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
-    - python: "3.3"
-      env: DB=mysql DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
-    - python: "3.3"
-      env: DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-    # Django 1.7 and Python 2.6
-    - python: "2.6"
-      env: DB=sqlite DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-    - python: "2.6"
-      env: DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
-
-    - python: "2.6"
-      env: DB=postgres DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
+  - pip install tox
+script: tox -e $TESTENV

Makefile

@@ -1,5 +1,8 @@
 .PHONY: docs test clean
 
+testenv: bin/py.test
+
+
 bin/python:
 	virtualenv .
 

README.rst

@@ -6,7 +6,7 @@ pytest-django is a plugin for `pytest <http://pytest.org/>`_ that provides a set
 
 * Authors: Ben Firshman, Andreas Pelme and `contributors <https://github.com/pelme/pytest_django/contributors>`_
 * Licence: BSD
-* Compatibility: Django 1.3-1.6 (experimental support for 1.7), python 2.5-2.7, 3.2-3.3 or PyPy, pytest >= 2.3.4
+* Compatibility: Django 1.3-1.7 (Django master is compatible at the time of each release), python 2.5-2.7, 3.2-3.3 or PyPy, pytest >= 2.3.4
 * Project URL: https://github.com/pelme/pytest_django
 * Documentation: http://pytest-django.rtfd.org/
 

docs/changelog.rst

@@ -1,5 +1,22 @@
 Changelog
 =========
+
+2.6.2
+-----
+
+* Fixed a bug that caused doctests to runs. Thanks to @jjmurre for the patch
+
+2.6.1
+-----
+This is a bugfix/support release with no new features:
+
+* Added support for Django 1.7 beta and Django master as of 2014-04-16.
+  pytest-django is now automatically tested against the latest git master
+  version of Django.
+
+* Support for MySQL with MyISAM tables. Thanks to Zach Kanzler and Julen Ruiz
+  Aizpuru for fixing this. This fixes issue #8 #64.
+
 2.6.0
 -----
 * Experimental support for Django 1.7 / Django master as of 2014-01-19.
@@ -8,6 +25,12 @@ Changelog
   Django. The support is experimental since Django 1.7 is not yet released, but
   the goal is to always be up to date with the latest Django master
 
+2.5.1
+-----
+Invalid release accidentally pushed to PyPI (identical to 2.6.1). Should not be
+used - use 2.6.1 or newer to avoid confusion.
+
+
 2.5.0
 -----
 * Python 2.5 compatibility dropped. py.test 2.5 dropped support for Python 2.5,

docs/contributing.rst

@@ -13,7 +13,7 @@ Community
 *********
 
 The fastest way to get feedback on contributions/bugs are usually to open an
-issue in the `issue tracker`_. 
+issue in the `issue tracker`_.
 
 Discussions also happends via IRC in #pylib on irc.freenode.org. You may also
 be interested in following `@andreaspelme`_ on Twitter.
@@ -108,8 +108,41 @@ something this way) or IRC discussions.
 Running the tests
 -----------------
 
-To run the tests simply execute ``py.test`` from your shell. Make sure you have
-Django and py.test installed before running the tests.
+There is a Makefile in the repository which aids in setting up a virtualenv
+which can be used to invoke py.test to run pytest-django's tests when
+developing.::
+
+    $ make
+
+This will install a virtualenv with py.test and the latest stable version of
+Django. The virtualenv can then be activated with::
+
+    $ source bin/activate
+
+Then, simply invoke py.test to run the test suite::
+
+    $ py.test --ds=tests.settings_sqlite
+
+
+tox can be used to run the test suite under different configurations by
+invoking::
+
+    $ tox
+
+There is a huge number of unique test configurations (63 at the time of
+writing), running them all will take a long time. All valid configurations can
+be found in `tox.ini`. To test against a few of them, invoke tox with the `-e`
+flag::
+
+    $ tox -e python3.3-1.7-postgres,python2.7-1.5-sqlite
+
+This will run the tests on Python 3.3/Django 1.7/PostgeSQL and Python
+2.7/Django 1.5/SQLite.
+
+The tox and Travis CI configuration is generated by the script
+`generate_configurations.py` in the root directory. To add tests for a new
+Python or Django version, simply update the script and run it to regenerate the
+configuration files.
 
 Measuring test coverage
 -----------------------

docs/faq.rst

@@ -30,8 +30,8 @@ Activate a specific locale in your project's ``conftest.py``::
 
 My tests are not being picked up when I run py.test from the root directory. Why not?
 -------------------------------------------------------------------------------------
- By default, py.test looks for tests in files named ``test*.py``. If you have your
- tests in files with other names, they will not be collected. It is common to put tests under
+ By default, py.test looks for tests in files named ``test_*.py`` (note that this is not the same as ``test*.py``). 
+ If you have your tests in files with other names, they will not be collected. It is common to put tests under
  ``app_directory/tests/views.py``. To find those tests, create a ``pytest.ini`` file in your
  project root with the contents::