Permalink
Switch branches/tags
Nothing to show
Commits on Jun 18, 2016
  1. Merge pull request #4 from pytest-dev/master

    pombredanne committed on GitHub Jun 18, 2016
    Latest master from upstream
Commits on Jun 17, 2016
  1. Convert readthedocs link for their .org -> .io migration for hosted p…

    adamchainz committed with blueyed Jun 17, 2016
    …rojects (#335)
    
    As per their email ‘Changes to project subdomains’:
    
    > Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
    
    Test Plan: Manually visited all the links I’ve modified.
Commits on Feb 24, 2016
  1. Merge pull request #318 from plumdog/fix_reuse_db_cmdline_help

    blueyed committed Feb 24, 2016
    Remove reference to --no-db in command-line help
Commits on Feb 23, 2016
Commits on Feb 10, 2016
  1. Merge pull request #316 from adamcheasley/patch-1

    blueyed committed Feb 10, 2016
    Fix typo in tutorial
  2. Fix typo

    adamcheasley committed Feb 10, 2016
Commits on Feb 2, 2016
  1. Merge pull request #314 from blueyed/update-versions-drop-py32

    pelme committed Feb 2, 2016
    tests: update versions, drop support for Python 3.2
  2. tests: update versions, drop support for Python 3.2

    blueyed committed Feb 2, 2016
    Python 3.2 is not supported by pip 8+ anymore, which is used by tox via
    Python 3.5's `virtualenv_support`.
    Failing build: https://travis-ci.org/pytest-dev/pytest-django/jobs/106463859.
Commits on Dec 5, 2015
  1. Be more careful to not load Django when settings is not properly

    pelme committed Dec 5, 2015
    configured.
    
    When another plugin(or conftest) imports Django, there might be errors
    arising. Importing Django before pytest-django has the chance to
    configure settings and call django.setup() may be an error, but it may
    also be correct depending on what gets imported.
    
    This commit closes #289.
  2. Merge pull request #261 from blueyed/use-keepdb-dj18

    pelme committed Dec 5, 2015
    Use Django's `--keepdb` with Django 1.8+
  3. Merge pull request #296 from jlec/master

    pelme committed Dec 5, 2015
    Include tests in pypyi tarball
  4. Include tests in pypyi tarball

    jlec committed Dec 5, 2015
    Inlcude test for downstream testing, resolves #290
    
    Signed-off-by: Justin Lecher <jlec@gentoo.org>
  5. Merge pull request #293 from jeffwidman/patch-1

    pelme committed Dec 5, 2015
    Fix typo: packaing --> packaging
Commits on Nov 30, 2015
Commits on Oct 16, 2015
  1. Merge pull request #283 from blueyed/doc-addopts

    pelme committed Oct 16, 2015
    doc: mention `addopts` to set `--ds`; typos
Commits on Oct 10, 2015
Commits on Oct 6, 2015
  1. Changelog for 2.9.1

    pelme committed Oct 6, 2015
  2. Fix regression introduced in 96f5fb1.

    pelme committed Oct 6, 2015
    The previous fix did not properly check the full MRO chain when looking
    for the super method, which then failed when used with mixins that does
    not define setUpClass/tearDownClass.
    
    This commit fixes issue #280.
  3. Fix rst formatting in changelog.

    pelme committed Oct 6, 2015
  4. Remove version/release from Sphinx docs.

    pelme committed Oct 6, 2015
    It became problematic with setuptools_scm. There is probably a better
    solution, but for now the release/version will just be removed from the
    docs.
Commits on Oct 5, 2015
  1. Show django settings in pytest output.

    pelme committed Oct 5, 2015
    With the recent change to prefer DJANGO_SETTINGS_MODULE from the
    environment rather than ini-file, it is nice to show which Django
    settings is used and why it was choosen.
    
    See discussion in pytest-dev#199
    for more information.
  2. Explain the order of where pytest-django finds DJANGO_SETTINGS_MODULE

    pelme committed Oct 5, 2015
    This was changed before the 2.9.0 release and was not documented. The
    change is backward incompatible and may surprise users.
    
    Then change was originally made in pytest-dev#199.
  3. Add .eggs to .gitignore

    pelme committed Oct 5, 2015
Commits on Oct 4, 2015
  1. Use Django's `--keepdb` with Django 1.8+

    blueyed committed Sep 14, 2015
    Django 1.8 supports `--keepdb` [1], and it makes sense to make use of
    it.  This should probably handle migrations in the context of
    `transactional_db` better, i.e. by re-applying migrations with a flushed
    DB.
    
    1: https://docs.djangoproject.com/en/1.8/ref/django-admin/#django-admin-option---keepdb
  2. Keep the existing PYTHONPATH in tox

    ktosiek committed with pelme Oct 4, 2015
    Without this the tests could not be run on systems that already use
    PYTHONPATH (like NixOS).
  3. Add 2.9.0 to changelog

    pelme committed Oct 4, 2015
  4. Fix calling of setUpClass/tearDownClass in classes with multiple inhe…

    pelme committed Oct 4, 2015
    …ritance
    
    pytest-django monkeypatches Django's setUpClass / tearDownClass to call
    them at the correct time during fixture setup/teardown. The previous
    implementation caused problems when used with multiple inheritance.
    
    This commit fixes issue #265.
Commits on Oct 3, 2015
Commits on Oct 2, 2015
  1. Remove pytest 2.8.0 skipifs

    pelme committed Oct 2, 2015