Use/support pytest 3.0.0 (#375)

pelme · web-flow · commit 313f26d59fc3 · 2016-08-20T14:50:18.000+02:00
* Use pytest 3.x in CI tests.

* Updated pytest version in README and setup.py

* Use tool:pytest in setup.cfg

* Change usage/mentions of py.test to pytest. #dropthedot

The CI scripts still use py.test to be compatible with running the test
suite with pytest 2.9.x.
diff --git a/.travis.yml b/.travis.yml
@@ -4,28 +4,29 @@ language: python
 python:
   - "3.5"
 env:
-  - TESTENV=pypy-1.10-sqlite_file
-  - TESTENV=pypy3-1.8-sqlite
-  - TESTENV=pypy3-1.8-sqlite_file
-  - TESTENV=python2.7-1.10-mysql_innodb
-  - TESTENV=python2.7-1.10-mysql_myisam
-  - TESTENV=python2.7-1.10-postgres
-  - TESTENV=python2.7-1.7-postgres
-  - TESTENV=python2.7-1.8-postgres
-  - TESTENV=python2.7-1.9-postgres
-  - TESTENV=python2.7-master-postgres
-  - TESTENV=python3.3-1.8-postgres
-  - TESTENV=python3.4-1.10-postgres
-  - TESTENV=python3.5-1.10-postgres
-  - TESTENV=python3.5-1.8-postgres
-  - TESTENV=python3.5-1.9-postgres
-  - TESTENV=python3.5-master-postgres
+  - TESTENV=pypy-3.0.0-1.10-sqlite_file
+  - TESTENV=pypy3-2.9.2-1.8-sqlite_file
+  - TESTENV=pypy3-3.0.0-1.8-sqlite
+  - TESTENV=pypy3-3.0.0-1.8-sqlite_file
+  - TESTENV=python2.7-3.0.0-1.10-mysql_innodb
+  - TESTENV=python2.7-3.0.0-1.10-mysql_myisam
+  - TESTENV=python2.7-3.0.0-1.10-postgres
+  - TESTENV=python2.7-3.0.0-1.7-postgres
+  - TESTENV=python2.7-3.0.0-1.8-postgres
+  - TESTENV=python2.7-3.0.0-1.9-postgres
+  - TESTENV=python2.7-3.0.0-master-postgres
+  - TESTENV=python3.3-3.0.0-1.8-postgres
+  - TESTENV=python3.4-3.0.0-1.10-postgres
+  - TESTENV=python3.5-3.0.0-1.10-postgres
+  - TESTENV=python3.5-3.0.0-1.8-postgres
+  - TESTENV=python3.5-3.0.0-1.9-postgres
+  - TESTENV=python3.5-3.0.0-master-postgres
   - TESTENV=checkqa-python2.7
   - TESTENV=checkqa-python3.5
 matrix:
   allow_failures:
-    - env: TESTENV=python2.7-master-postgres
-    - env: TESTENV=python3.5-master-postgres
+    - env: TESTENV=python2.7-3.0.0-master-postgres
+    - env: TESTENV=python3.5-3.0.0-master-postgres
 install:
   # Create pip wrapper script, using travis_retry (a function) and
   # inject it into tox.ini.
diff --git a/README.rst b/README.rst
@@ -17,7 +17,7 @@ pytest-django allows you to test your Django project/applications with the
 
   * Django: 1.7-1.10 and latest master branch (compatible at the time of each release)
   * Python: CPython 2.7,3.3-3.5 or PyPy 2,3
-  * pytest: 2.9.x
+  * pytest: >2.9.x
 
 * Licence: BSD
 * Project maintainers: Andreas Pelme, Floris Bruynooghe and Daniel Hahler
diff --git a/docs/configuring_django.rst b/docs/configuring_django.rst
@@ -15,19 +15,19 @@ Django settings the same way Django does by default.
 Example::
 
     $ export DJANGO_SETTINGS_MODULE=test_settings
-    $ py.test
+    $ pytest
 
 or::
 
-    $ DJANGO_SETTINGS_MODULE=test_settings py.test
+    $ DJANGO_SETTINGS_MODULE=test_settings pytest
 
 
 Command line option ``--ds=SETTINGS``
 -------------------------------------
 
 Example::
 
-    $ py.test --ds=test_settings
+    $ pytest --ds=test_settings
 
 
 pytest.ini settings
@@ -59,11 +59,11 @@ flag, or pytest.ini DJANGO_CONFIGURATION.
 Environment Variable::
 
     $ export DJANGO_CONFIGURATION=MySettings
-    $ py.test
+    $ pytest
 
 Command Line Option::
 
-    $ py.test --dc=MySettings
+    $ pytest --dc=MySettings
 
 
 INI File Contents::
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -117,14 +117,14 @@ You can manually create the virtualenv using::
 
     $ make testenv
 
-This will install a virtualenv with py.test and the latest stable version of
+This will install a virtualenv with pytest 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::
+Then, simply invoke pytest to run the test suite::
 
-    $ py.test --ds=tests.settings_sqlite
+    $ pytest --ds=tests.settings_sqlite
 
 
 tox can be used to run the test suite under different configurations by
@@ -164,7 +164,7 @@ but please don't include them in your pull requests.
 
 After this short initial setup you're ready to run tests::
 
-    $ COVERAGE_PROCESS_START=`pwd`/.coveragerc COVERAGE_FILE=`pwd`/.coverage PYTHONPATH=`pwd` py.test --ds=tests.postgres_settings
+    $ COVERAGE_PROCESS_START=`pwd`/.coveragerc COVERAGE_FILE=`pwd`/.coverage PYTHONPATH=`pwd` pytest --ds=tests.postgres_settings
 
 You should repeat the above step for sqlite and mysql before the next step.
 This step will create a lot of ``.coverage`` files with additional suffixes for
diff --git a/docs/database.rst b/docs/database.rst
@@ -12,7 +12,7 @@ what code uses the database and catches any mistakes.
 Enabling database access in tests
 ---------------------------------
 
-You can use `py.test marks <http://pytest.org/latest/mark.html>`_ to
+You can use `pytest marks <http://pytest.org/latest/mark.html>`_ to
 tell ``pytest-django`` your test needs database access::
 
    import pytest
@@ -24,7 +24,7 @@ tell ``pytest-django`` your test needs database access::
 
 It is also possible to mark all tests in a class or module at once.
 This demonstrates all the ways of marking, even though they overlap.
-Just one of these marks would have been sufficient.  See the `py.test
+Just one of these marks would have been sufficient.  See the `pytest
 documentation
 <http://pytest.org/latest/example/markers.html#marking-whole-classes-or-modules>`_
 for detail::
@@ -115,10 +115,10 @@ A good way to use ``--reuse-db`` and ``--create-db`` can be:
     [pytest]
     addopts = --reuse-db
 
-* Just run tests with ``py.test``, on the first run the test database will be
+* Just run tests with ``pytest``, on the first run the test database will be
   created. The next test run it will be reused.
 
-* When you alter your database schema, run ``py.test --create-db``, to force
+* When you alter your database schema, run ``pytest --create-db``, to force
   re-creation of the test database.
 
 ``--nomigrations`` - Disable Django 1.7+ migrations
diff --git a/docs/faq.rst b/docs/faq.rst
@@ -31,7 +31,7 @@ locale, put the following code in your project's `conftest.py
 
 My tests are not being found. Why not?
 -------------------------------------------------------------------------------------
- By default, py.test looks for tests in files named ``test_*.py`` (note that
+ By default, pytest 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``
@@ -56,7 +56,7 @@ transactions are tested or not.
 How can I use ``manage.py test`` with pytest-django?
 ----------------------------------------------------
 
-pytest-django is designed to work with the ``py.test`` command, but if you
+pytest-django is designed to work with the ``pytest`` command, but if you
 really need integration with ``manage.py test``, you can create a simple
 test runner like this::
 
@@ -94,7 +94,7 @@ Add the path to this class in your Django settings::
 
 Usage::
 
-    ./manage.py test <django args> -- <py.test args>
+    ./manage.py test <django args> -- <pytest args>
 
 **Note**: the pytest-django command line options ``--ds`` and ``--dc`` are not
 compatible with this approach, you need to use the standard Django methods of
diff --git a/docs/helpers.rst b/docs/helpers.rst
@@ -6,7 +6,7 @@ Django helpers
 Markers
 -------
 
-``pytest-django`` registers and uses markers.  See the py.test documentation_
+``pytest-django`` registers and uses markers.  See the pytest documentation_
 on what marks are and for notes on using_ them.
 
 .. _documentation: http://pytest.org/latest/mark.html
@@ -82,7 +82,7 @@ when trying to access the database.
 
 .. py:function:: pytest.mark.ignore_template_errors
 
-  If you run py.test using the ``--fail-on-template-vars`` option,
+  If you run pytest using the ``--fail-on-template-vars`` option,
   tests will fail should your templates contain any invalid variables.
   This marker will disable this feature by setting ``settings.TEMPLATE_STRING_IF_INVALID=None``
   or the ``string_if_invalid`` template option in Django>=1.7
@@ -98,7 +98,7 @@ Fixtures
 --------
 
 pytest-django provides some pytest fixtures to provide dependencies for tests.
-More information on fixtures is available in the `py.test documentation
+More information on fixtures is available in the `pytest documentation
 <http://pytest.org/latest/fixture.html>`_.
 
 
diff --git a/docs/index.rst b/docs/index.rst
@@ -1,7 +1,7 @@
 Welcome to pytest-django's documentation!
 =========================================
 
-pytest-django is a plugin for `py.test <http://pytest.org/>`_ that provides a set of useful tools for testing `Django <http://www.djangoproject.com/>`_ applications and projects.
+pytest-django is a plugin for `pytest <http://pytest.org/>`_ that provides a set of useful tools for testing `Django <http://www.djangoproject.com/>`_ applications and projects.
 
 .. toctree::
    :maxdepth: 3
@@ -19,7 +19,7 @@ pytest-django is a plugin for `py.test <http://pytest.org/>`_ that provides a se
 Why would I use this instead of Django's manage.py test command?
 ================================================================
 
-Running the test suite with py.test offers some features that are not present in Django's standard test mechanism:
+Running the test suite with pytest offers some features that are not present in Django's standard test mechanism:
 
  * Less boilerplate: no need to import unittest, create a subclass with methods. Just write tests as regular functions.
  * `Manage test dependencies with fixtures <http://pytest.org/latest/fixture.html>`_
@@ -28,12 +28,12 @@ Running the test suite with py.test offers some features that are not present in
  * There are a lot of other nice plugins available for pytest.
  * Easy switching: Existing unittest-style tests will still work without any modifications.
 
-See the `py.test documentation <http://pytest.org/latest/>`_ for more information on py.test.
+See the `pytest documentation <http://pytest.org/latest/>`_ for more information on pytest.
 
 Quick Start
 ===========
 1. ``pip install pytest-django``
-2. Make sure ``DJANGO_SETTINGS_MODULE`` is defined and and run tests with the ``py.test`` command.
+2. Make sure ``DJANGO_SETTINGS_MODULE`` is defined and and run tests with the ``pytest`` command.
 3. (Optionally) If you put your tests under a tests directory (the standard Django application layout), and your files are not named ``test_FOO.py``, see the FAQ :ref:`faq-tests-not-being-picked-up`.
 
 
diff --git a/docs/managing_python_path.rst b/docs/managing_python_path.rst
@@ -7,7 +7,7 @@ pytest needs to be able to import the code in your project. Normally, when
 interacting with Django code, the interaction happens via ``manage.py``, which
 will implicilty add that directory to the Python path.
 
-However, when Python is started via the ``py.test`` command, some extra care is
+However, when Python is started via the ``pytest`` command, some extra care is
 needed to have the Python path setup properly. There are two ways to handle
 this problem, described below.
 
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
@@ -13,7 +13,7 @@ Talks, articles and blog posts
 
  * Talk from DjangoCon Europe 2014: `pytest: helps you write better Django apps, by Andreas Pelme <https://www.youtube.com/watch?v=aaArYVh6XSM>`_
 
- * Talk from EuroPython 2013: `Testing Django application with py.test, by Andreas Pelme <http://www.youtube.com/watch?v=aUf8Fkb7TaY>`_
+ * Talk from EuroPython 2013: `Testing Django application with pytest, by Andreas Pelme <http://www.youtube.com/watch?v=aUf8Fkb7TaY>`_
 
  * Three part blog post tutorial (part 3 mentions Django integration): `pytest: no-boilerplate testing, by Daniel Greenfeld <http://pydanny.com/pytest-no-boilerplate-testing.html>`_
 
@@ -56,10 +56,10 @@ full documentation on :ref:`configuring_django_settings`.
 Step 3: Run your test suite
 ---------------------------
 
-Tests are invoked directly with the ``py.test`` command, instead of ``manage.py
+Tests are invoked directly with the ``pytest`` command, instead of ``manage.py
 test``, that you might be used to::
 
-    py.test
+    pytest
 
 Do you have problems with pytest not finding your code? See the FAQ
 :ref:`faq-import-error`.
diff --git a/docs/usage.rst b/docs/usage.rst
@@ -7,19 +7,19 @@ Basic usage
 -----------
 
 When using pytest-django, django-admin.py or manage.py is not used to run
-tests. This makes it possible to invoke py.test and other plugins with all its
+tests. This makes it possible to invoke pytest and other plugins with all its
 different options directly.
 
-Running a test suite is done by invoking the py.test command directly::
+Running a test suite is done by invoking the pytest command directly::
 
-    py.test
+    pytest
 
 Specific test files or directories can be selected by specifying the test file names directly on
 the command line::
 
-    py.test test_something.py a_directory
+    pytest test_something.py a_directory
 
-See the `py.test documentation on Usage and invocations
+See the `pytest documentation on Usage and invocations
 <http://pytest.org/latest/usage.html>`_ for more help on available parameters.
 
 Additional command line options
@@ -42,7 +42,7 @@ installed with::
 
 You can then run the tests by running::
 
-    py.test -n <number of processes>
+    pytest -n <number of processes>
 
 When tests are invoked with xdist, pytest-django will create a separate test
 database for each process. Each test database will be given a suffix
diff --git a/generate_configurations.py b/generate_configurations.py
@@ -31,7 +31,7 @@ def is_pypy(self):
 PYTHON_MAIN_VERSIONS = ['python2.7', 'python3.5']
 PYTHON_VERSIONS = ['python2.7', 'python3.3',
                    'python3.4', 'python3.5', 'pypy', 'pypy3']
-PYTEST_VERSIONS = ['2.9.2']
+PYTEST_VERSIONS = ['2.9.2', '3.0.0']
 DJANGO_VERSIONS = ['master', '1.7', '1.8', '1.9', '1.10']
 SETTINGS = ['sqlite', 'sqlite_file', 'mysql_myisam', 'mysql_innodb',
             'postgres']
diff --git a/pytest_django/plugin.py b/pytest_django/plugin.py
@@ -1,4 +1,4 @@
-"""A py.test plugin which helps testing Django applications
+"""A pytest plugin which helps testing Django applications
 
 This plugin handles creating and destroying the test environment and
 test database and provides some useful text fixtures.
diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,4 @@
-[pytest]
+[tool:pytest]
 # --strict: warnings become errors.
 # -r fEsxXw: show extra test summary info for everything.
 addopts = --ignore lib/ --ignore build/ --ignore include/ --ignore local/ --ignore src/ --strict -r fEsxXw
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@ def read(fname):
 setup(
     name='pytest-django',
     use_scm_version=True,
-    description='A Django plugin for py.test.',
+    description='A Django plugin for pytest.',
     author='Andreas Pelme',
     author_email='andreas@pelme.se',
     maintainer="Andreas Pelme",
@@ -29,7 +29,7 @@ def read(fname):
     packages=['pytest_django'],
     long_description=read('README.rst'),
     setup_requires=['setuptools_scm==1.11.1'],
-    install_requires=['pytest>=2.5'],
+    install_requires=['pytest>=2.9'],
     classifiers=['Development Status :: 5 - Production/Stable',
                  'Framework :: Django',
                  'Intended Audience :: Developers',
@@ -44,5 +44,5 @@ def read(fname):
                  'Programming Language :: Python :: 3.4',
                  'Programming Language :: Python :: 3.5',
                  ],
-    # the following makes a plugin available to py.test
+    # the following makes a plugin available to pytest
     entry_points={'pytest11': ['django = pytest_django.plugin']})
diff --git a/tests/test_doctest.txt b/tests/test_doctest.txt
@@ -1,4 +1,4 @@
-This doctest should run without problems with py.test.
+This doctest should run without problems with pytest.
 
 >>> print('works')
 works
diff --git a/tests/test_manage_py_scan.py b/tests/test_manage_py_scan.py
@@ -8,7 +8,7 @@ def test_django_project_found(django_testdir):
     # will call "python /path/to/pytest.py", which will impliclity add cwd to
     # the path. By instead calling "python /path/to/pytest.py
     # django_project_root", we avoid impliclity adding the project to sys.path
-    # This matches the behaviour when py.test is called directly as an
+    # This matches the behaviour when pytest is called directly as an
     # executable (cwd is not added to the Python path)
 
     django_testdir.create_test_module("""
diff --git a/tox.ini b/tox.ini
