bsipocz · Nov 7, 2017 · Aug 10, 2017 · Aug 10, 2017 · Aug 10, 2017 · Aug 10, 2017
diff --git a/.run_docker_tests.sh b/.run_docker_tests.sh
@@ -18,7 +18,7 @@ python3 -c 'import sys; print(sys.maxsize)'
 
 # The doctestplus plugin in Astropy doesn't work correctly with pytest>=3.2, so
 # we install an older version here
-easy_install-3.5 pytest pytest-xdist
+easy_install-3.5 pytest pytest-astropy pytest-xdist
 
 # Install git
 apt-get install -y git

diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ env:
         - MAIN_CMD='python setup.py'
         - CONDA_DEPENDENCIES='Cython jinja2'
         - CONDA_ALL_DEPENDENCIES='Cython jinja2 scipy h5py matplotlib pyyaml scikit-image pandas pytz beautifulsoup4 ipython mpmath bleach'
-        - PIP_DEPENDENCIES=''
+        - PIP_DEPENDENCIES='pytest-astropy'
         - SETUP_XVFB=True
         - EVENT_TYPE='push pull_request'
         - SETUP_CMD='test'
@@ -77,15 +77,15 @@ matrix:
           stage: Cron tests
           env: SETUP_CMD='test --remote-data=astropy'
                CONDA_DEPENDENCIES=$CONDA_ALL_DEPENDENCIES
-               PIP_DEPENDENCIES='jplephem' EVENT_TYPE='cron'
+               PIP_DEPENDENCIES='pytest-astropy jplephem' EVENT_TYPE='cron'
 
         # Check for sphinx doc build warnings - we do this first because it
         # runs for a long time. The sphinx build also has some additional
         # dependencies. Using a more stringent locale than UTF-8.
         - os: linux
           env: SETUP_CMD='build_docs -w'
                CONDA_DEPENDENCIES=$CONDA_ALL_DEPENDENCIES
-               PIP_DEPENDENCIES='sphinx-gallery>=0.1.12 pillow --no-deps jplephem'
+               PIP_DEPENDENCIES='pytest-astropy sphinx-gallery>=0.1.12 pillow --no-deps jplephem'
                LC_CTYPE=C LC_ALL=C LANG=C
 
         # Try all python versions and Numpy versions. Since we can assume that
@@ -94,16 +94,21 @@ matrix:
         # time. Since we test the latest Numpy as part of the builds with all
         # optional dependencies below, we can focus on older builds here.
         # Numpy 1.11 is tested below in the image tests, 1.12 in the Initial stage test.
+        # Run this test using native pytest
         - os: linux
           env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.10
-               SETUP_CMD='test --open-files'
+               INSTALL_CMD='python setup.py build_ext --inplace'
+               TEST_CMD='pytest --open-files --doctest-rst'
+          script:
+            - $INSTALL_CMD
+            - $TEST_CMD
 
         # Now try with all optional dependencies.
         # We also test the two latest matplotlib versions for the image tests.
         - os: linux
           env: PYTHON_VERSION=3.5 SETUP_CMD='test --remote-data=astropy -a "--mpl"'
                CONDA_DEPENDENCIES=$CONDA_ALL_DEPENDENCIES
-               PIP_DEPENDENCIES='jplephem pytest-mpl'
+               PIP_DEPENDENCIES='pytest-astropy jplephem pytest-mpl'
                LC_CTYPE=C.ascii LC_ALL=C
                NUMPY_VERSION=1.11
                MATPLOTLIB_VERSION=1.5
@@ -121,7 +126,7 @@ matrix:
         - os: linux
           env: SETUP_CMD='test --coverage --remote-data=astropy -a "--mpl"'
                CONDA_DEPENDENCIES=$CONDA_ALL_DEPENDENCIES
-               PIP_DEPENDENCIES='cpp-coveralls objgraph jplephem pytest-mpl bintrees'
+               PIP_DEPENDENCIES='pytest-astropy cpp-coveralls objgraph jplephem pytest-mpl bintrees'
                LC_CTYPE=C.ascii LC_ALL=C
                CFLAGS='-ftest-coverage -fprofile-arcs -fno-inline-functions -O0'
                MATPLOTLIB_VERSION=2.0
@@ -164,7 +169,6 @@ install:
     - source ci-helpers/travis/setup_conda.sh
 
 script:
-    - echo "$MAIN_CMD $SETUP_CMD"
     - $MAIN_CMD $SETUP_CMD
 
 after_success:

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -85,7 +85,8 @@ astropy.table
 astropy.tests
 ^^^^^^^^^^^^^
 
-- Split pytest plugins into separate modules. [#6384]
+- Split pytest plugins into separate modules. Move remotedata, openfiles,
+  doctestplus plugins to standalone repositories. [#6606]
 
 astropy.time
 ^^^^^^^^^^^^
@@ -529,6 +530,10 @@ astropy.tests
 
 - Updated top-level config file to properly ignore top-level directories.
   [#6449]
+- Fixed issue with running test suite directly from ``pytest``. [#6437]
+
+astropy.time
+^^^^^^^^^^^^
 
 astropy.units
 ^^^^^^^^^^^^^

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,7 +11,7 @@ environment:
                           # of 32 bit and 64 bit builds are needed, move this
                           # to the matrix section.
         CONDA_DEPENDENCIES: "Cython scipy h5py beautifulsoup4 jinja2 pyyaml matplotlib scikit-image pytz"
-        PIP_DEPENDENCIES: "objgraph"
+        PIP_DEPENDENCIES: "pytest-astropy objgraph"
 
     matrix:
         - PYTHON_VERSION: "3.6"

diff --git a/astropy/conftest.py b/astropy/conftest.py
@@ -1,8 +1,13 @@
-# this contains imports plugins that configure py.test for astropy tests.
-# by importing them here in conftest.py they are discoverable by py.test
-# no matter how it is invoked within the astropy tree.
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This file contains pytest configuration settings that are astropy-specific
+(i.e.  those that would not necessarily be shared by affiliated packages
+making use of astropy's test runner).
+"""
+from astropy.tests.plugins.display import PYTEST_HEADER_MODULES
+from astropy.tests.helper import enable_deprecations_as_exceptions
 
-from .tests.pytest_plugins import *
+enable_deprecations_as_exceptions(include_astropy_deprecations=False)
 
 try:
     import matplotlib
@@ -11,6 +16,6 @@
 else:
     matplotlib.use('Agg')
 
-enable_deprecations_as_exceptions(include_astropy_deprecations=False)
-
+# This is astropy-specific so should not be included in a generic plugin that
+# could potentially be used by other projects
 PYTEST_HEADER_MODULES['Cython'] = 'cython'
diff --git a/astropy/tests/__init__.py b/astropy/tests/__init__.py
@@ -4,3 +4,24 @@
 for writing tests, and general tests that are not associated with a
 particular package.
 """
+
+# NOTE: This is retained only for backwards compatibility. Affiliated packages
+# should no longer import ``disable_internet`` from ``astropy.tests``. It is
+# now available from ``pytest_remotedata``. However, this is not the
+# recommended mechanism for controlling access to remote data in tests.
+# Instead, packages should make use of decorators provided by the
+# pytest_remotedata plugin: - ``@pytest.mark.remote_data`` for tests that
+# require remote data access - ``@pytest.mark.internet_off`` for tests that
+# should only run when remote data access is disabled.  Remote data access for
+# the test suite is controlled by the ``--remote-data`` command line flag. This
+# is either passed to ``pytest`` directly or to the ``setup.py test`` command.
+#
+# TODO: This import should eventually be removed once backwards compatibility
+# is no longer supported.
+
+try:
+    # This should only be necessary during testing, in which case the test
+    # package must be installed anyway.
+    from pytest_remotedata import disable_internet
+except ImportError:
+    pass
diff --git a/astropy/tests/disable_internet.py b/astropy/tests/disable_internet.py
diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
@@ -35,6 +35,7 @@
            'pickle_protocol', 'generic_recursive_equality_test']
 
 # pytest marker to mark tests which get data from the web
+# This is being maintained for backwards compatibility
 remote_data = pytest.mark.remote_data